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

- allow using new cmake var for finding glest.ini called MG_CMAKE_INSTALL_PREFIX to solve issue #167

This commit is contained in:
SoftCoder 2017-09-22 23:21:40 -07:00
parent de8d05b882
commit 5d0f5013fd
4 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1,4 +1,3 @@
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )
PROJECT( MegaGlest )
#SET(CMAKE_VERBOSE_MAKEFILE ON)
@ -341,6 +340,12 @@ IF(NOT WANT_DEPRECATION_WARNINGS)
ENDIF()
MARK_AS_ADVANCED(WANT_DEPRECATION_WARNINGS)
#ADD_DEFINITIONS("-DMG_CMAKE_INSTALL_PREFIX='\\\"${CMAKE_INSTALL_PREFIX}\\\"'")
IF(NOT MG_CMAKE_INSTALL_PREFIX)
SET(MG_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
ENDIF()
MESSAGE(STATUS "**NOTE: MG_CMAKE_INSTALL_PREFIX is [${MG_CMAKE_INSTALL_PREFIX}]")
SET(SDL_WINDOWS_DIR_DINC "SDL-2.0.x")
SET(SDL_VERSION_NAME "SDL2")
SET(SDL_VERSION_SNAME "sdl")
@ -398,12 +403,12 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
#endif()
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tests )
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tests )
ENDIF()
# Check if data exist
IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/CMakeLists.txt")
MESSAGE(STATUS "**Found game data.")
MESSAGE(STATUS "**Found game data.")
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/data/glest_game )
ENDIF()
@ -411,7 +416,7 @@ ENDIF()
#MESSAGE(STATUS ">>>> NOTICE Compiler definitions used: ${DirDefs}")
#MESSAGE(STATUS "END of compile defs...")
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
ENDIF()
IF(NOT DEFINED CPACK_GENERATOR)

8
source/glest_game/global/config.cpp
View File

@ -185,7 +185,13 @@ Config::Config(std::pair<ConfigType,ConfigType> type, std::pair<string,string> f
}
#endif
// Look in standard linux shared paths for ini files
#if defined(MG_CMAKE_INSTALL_PREFIX)
if(foundPath == false) {
foundPath = tryCustomPath(cfgType, fileName, formatPath(TOSTRING(MG_CMAKE_INSTALL_PREFIX)));
}
#endif
// Look in standard linux shared paths for ini files
#if defined(__linux__)
if(foundPath == false) {
foundPath = tryCustomPath(cfgType, fileName, "/usr/share/megaglest/");

1
source/shared_lib/include/platform/posix/socket.h
View File

@ -213,6 +213,7 @@ public:
protected:
static void throwException(string str);
static void getLocalIPAddressListForPlatform(std::vector<std::string> &ipList);
};
class SafeSocketBlockToggleWrapper {

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

@ -675,7 +675,6 @@ uint32 Socket::getConnectedIPAddress(string IP) {
std::vector<std::string> Socket::getLocalIPAddressList() {
std::vector<std::string> ipList;
/* get my host name */
char myhostname[101]="";
gethostname(myhostname,100);
@ -684,8 +683,6 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
if(myhostent) {
// get all host IP addresses (Except for loopback)
char myhostaddr[101] = "";
//int ipIdx = 0;
//while (myhostent->h_addr_list[ipIdx] != 0) {
for(int ipIdx = 0; myhostent->h_addr_list[ipIdx] != NULL; ++ipIdx) {
Ip::Inet_NtoA(SockAddrToUint32((struct in_addr *)myhostent->h_addr_list[ipIdx]), myhostaddr);
@ -697,25 +694,26 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
strncmp(myhostaddr,"0.",2) != 0) {
ipList.push_back(myhostaddr);
}
//ipIdx++;
}
}
Socket::getLocalIPAddressListForPlatform(ipList);
return ipList;
}
#ifndef WIN32
void Socket::getLocalIPAddressListForPlatform(std::vector<std::string> &ipList) {
// Now check all linux network devices
struct ifaddrs *ifap, *ifa;
struct sockaddr_in *sa;
char *addr;
getifaddrs (&ifap);
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family==AF_INET) {
sa = (struct sockaddr_in *) ifa->ifa_addr;
addr = inet_ntoa(sa->sin_addr);
struct ifaddrs *ifap = NULL;
getifaddrs(&ifap);
for(struct ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family == AF_INET) {
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(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) {
@ -727,7 +725,6 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
}
freeifaddrs(ifap);
//std::vector<string> intfTypes;
if(Socket::intfTypes.empty()) {
Socket::intfTypes.push_back("lo");
Socket::intfTypes.push_back("eth");
@ -752,14 +749,11 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
string intfName = Socket::intfTypes[intfIdx];
for(int idx = 0; idx < 10; ++idx) {
PLATFORM_SOCKET fd = socket(AF_INET, SOCK_DGRAM, 0);
//PLATFORM_SOCKET fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
/* I want to get an IPv4 IP address */
struct ifreq ifr;
struct ifreq ifrA;
ifr.ifr_addr.sa_family = AF_INET;
ifrA.ifr_addr.sa_family = AF_INET;
/* I want IP address attached to "eth0" */
char szBuf[100]="";
snprintf(szBuf,100,"%s%d",intfName.c_str(),idx);
@ -767,7 +761,6 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
//printf("In [%s::%s Line: %d] Trying NIC named [%s]\n",__FILE__,__FUNCTION__,__LINE__,szBuf);
int maxIfNameLength = std::min((int)strlen(szBuf),IFNAMSIZ-1);
strncpy(ifr.ifr_name, szBuf, maxIfNameLength);
ifr.ifr_name[maxIfNameLength] = '\0';
strncpy(ifrA.ifr_name, szBuf, maxIfNameLength);
@ -775,16 +768,15 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
int result_ifaddrr = ioctl(fd, SIOCGIFADDR, &ifr);
ioctl(fd, SIOCGIFFLAGS, &ifrA);
if(fd >= 0) close(fd);
if(fd >= 0) {
close(fd);
}
if(result_ifaddrr >= 0) {
struct sockaddr_in *pSockAddr = (struct sockaddr_in *)&ifr.ifr_addr;
if(pSockAddr != NULL) {
char myhostaddr[101] = "";
Ip::Inet_NtoA(SockAddrToUint32(&pSockAddr->sin_addr), myhostaddr);
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] szBuf [%s], myhostaddr = [%s], ifr.ifr_flags = %d, ifrA.ifr_flags = %d, ifr.ifr_name [%s]\n",__FILE__,__FUNCTION__,__LINE__,szBuf,myhostaddr,ifr.ifr_flags,ifrA.ifr_flags,ifr.ifr_name);
// Now only include interfaces that are both UP and running
if( (ifrA.ifr_flags & IFF_UP) == IFF_UP &&
(ifrA.ifr_flags & IFF_RUNNING) == IFF_RUNNING) {
@ -800,54 +792,41 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
}
}
}
}
#endif
#else
#ifdef WIN32
void Socket::getLocalIPAddressListForPlatform(std::vector<std::string> &ipList) {
ULONG outBufLen = 0;
GetAdaptersAddresses(AF_INET, 0, NULL, NULL, &outBufLen);
PIP_ADAPTER_ADDRESSES pAddresses = (IP_ADAPTER_ADDRESSES*)malloc(outBufLen);
GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST, NULL, pAddresses, &outBufLen);
PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
LPSOCKADDR addr = NULL;
pCurrAddresses = pAddresses;
char buff[100];
DWORD bufflen=100;
//ifaddrinfo_ipv4_t addr_t;
while (pCurrAddresses) {
if (pCurrAddresses->OperStatus != IfOperStatusUp) {
pCurrAddresses = pCurrAddresses->Next;
continue;
}
pUnicast = pCurrAddresses->FirstUnicastAddress;
while (pUnicast) {
addr = pUnicast->Address.lpSockaddr;
if (addr->sa_family == AF_INET && pCurrAddresses->IfType != MIB_IF_TYPE_LOOPBACK) {
sockaddr_in *sa_in = (sockaddr_in *)addr;
char* strIP = ::inet_ntoa((sa_in->sin_addr));
//addr_t.ifa_name = strIP;
//addr_t.ifa_ip = sa_in->sin_addr.S_un.S_addr;
//socket_inet_ntop(sa_in->sin_family, &(sa_in->sin_addr), addr_t.ip, sizeof(addr_t.ip));
//if (pCurrAddresses->IfType == IF_TYPE_IEEE80211) {
// _addrs.insert(_addrs.begin(), addr_t);
//}
//else {
// _addrs.push_back(addr_t);
//}
//sockaddr_in *sa_in = (sockaddr_in *)pUnicast->Address.lpSockaddr;
//char *ip_address = inet_ntop(AF_INET,&(sa_in->sin_addr),buff,bufflen);
char *ip_address = strIP;
//printf("\tIPV4:%s\n", ip_address);
if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s Line: %d] ip_address [%s]\n", __FILE__, __FUNCTION__, __LINE__, ip_address);
if( strlen(ip_address) > 0 &&
strncmp(ip_address,"127.",4) != 0 &&
strncmp(ip_address,"0.",2) != 0) {
if(std::find(ipList.begin(),ipList.end(),ip_address) == ipList.end()) {
ipList.push_back(ip_address);
sockaddr_in *sa_in = (sockaddr_in *)addr;
char *strIP = ::inet_ntoa((sa_in->sin_addr));
//printf("\tIPV4:%s\n", strIP);
if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s Line: %d] strIP [%s]\n", __FILE__, __FUNCTION__, __LINE__, strIP);
}
if( strlen(strIP) > 0 &&
strncmp(strIP,"127.",4) != 0 &&
strncmp(strIP,"0.",2) != 0) {
if(std::find(ipList.begin(),ipList.end(),strIP) == ipList.end()) {
ipList.push_back(strIP);
}
}
}
@ -856,12 +835,9 @@ std::vector<std::string> Socket::getLocalIPAddressList() {
pCurrAddresses = pCurrAddresses->Next;
}
free(pAddresses);
//return !_addrs.empty();
}
#endif
return ipList;
}
bool Socket::isSocketValid() const {
return Socket::isSocketValid(&sock);