Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/internet' into play

This commit is contained in:
pavanvo 2022-09-06 21:04:41 +04:00
parent 8f0abb60b3 a8a51d4ef7
commit db66662a8b
No known key found for this signature in database
GPG Key ID: 34C1C36681B4AD84
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/shared_lib/sources/platform/posix/socket.cpp
View File

@ -708,24 +708,28 @@ void Socket::getLocalIPAddressListForPlatform(std::vector<std::string> &ipList)
// Now check all linux network devices
struct ifaddrs *ifap = NULL;
getifaddrs(&ifap);
for(struct ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family == AF_INET) {
for(struct ifaddrs *ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
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;
char *addr = inet_ntoa(sa->sin_addr);
//printf("Interface: %s\tAddress: %s\n", ifa->ifa_name, addr);
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] Interface: [%s] address: [%s]\n",__FILE__,__FUNCTION__,__LINE__,ifa->ifa_name,addr);
}
if(strlen(addr) > 0 &&
strncmp(addr,"127.",4) != 0 &&
strncmp(addr,"0.",2) != 0) {
if(std::find(ipList.begin(),ipList.end(),addr) == ipList.end()) {
ipList.push_back(addr);
}
}
if(strlen(addr) > 0 &&
strncmp(addr,"127.",4) != 0 &&
strncmp(addr,"0.",2) != 0) {
if(std::find(ipList.begin(),ipList.end(),addr) == ipList.end()) {
ipList.push_back(addr);
}
}
}
}
freeifaddrs(ifap);
if (ifap != NULL) freeifaddrs(ifap);
if(Socket::intfTypes.empty()) {
Socket::intfTypes.push_back("lo");