diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-11 16:31:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-11 16:31:37 +0300 |
commit | 49211f9ea1ef985fd6c84cdf902b35dbb8d779a6 (patch) | |
tree | 34e7565fe11ead41519428143b3dc44b752b6e4b /src/char/char.h | |
parent | a8e54e5688bd3d7b8e9073274ff611040c3178ab (diff) | |
parent | e13f1f782a9d8d25cc622d050644c7f29c1bfd5e (diff) | |
download | hercules-49211f9ea1ef985fd6c84cdf902b35dbb8d779a6.tar.gz hercules-49211f9ea1ef985fd6c84cdf902b35dbb8d779a6.tar.bz2 hercules-49211f9ea1ef985fd6c84cdf902b35dbb8d779a6.tar.xz hercules-49211f9ea1ef985fd6c84cdf902b35dbb8d779a6.zip |
Merge pull request #633 from HerculesWS/subnet
subnet.conf overhaul
Diffstat (limited to 'src/char/char.h')
-rw-r--r-- | src/char/char.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/char/char.h b/src/char/char.h index b3aa7bc34..3b6e0fa8c 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -145,7 +145,7 @@ struct char_interface { int new_display; char *CHAR_CONF_NAME; - char *LAN_CONF_NAME; + char *NET_CONF_NAME; ///< Network config filename char *SQL_CONF_NAME; char *INTER_CONF_NAME; @@ -256,7 +256,7 @@ struct char_interface { int (*parse_frommap) (int fd); int (*search_mapserver) (unsigned short map, uint32 ip, uint16 port); int (*mapif_init) (int fd); - int (*lan_subnetcheck) (uint32 ip); + uint32 (*lan_subnet_check) (uint32 ip); void (*delete2_ack) (int fd, int char_id, uint32 result, time_t delete_date); void (*delete2_accept_actual_ack) (int fd, int char_id, uint32 result); void (*delete2_accept_ack) (int fd, int char_id, uint32 result); @@ -305,7 +305,6 @@ struct char_interface { int (*check_connect_login_server) (int tid, int64 tick, int id, intptr_t data); int (*online_data_cleanup_sub) (DBKey key, DBData *data, va_list ap); int (*online_data_cleanup) (int tid, int64 tick, int id, intptr_t data); - int (*lan_config_read) (const char *lancfgName); void (*sql_config_read) (const char* cfgName); void (*config_dispatch) (char *w1, char *w2); int (*config_read) (const char* cfgName); |