Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #644 from jg1uaa/master

Browse source 
CNetworkInfo::getNetworkInterface() FreeBSD support
This commit is contained in:
Jonathan Naylor 2020-10-30 13:41:19 +00:00 committed by GitHub
commit fc34f27f63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
NetworkInfo.cpp
View file

@ -26,13 +26,13 @@
#include <clocale> #include <clocale>
#include <sys/types.h> #include <sys/types.h>
#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
#include <ifaddrs.h> #include <ifaddrs.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <net/if.h> #include <net/if.h>
#include <net/route.h> #include <net/route.h>
@ -66,7 +66,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info)
::strcpy((char*)info, "(address unknown)"); ::strcpy((char*)info, "(address unknown)");
#if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) #if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
char* dflt = NULL; char* dflt = NULL;
#if defined(__linux__) #if defined(__linux__)
@ -91,7 +91,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info)
::fclose(fp); ::fclose(fp);
#elif defined(__OpenBSD__) || defined(__NetBSD__) #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
const int mib[] = { const int mib[] = {
CTL_NET, CTL_NET,
PF_ROUTE, PF_ROUTE,
@ -99,7 +99,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info)
AF_INET, // IPv4 routing AF_INET, // IPv4 routing
NET_RT_DUMP, NET_RT_DUMP,
0, // show all routes 0, // show all routes
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__)
0, // table id 0, // table id
#endif #endif
}; };
@ -126,7 +126,7 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info)
continue; continue;
#if defined(__OpenBSD__) #if defined(__OpenBSD__)
struct sockaddr_in *sa = (struct sockaddr_in *)(p + rtm->rtm_hdrlen); struct sockaddr_in *sa = (struct sockaddr_in *)(p + rtm->rtm_hdrlen);
#elif defined(__NetBSD__) #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
struct sockaddr_in *sa = (struct sockaddr_in *)(rtm + 1); struct sockaddr_in *sa = (struct sockaddr_in *)(rtm + 1);
#endif #endif
if (sa->sin_addr.s_addr == INADDR_ANY) { if (sa->sin_addr.s_addr == INADDR_ANY) {