diff options
| author | Clifford Jansen <cliffjansen@apache.org> | 2012-02-09 17:40:14 +0000 |
|---|---|---|
| committer | Clifford Jansen <cliffjansen@apache.org> | 2012-02-09 17:40:14 +0000 |
| commit | bce2f35a4168beab1f7e439dd464ba53ed4dd2f4 (patch) | |
| tree | 16b859501ff4568c56d949167224ab97acadbc1b /cpp/src/qpid/sys/solaris | |
| parent | 77f0843cd171e1c7e6ad0ac2ee5f6bb4c6fd891f (diff) | |
| download | qpid-python-bce2f35a4168beab1f7e439dd464ba53ed4dd2f4.tar.gz | |
QPID-3621 cmake build changes for solaris and solaris specific code changes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1242411 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/solaris')
| -rwxr-xr-x | cpp/src/qpid/sys/solaris/SystemInfo.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/qpid/sys/solaris/SystemInfo.cpp b/cpp/src/qpid/sys/solaris/SystemInfo.cpp index 765e5a7eb0..e5856f55e6 100755 --- a/cpp/src/qpid/sys/solaris/SystemInfo.cpp +++ b/cpp/src/qpid/sys/solaris/SystemInfo.cpp @@ -69,7 +69,12 @@ void SystemInfo::getLocalIpAddresses(uint16_t port, if (::ioctl(s, SIOCGIFADDR, &ifr) < 0) { break; } - struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.lifr_addr; + struct sockaddr *sa = static_cast<struct sockaddr *>((void *) &ifr.lifr_addr); + if (sa->sa_family != AF_INET) { + // TODO: Url parsing currently can't cope with IPv6 addresses, defer for now + break; + } + struct sockaddr_in *sin = static_cast<struct sockaddr_in *>((void *)sa); std::string addr(inet_ntoa(sin->sin_addr)); if (addr != LOCALHOST) addrList.push_back(Address(TCP, addr, port)); |