Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make use of getifaddrs() on OpenBSD as well #19

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Make use of getifaddrs() on OpenBSD as well #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src/ptlib/unix/socket.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#include <netinet/if_ether.h>
#endif

#if defined(P_NETBSD)
#if defined(P_NETBSD) || defined(P_OPENBSD)
#include <ifaddrs.h>
#endif

Expand Down Expand Up @@ -546,9 +546,11 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostname)
PUDPSocket sock;

PBYTEArray buffer;
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
struct ifconf ifConf;
#endif

#if defined(P_NETBSD)
#if defined(P_NETBSD) || defined(P_OPENBSD)
struct ifaddrs *ifap, *ifa;

PAssert(getifaddrs(&ifap) == 0, "getifaddrs failed");
Expand All @@ -571,7 +573,7 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostname)
while (ifName < ifEndList) {
#endif
struct ifreq ifReq;
#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
Expand All @@ -588,14 +590,14 @@ PBoolean PIPSocket::IsLocalHost(const PString & hostname)
}
}

#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
#if defined(P_FREEBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
// move the ifName pointer along to the next ifreq entry
ifName = (struct ifreq *)((char *)ifName + _SIZEOF_ADDR_IFREQ(*ifName));
#elif !defined(P_NETBSD)
#elif !defined(P_NETBSD) && !defined(P_OPENBSD)
ifName++;
#endif
}
#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
}
#endif

Expand Down Expand Up @@ -1943,9 +1945,11 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDow
PUDPSocket sock;

PBYTEArray buffer;
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
struct ifconf ifConf;
#endif

#if defined(P_NETBSD)
#if defined(P_NETBSD) || defined(P_OPENBSD)
struct ifaddrs *ifap, *ifa;

PAssert(getifaddrs(&ifap) == 0, "getifaddrs failed");
Expand All @@ -1969,7 +1973,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDow
while (ifName < ifEndList) {
#endif
struct ifreq ifReq;
#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
Expand All @@ -1988,7 +1992,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDow
macAddr = PEthSocket::Address((BYTE *)ifReq.ifr_macaddr);
#endif

#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
Expand All @@ -2000,7 +2004,7 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDow
sockaddr_in * sin = (sockaddr_in *)&ifReq.ifr_addr;
PIPSocket::Address addr = sin->sin_addr;

#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
memcpy(&ifReq, ifName, sizeof(ifreq));
#else
memset(&ifReq, 0, sizeof(ifReq));
Expand Down Expand Up @@ -2034,15 +2038,15 @@ PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDow
}
}

#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
#if defined(P_FREEBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
// move the ifName pointer along to the next ifreq entry
ifName = (struct ifreq *)((char *)ifName + _SIZEOF_ADDR_IFREQ(*ifName));
#elif !defined(P_NETBSD)
#elif !defined(P_NETBSD) && !defined(P_OPENBSD)
ifName++;
#endif

}
#if !defined(P_NETBSD)
#if !defined(P_NETBSD) && !defined(P_OPENBSD)
}
#endif

Expand Down