summaryrefslogtreecommitdiff
path: root/src/login_sql
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-30 21:56:07 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-30 21:56:07 +0000
commit96e486ad8b183582ce3566d63694f1eaabafba21 (patch)
tree849fe01b5f23452b7ea201e67434af867e74af03 /src/login_sql
parenta377ccd04a40116d534fea980b26cbc0b5ad727d (diff)
downloadhercules-96e486ad8b183582ce3566d63694f1eaabafba21.tar.gz
hercules-96e486ad8b183582ce3566d63694f1eaabafba21.tar.bz2
hercules-96e486ad8b183582ce3566d63694f1eaabafba21.tar.xz
hercules-96e486ad8b183582ce3566d63694f1eaabafba21.zip
Removed redundant 'subnet' s_subnet structure variable.
Removed duplicate code from the sql charserver that somehow appeared after the tmpsql merge. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11333 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/login_sql')
-rw-r--r--src/login_sql/login.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 49f31438d..b3f5e2058 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -54,7 +54,6 @@ struct mmo_char_server server[MAX_SERVERS]; // char server data
// Advanced subnet check [LuzZza]
struct s_subnet {
- uint32 subnet;
uint32 mask;
uint32 char_ip;
uint32 map_ip;
@@ -1204,7 +1203,7 @@ int parse_fromchar(int fd)
int lan_subnetcheck(uint32 ip)
{
int i;
- ARR_FIND( 0, subnet_count, i, subnet[i].subnet == (ip & subnet[i].mask) );
+ ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
return ( i < subnet_count ) ? subnet[i].char_ip : 0;
}
@@ -1677,13 +1676,14 @@ int login_lan_config_read(const char *lancfgName)
remove_control_chars(w3);
remove_control_chars(w4);
- if(strcmpi(w1, "subnet") == 0) {
-
+ if( strcmpi(w1, "subnet") == 0 )
+ {
subnet[subnet_count].mask = str2ip(w2);
subnet[subnet_count].char_ip = str2ip(w3);
subnet[subnet_count].map_ip = str2ip(w4);
- subnet[subnet_count].subnet = subnet[subnet_count].char_ip&subnet[subnet_count].mask;
- if (subnet[subnet_count].subnet != (subnet[subnet_count].map_ip&subnet[subnet_count].mask)) {
+
+ if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )
+ {
ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
continue;
}