Reverted my recent changes to trunk.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12493 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
f009cc6e5a
commit
c72d39ae5b
@ -2,9 +2,6 @@
|
||||
|
||||
// TXT version options only
|
||||
|
||||
// Account flatfile database, stores account information.
|
||||
account_txt: save/account.txt
|
||||
|
||||
// Storage flatfile database, used for Karfa storage.
|
||||
storage_txt: save/storage.txt
|
||||
|
||||
|
@ -62,6 +62,9 @@ new_account: yes
|
||||
allowed_regs: 1
|
||||
time_allowed: 10
|
||||
|
||||
// Account flatfile database, stores account information.
|
||||
account_filename: save/account.txt
|
||||
|
||||
// What account AIDs have GM privs, and what level?
|
||||
gm_account_filename: conf/GM_account.txt
|
||||
|
||||
@ -69,9 +72,6 @@ gm_account_filename: conf/GM_account.txt
|
||||
// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
|
||||
gm_account_filename_check_timer: 15
|
||||
|
||||
// Log Filename. All operations received by the server are logged in this file.
|
||||
login_log_filename: log/login.log
|
||||
|
||||
// To log the login server?
|
||||
// NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
|
||||
log_login: yes
|
||||
|
@ -10,7 +10,7 @@ COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h
|
||||
../common/grfio.h ../common/mapindex.h \
|
||||
../common/ers.h ../common/md5calc.h
|
||||
|
||||
LOGIN_OBJ = obj_txt/login.o obj_txt/login_txt.o obj_txt/admin.o
|
||||
LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o
|
||||
LOGIN_H = login.h
|
||||
|
||||
@SET_MAKE@
|
||||
|
@ -1,6 +1,3 @@
|
||||
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
|
||||
// For more information, see LICENCE in the main folder
|
||||
|
||||
#include "../common/cbasetypes.h"
|
||||
#include "../common/mmo.h"
|
||||
#include "../common/core.h"
|
||||
|
2145
src/login/login.c
2145
src/login/login.c
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,6 @@
|
||||
#include "../common/mmo.h" // NAME_LENGTH
|
||||
|
||||
#define LOGIN_CONF_NAME "conf/login_athena.conf"
|
||||
#define INTER_CONF_NAME "conf/inter_athena.conf"
|
||||
#define LAN_CONF_NAME "conf/subnet_athena.conf"
|
||||
|
||||
// supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
|
||||
@ -39,9 +38,9 @@ struct mmo_char_server {
|
||||
int fd;
|
||||
uint32 ip;
|
||||
uint16 port;
|
||||
uint16 users; // user count on this server
|
||||
uint16 maintenance; // in maintenance mode?
|
||||
uint16 new_; // should display as 'new'?
|
||||
uint16 users; // user count on this server
|
||||
uint16 maintenance; // in maintenance mode?
|
||||
uint16 new_; // allows creating new chars?
|
||||
};
|
||||
|
||||
struct Login_Config {
|
||||
@ -54,19 +53,19 @@ struct Login_Config {
|
||||
bool console; // console input system enabled?
|
||||
bool new_account_flag; // autoregistration via _M/_F ?
|
||||
int start_limited_time; // new account expiration time (-1: unlimited)
|
||||
bool case_sensitive; // are logins case sensitive ?
|
||||
// bool case_sensitive; // are logins case sensitive ?
|
||||
bool use_md5_passwds; // work with password hashes instead of plaintext passwords?
|
||||
bool login_gm_read; // should the login server handle info about gm accounts?
|
||||
// bool login_gm_read; // should the login server handle info about gm accounts?
|
||||
int min_level_to_connect; // minimum level of player/GM (0: player, 1-99: GM) to connect
|
||||
bool online_check; // reject incoming players that are already registered as online ?
|
||||
bool check_client_version; // check the clientversion set in the clientinfo ?
|
||||
int client_version_to_connect; // the client version needed to connect (if checking is enabled)
|
||||
|
||||
bool ipban; // perform IP blocking (via contents of `ipbanlist`) ?
|
||||
bool dynamic_pass_failure_ban; // automatic IP blocking due to failed login attemps ?
|
||||
unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
|
||||
unsigned int dynamic_pass_failure_ban_limit; // number of failures needed to trigger the ipban
|
||||
unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
|
||||
// bool ipban; // perform IP blocking (via contents of `ipbanlist`) ?
|
||||
// bool dynamic_pass_failure_ban; // automatic IP blocking due to failed login attemps ?
|
||||
// unsigned int dynamic_pass_failure_ban_interval; // how far to scan the loginlog for password failures
|
||||
// unsigned int dynamic_pass_failure_ban_limit; // number of failures needed to trigger the ipban
|
||||
// unsigned int dynamic_pass_failure_ban_duration; // duration of the ipban
|
||||
bool use_dnsbl; // dns blacklist blocking ?
|
||||
char dnsbl_servs[1024]; // comma-separated list of dnsbl servers
|
||||
|
||||
@ -91,21 +90,5 @@ struct mmo_account {
|
||||
struct global_reg account_reg2[ACCOUNT_REG2_NUM]; // account script variables (stored on login server)
|
||||
};
|
||||
|
||||
struct auth_node {
|
||||
|
||||
int account_id;
|
||||
uint32 login_id1;
|
||||
uint32 login_id2;
|
||||
uint32 ip;
|
||||
char sex;
|
||||
};
|
||||
|
||||
struct online_login_data {
|
||||
|
||||
int account_id;
|
||||
int waiting_disconnect;
|
||||
int char_server;
|
||||
};
|
||||
|
||||
|
||||
#endif /* _LOGIN_H_ */
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -199,15 +199,11 @@ SOURCE=..\src\common\version.h
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\login\login.c
|
||||
SOURCE=..\src\login_sql\login.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\login\login.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\login\login_sql.c
|
||||
SOURCE=..\src\login_sql\login.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
@ -197,10 +197,6 @@ SOURCE=..\src\login\login.c
|
||||
|
||||
SOURCE=..\src\login\login.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\src\login\login_txt.c
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
|
@ -145,13 +145,10 @@
|
||||
Name="login_sql"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\src\login\login.c">
|
||||
RelativePath="..\src\login_sql\login.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_sql.c">
|
||||
RelativePath="..\src\login_sql\login.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
@ -156,9 +156,6 @@
|
||||
<File
|
||||
RelativePath="..\src\login\login.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_txt.c">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="common"
|
||||
|
@ -208,15 +208,11 @@
|
||||
Name="login_sql"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\login\login.c"
|
||||
RelativePath="..\src\login_sql\login.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_sql.c"
|
||||
RelativePath="..\src\login_sql\login.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -207,16 +207,12 @@
|
||||
RelativePath="..\src\login\admin.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_txt.c"
|
||||
RelativePath="..\src\login\login.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -206,15 +206,11 @@
|
||||
Name="login_sql"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\login\login.c"
|
||||
RelativePath="..\src\login_sql\login.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_sql.c"
|
||||
RelativePath="..\src\login_sql\login.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -212,10 +212,6 @@
|
||||
RelativePath="..\src\login\login.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\login\login_txt.c"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="common"
|
||||
|
Loading…
x
Reference in New Issue
Block a user