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

* Resolving allow/deny IP rules not working (bugreport:2632).

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@14683 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-01-28 01:38:33 +00:00
parent 0f1c66191c
commit 7a85df4fe0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -1,5 +1,9 @@
Date Added Date Added
2011/01/27
* Resolving allow/deny IP rules not working (bugreport:2632). [Ai4rei]
- 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).
2011/01/26 2011/01/26
* Fixed buyers, that are currently in a vending shop could be fooled into buying an item at different price than they see by reopening the vending shop (bugreport:4728). [Ai4rei] * Fixed buyers, that are currently in a vending shop could be fooled into buying an item at different price than they see by reopening the vending shop (bugreport:4728). [Ai4rei]
- This implements the official vending shop unique id handling (previously mistaken for char id), made compatible with packets before it's introduction (follow up to r14234). - This implements the official vending shop unique id handling (previously mistaken for char id), made compatible with packets before it's introduction (follow up to r14234).

5
src/common/socket.c
View File

@ -996,10 +996,10 @@ int access_ipmask(const char* str, AccessControl* acc)
(n == 5 && m[0] > 32) ){ // invalid bit mask (n == 5 && m[0] > 32) ){ // invalid bit mask
return 0; return 0;
} }
ip = (uint32)(a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24)); ip = MAKEIP(a[0],a[1],a[2],a[3]);
if( n == 8 ) if( n == 8 )
{// standard mask {// standard mask
mask = (uint32)(a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24)); mask = MAKEIP(m[0],m[1],m[2],m[3]);
} else if( n == 5 ) } else if( n == 5 )
{// bit mask {// bit mask
mask = 0; mask = 0;
@ -1007,7 +1007,6 @@ int access_ipmask(const char* str, AccessControl* acc)
mask = (mask >> 1) | 0x80000000; mask = (mask >> 1) | 0x80000000;
--m[0]; --m[0];
} }
mask = ntohl(mask);
} else } else
{// just this ip {// just this ip
mask = 0xFFFFFFFF; mask = 0xFFFFFFFF;

1
src/common/socket.h
View File

@ -135,6 +135,7 @@ uint32 host2ip(const char* hostname);
const char* ip2str(uint32 ip, char ip_str[16]); const char* ip2str(uint32 ip, char ip_str[16]);
uint32 str2ip(const char* ip_str); uint32 str2ip(const char* ip_str);
#define CONVIP(ip) ((ip)>>24)&0xFF,((ip)>>16)&0xFF,((ip)>>8)&0xFF,((ip)>>0)&0xFF #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); uint16 ntows(uint16 netshort);
int socket_getips(uint32* ips, int max); int socket_getips(uint32* ips, int max);