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

Fixed bugreport:5828 Added missing min_group_id_to_connect functionality to login server (presumably removed by accident in r15572).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16185 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-31 18:50:59 +00:00
parent ea0fba8394
commit 174068d04e
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/login_athena.conf
View File

@ -67,6 +67,12 @@ date_format: %Y-%m-%d %H:%M:%S
// 0 or more: group id // 0 or more: group id
group_id_to_connect: -1 group_id_to_connect: -1
// Minimum account group id required to connect to server.
// Will not function if group_id_to_connect config is enabled.
// -1: disabled
// 0 or more: group id
min_group_id_to_connect: -1
// Starting additional sec from now for the limited time at creation of account // Starting additional sec from now for the limited time at creation of account
// -1: new account are created with UNlimited time (default value) // -1: new account are created with UNlimited time (default value)
// 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time) // 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)

13
src/login/login.c
View File

@ -1112,14 +1112,20 @@ void login_auth_ok(struct login_session_data* sd)
return; return;
} }
if( login_config.group_id_to_connect >= 0 && sd->group_id != login_config.group_id_to_connect ) if( login_config.group_id_to_connect >= 0 && sd->group_id != login_config.group_id_to_connect ) {
{
ShowStatus("Connection refused: the required group id for connection is %d (account: %s, group: %d).\n", login_config.group_id_to_connect, sd->userid, sd->group_id); ShowStatus("Connection refused: the required group id for connection is %d (account: %s, group: %d).\n", login_config.group_id_to_connect, sd->userid, sd->group_id);
WFIFOHEAD(fd,3); WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x81; WFIFOW(fd,0) = 0x81;
WFIFOB(fd,2) = 1; // 01 = Server closed WFIFOB(fd,2) = 1; // 01 = Server closed
WFIFOSET(fd,3); WFIFOSET(fd,3);
return; return;
} else if( login_config.min_group_id_to_connect >= 0 && login_config.group_id_to_connect == -1 && sd->group_id < login_config.min_group_id_to_connect ) {
ShowStatus("Connection refused: the minium group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x81;
WFIFOB(fd,2) = 1; // 01 = Server closed
WFIFOSET(fd,3);
return;
} }
server_num = 0; server_num = 0;
@ -1538,6 +1544,7 @@ void login_set_defaults()
login_config.new_acc_length_limit = true; login_config.new_acc_length_limit = true;
login_config.use_md5_passwds = false; login_config.use_md5_passwds = false;
login_config.group_id_to_connect = -1; login_config.group_id_to_connect = -1;
login_config.min_group_id_to_connect = -1;
login_config.check_client_version = false; login_config.check_client_version = false;
login_config.client_version_to_connect = 20; login_config.client_version_to_connect = 20;
@ -1606,6 +1613,8 @@ int login_config_read(const char* cfgName)
login_config.use_md5_passwds = (bool)config_switch(w2); login_config.use_md5_passwds = (bool)config_switch(w2);
else if(!strcmpi(w1, "group_id_to_connect")) else if(!strcmpi(w1, "group_id_to_connect"))
login_config.group_id_to_connect = atoi(w2); login_config.group_id_to_connect = atoi(w2);
else if(!strcmpi(w1, "min_group_id_to_connect"))
login_config.min_group_id_to_connect = atoi(w2);
else if(!strcmpi(w1, "date_format")) else if(!strcmpi(w1, "date_format"))
safestrncpy(login_config.date_format, w2, sizeof(login_config.date_format)); safestrncpy(login_config.date_format, w2, sizeof(login_config.date_format));
else if(!strcmpi(w1, "console")) else if(!strcmpi(w1, "console"))

1
src/login/login.h
View File

@ -65,6 +65,7 @@ struct Login_Config {
int start_limited_time; // new account expiration time (-1: unlimited) int start_limited_time; // new account expiration time (-1: unlimited)
bool use_md5_passwds; // work with password hashes instead of plaintext passwords? bool use_md5_passwds; // work with password hashes instead of plaintext passwords?
int group_id_to_connect; // required group id to connect int group_id_to_connect; // required group id to connect
int min_group_id_to_connect; // minimum group id to connect
bool check_client_version; // check the clientversion set in the clientinfo ? bool check_client_version; // check the clientversion set in the clientinfo ?
uint32 client_version_to_connect; // the client version needed to connect (if checking is enabled) uint32 client_version_to_connect; // the client version needed to connect (if checking is enabled)