Merge branch 'fix/internet' into play
This commit is contained in:
commit
db66662a8b
|
@ -708,8 +708,12 @@ void Socket::getLocalIPAddressListForPlatform(std::vector<std::string> &ipList)
|
||||||
// Now check all linux network devices
|
// Now check all linux network devices
|
||||||
struct ifaddrs *ifap = NULL;
|
struct ifaddrs *ifap = NULL;
|
||||||
getifaddrs(&ifap);
|
getifaddrs(&ifap);
|
||||||
for(struct ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next) {
|
for(struct ifaddrs *ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
|
||||||
if (ifa->ifa_addr->sa_family == AF_INET) {
|
if (!ifa->ifa_addr) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ifa->ifa_addr->sa_family == AF_INET) { // check it is IP4
|
||||||
|
// is a valid IP4 Address
|
||||||
struct sockaddr_in *sa = (struct sockaddr_in *) ifa->ifa_addr;
|
struct sockaddr_in *sa = (struct sockaddr_in *) ifa->ifa_addr;
|
||||||
char *addr = inet_ntoa(sa->sin_addr);
|
char *addr = inet_ntoa(sa->sin_addr);
|
||||||
//printf("Interface: %s\tAddress: %s\n", ifa->ifa_name, addr);
|
//printf("Interface: %s\tAddress: %s\n", ifa->ifa_name, addr);
|
||||||
|
@ -725,7 +729,7 @@ void Socket::getLocalIPAddressListForPlatform(std::vector<std::string> &ipList)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
freeifaddrs(ifap);
|
if (ifap != NULL) freeifaddrs(ifap);
|
||||||
|
|
||||||
if(Socket::intfTypes.empty()) {
|
if(Socket::intfTypes.empty()) {
|
||||||
Socket::intfTypes.push_back("lo");
|
Socket::intfTypes.push_back("lo");
|
||||||
|
|
Loading…
Reference in New Issue