Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made unix interface enumeration work with dynamic sockaddr lengths (BSD, for example). Complain if it doesn't compile. (bugreport:765)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12212 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-02-17 13:10:20 +00:00
parent bcac761953
commit 8ae50f44b4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/02/17
* Made unix interface enumeration work with dynamic sockaddr lengths
(BSD, for example). Complain if it doesn't compile. (bugreport:765)
2008/02/14
* Removed/replaced all calls to map_getallusers (followup to r12195)
* Trashed @whozeny (from r269) [ultramage]

4
src/common/socket.c
View File

@ -1173,11 +1173,7 @@ int socket_getips(uint32* ips, int max)
if( ad != INADDR_LOOPBACK && ad != INADDR_ANY )
ips[num++] = (uint32)ad;
}
#if (defined(BSD) && BSD >= 199103) || defined(_AIX) || defined(__APPLE__)
pos += ir->ifr_addr.sa_len + sizeof(ir->ifr_name);
#else// not AIX or APPLE
pos += sizeof(struct ifreq);
#endif//not AIX or APPLE
}
}
sClose(fd);