diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-17 13:10:20 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-17 13:10:20 +0000 |
| commit | c8d3ca81535c90da0b9d903b0976715f5fc5198b (patch) | |
| tree | cc29bd84f6ad2a8f6d8da71bf137b406bdf02ddd | |
| parent | 222233014303fe4054ecbbe5d22ea92c6c573ef1 (diff) | |
| download | hercules-c8d3ca81535c90da0b9d903b0976715f5fc5198b.tar.gz hercules-c8d3ca81535c90da0b9d903b0976715f5fc5198b.tar.bz2 hercules-c8d3ca81535c90da0b9d903b0976715f5fc5198b.tar.xz hercules-c8d3ca81535c90da0b9d903b0976715f5fc5198b.zip | |
Made unix interface enumeration work with dynamic sockaddr lengths (BSD, for example). Complain if it doesn't compile. (bugreport:765)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12212 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/common/socket.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 62d4ad2ee..bc629ffd5 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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] diff --git a/src/common/socket.c b/src/common/socket.c index 2e2182784..58c7b6c5e 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -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); |