- Fixed subnet checking being broken in the login txt server.

- Changed a bit the information of the subnet checking to include the ip that is being checked.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5458 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 5 deletions

diff --git a/src/login/login.c b/src/login/login.c
index a1aabc9e8..cb7f1980c 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -2984,23 +2984,23 @@ int parse_admin(int fd) {
 int lan_subnetcheck(unsigned char *p) {

 

 	int i;

-	unsigned char *sbn, *msk;

+	unsigned char *sbn, *msk, *src = (unsigned char *)p;

 	

 	for(i=0; i<subnet_count; i++) {

 	

-		if((subnet[i].subnet & subnet[i].mask) == ((long)p & subnet[i].mask)) {

+		if((subnet[i].subnet & subnet[i].mask) == (*p & subnet[i].mask)) {

 			

 			sbn = (char *)&subnet[i].subnet;

 			msk = (char *)&subnet[i].mask;

 			

-			ShowMessage("Subnet check result: "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n",

-				sbn[0], sbn[1], sbn[2], sbn[3], msk[0], msk[1], msk[2], msk[3]);

+			ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n",

+				src[0], src[1], src[2], src[3], sbn[0], sbn[1], sbn[2], sbn[3], msk[0], msk[1], msk[2], msk[3]);

 			

 			return subnet[i].char_ip;

 		}

 	}

 	

-	ShowMessage("Subnet check result: "CL_CYAN"no matches."CL_RESET"\n");

+	ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", src[0], src[1], src[2], src[3]);

 	return 0;

 }