smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

This commit is contained in:
kelson42 2014-06-13 14:32:57 +02:00
parent a37fd98585 1b192c2557
commit 0bedd7ebc9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/networkTools.cpp
View File

@ -117,7 +117,14 @@ std::string kiwix::getBestPublicIp() {
for(std::map<std::string, std::string>::iterator iter = interfaces.begin(); for(std::map<std::string, std::string>::iterator iter = interfaces.begin();
iter != interfaces.end(); ++iter) { iter != interfaces.end(); ++iter) {
std::string interfaceIp = iter->second; std::string interfaceIp = iter->second;
if (interfaceIp.length() >= 3 && interfaceIp.substr(0, 3) == "172") if (interfaceIp.length() >= 7 && interfaceIp.substr(0, 7) == "172.16.")
return interfaceIp;
}
for(std::map<std::string, std::string>::iterator iter = interfaces.begin();
iter != interfaces.end(); ++iter) {
std::string interfaceIp = iter->second;
if (interfaceIp.length() >= 3 && interfaceIp.substr(0, 3) == "10.")
return interfaceIp; return interfaceIp;
} }