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

[Improved]:

Browse Source 
- loginlog using unsigned long `ip` field. (Please check for compatibility problems). 
[Added]: 
- Mercenary.c in VS.NET 2005 project files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6868 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-05-31 02:13:23 +00:00
parent 8a6609900a
commit 15194233b8
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/30 2006/05/30
* [Added]:
- Mercenary.c in VS.NET 2005 project files
[Improved]:
- loginlog using unsigned long `ip` field.
(Please check for compatibility problems). [Lance]
* Fixed status_calc_pc not zero'ing ALL vars it should, allowing certain * Fixed status_calc_pc not zero'ing ALL vars it should, allowing certain
bonuses (like effect-on-hit) to stack. [Skotlex] bonuses (like effect-on-hit) to stack. [Skotlex]
* slaves inherit speed setting will now work regardless of whether the * slaves inherit speed setting will now work regardless of whether the

2
sql-files/main.sql
View File

@ -407,7 +407,7 @@ CREATE TABLE `sc_data` (
DROP TABLE IF EXISTS `loginlog`; DROP TABLE IF EXISTS `loginlog`;
CREATE TABLE `loginlog` ( CREATE TABLE `loginlog` (
`time` datetime NOT NULL default '0000-00-00 00:00:00', `time` datetime NOT NULL default '0000-00-00 00:00:00',
`ip` char(15) NOT NULL default '', `ip` int(10) unsigned NOT NULL default '0',
`user` varchar(32) NOT NULL default '', `user` varchar(32) NOT NULL default '',
`rcode` tinyint(4) NOT NULL default '0', `rcode` tinyint(4) NOT NULL default '0',
`log` varchar(255) NOT NULL default '', `log` varchar(255) NOT NULL default '',

18
src/login_sql/login.c
View File

@ -396,7 +396,7 @@ int mmo_auth_sqldb_init(void) {
if (log_login) if (log_login)
{ {
sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '', 'lserver', '100','login server started')", loginlog_db); sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '0', '100','login server started')", loginlog_db);
//query //query
if (mysql_query(&mysql_handle, tmpsql)) { if (mysql_query(&mysql_handle, tmpsql)) {
@ -430,7 +430,7 @@ void mmo_db_close(void) {
//set log. //set log.
if (log_login) if (log_login)
{ {
sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '', 'lserver','100', 'login server shutdown')", loginlog_db); sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '0', '0','100', 'login server shutdown')", loginlog_db);
//query //query
if (mysql_query(&mysql_handle, tmpsql)) { if (mysql_query(&mysql_handle, tmpsql)) {
@ -946,7 +946,7 @@ int parse_fromchar(int fd){
case 0x2709: case 0x2709:
if (log_login) if (log_login)
{ {
sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%d.%d.%d.%d', '%s','%s', 'GM reload request')", loginlog_db, p[0], p[1], p[2], p[3], server[id].name, RETCODE); sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s','%s', 'GM reload request')", loginlog_db, session[fd]->client_addr.sin_addr.S_un.S_addr,server[id].name, RETCODE);
if (mysql_query(&mysql_handle, tmpsql)) { if (mysql_query(&mysql_handle, tmpsql)) {
ShowSQL("DB error - %s\n",mysql_error(&mysql_handle)); ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
@ -1483,7 +1483,7 @@ int parse_login(int fd) {
ShowWarning("packet from banned ip : %d.%d.%d.%d\n" RETCODE, p[0], p[1], p[2], p[3]); ShowWarning("packet from banned ip : %d.%d.%d.%d\n" RETCODE, p[0], p[1], p[2], p[3]);
if (log_login) if (log_login)
{ {
sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%d.%d.%d.%d', 'unknown','-3', 'ip banned')", loginlog_db, p[0], p[1], p[2], p[3]); sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', 'unknown','-3', 'ip banned')", loginlog_db, session[fd]->client_addr.sin_addr.S_un.S_addr);
// query // query
if(mysql_query(&mysql_handle, tmpsql)) { if(mysql_query(&mysql_handle, tmpsql)) {
@ -1557,7 +1557,7 @@ int parse_login(int fd) {
} else { } else {
if (p[0] != 127 && log_login) { if (p[0] != 127 && log_login) {
sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%d.%d.%d.%d', '%s','100', 'login ok')", loginlog_db, p[0], p[1], p[2], p[3], t_uid); sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s','100', 'login ok')", loginlog_db, session[fd]->client_addr.sin_addr.S_un.S_addr, t_uid);
//query //query
if(mysql_query(&mysql_handle, tmpsql)) { if(mysql_query(&mysql_handle, tmpsql)) {
ShowSQL("DB error - %s\n",mysql_error(&mysql_handle)); ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
@ -1615,7 +1615,7 @@ int parse_login(int fd) {
char error[64]; char error[64];
if (log_login) if (log_login)
{ {
sprintf(tmp_sql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%d.%d.%d.%d', '%s', '%d','login failed : %%s')", loginlog_db, p[0], p[1], p[2], p[3], t_uid, result); sprintf(tmp_sql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s', '%d','login failed : %%s')", loginlog_db, session[fd]->client_addr.sin_addr.S_un.S_addr, t_uid, result);
switch((result + 1)) { switch((result + 1)) {
case -2: //-3 = Account Banned case -2: //-3 = Account Banned
sprintf(tmpsql,tmp_sql,"Account banned."); sprintf(tmpsql,tmp_sql,"Account banned.");
@ -1725,8 +1725,8 @@ int parse_login(int fd) {
} }
} //End login log of error. } //End login log of error.
if ((result == 1) && (dynamic_pass_failure_ban != 0) && log_login){ // failed password if ((result == 1) && (dynamic_pass_failure_ban != 0) && log_login){ // failed password
sprintf(tmpsql,"SELECT count(*) FROM `%s` WHERE `ip` = '%d.%d.%d.%d' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE", sprintf(tmpsql,"SELECT count(*) FROM `%s` WHERE `ip` = '%lu' AND `rcode` = '1' AND `time` > NOW() - INTERVAL %d MINUTE",
loginlog_db, p[0], p[1], p[2], p[3], dynamic_pass_failure_ban_time); //how many times filed account? in one ip. loginlog_db,session[fd]->client_addr.sin_addr.S_un.S_addr, dynamic_pass_failure_ban_time); //how many times filed account? in one ip.
if(mysql_query(&mysql_handle, tmpsql)) { if(mysql_query(&mysql_handle, tmpsql)) {
ShowSQL("DB error - %s\n",mysql_error(&mysql_handle)); ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
@ -1804,7 +1804,7 @@ int parse_login(int fd) {
unsigned char* server_name; unsigned char* server_name;
if (log_login) if (log_login)
{ {
sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%d.%d.%d.%d', '%s@%s','100', 'charserver - %s@%d.%d.%d.%d:%d')", loginlog_db, p[0], p[1], p[2], p[3], RFIFOP(fd, 2),RFIFOP(fd, 60),RFIFOP(fd, 60), RFIFOB(fd, 54), RFIFOB(fd, 55), RFIFOB(fd, 56), RFIFOB(fd, 57), RFIFOW(fd, 58)); sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s@%s','100', 'charserver - %s@%d.%d.%d.%d:%d')", loginlog_db, session[fd]->client_addr.sin_addr.S_un.S_addr, RFIFOP(fd, 2),RFIFOP(fd, 60),RFIFOP(fd, 60), RFIFOB(fd, 54), RFIFOB(fd, 55), RFIFOB(fd, 56), RFIFOB(fd, 57), RFIFOW(fd, 58));
//query //query
if(mysql_query(&mysql_handle, tmpsql)) { if(mysql_query(&mysql_handle, tmpsql)) {

4
vcproj-8/map-server_sql.vcproj
View File

@ -383,6 +383,10 @@
RelativePath="..\src\map\vending.c" RelativePath="..\src\map\vending.c"
> >
</File> </File>
<File
RelativePath="..\src\map\mercenary.c"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

4
vcproj-8/map-server_txt.vcproj
View File

@ -385,6 +385,10 @@
RelativePath="..\src\map\vending.c" RelativePath="..\src\map\vending.c"
> >
</File> </File>
<File
RelativePath="..\src\map\mercenary.c"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>