diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-28 01:38:33 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-28 01:38:33 +0000 |
| commit | 4c3099bb6c186786858887730b896c6b96415b2a (patch) | |
| tree | b1910c5818df15c2e9aeb4d1a6b795d0742dfcdd /src/common/socket.h | |
| parent | d40a402849595e51aff219b74c323008467ce67e (diff) | |
| download | hercules-4c3099bb6c186786858887730b896c6b96415b2a.tar.gz hercules-4c3099bb6c186786858887730b896c6b96415b2a.tar.bz2 hercules-4c3099bb6c186786858887730b896c6b96415b2a.tar.xz hercules-4c3099bb6c186786858887730b896c6b96415b2a.zip | |
* Resolving allow/deny IP rules not working (bugreport:2632).
- Fixed 'mask' being filled with 'ip' when standard mask was specified (since r9647).
- Fixed 'ip' and 'mask' (bit mask) being stored in wrong byte order (network order instead of host order) (since r10162).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14683 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/socket.h')
| -rw-r--r-- | src/common/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/socket.h b/src/common/socket.h index 93a5dd796..0a740a63f 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -135,6 +135,7 @@ uint32 host2ip(const char* hostname); const char* ip2str(uint32 ip, char ip_str[16]); uint32 str2ip(const char* ip_str); #define CONVIP(ip) ((ip)>>24)&0xFF,((ip)>>16)&0xFF,((ip)>>8)&0xFF,((ip)>>0)&0xFF +#define MAKEIP(a,b,c,d) (uint32)( ( ( (a)&0xFF ) << 24 ) | ( ( (b)&0xFF ) << 16 ) | ( ( (c)&0xFF ) << 8 ) | ( ( (d)&0xFF ) << 0 ) ) uint16 ntows(uint16 netshort); int socket_getips(uint32* ips, int max); |