pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed query release order and converted LoginIP to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-07-03 15:34:42 -07:00 committed by Arthur Ice
parent 418e4ffee8
commit 1bfdeeeb16
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/database.cpp
View File

@ -165,14 +165,17 @@ uint32 Database::CheckLogin(const char* name, const char* password, int16* oStat
"and length(password) > 0 and (password='%s' or password=MD5('%s'))", "and length(password) > 0 and (password='%s' or password=MD5('%s'))",
tmpUN, tmpPW, tmpPW)); tmpUN, tmpPW, tmpPW));
safe_delete_array(query);
if (!results.Success()) if (!results.Success())
{ {
safe_delete_array(query);
std::cerr << "Error in CheckLogin query '" << query << "' " << results.ErrorMessage() << std::endl; std::cerr << "Error in CheckLogin query '" << query << "' " << results.ErrorMessage() << std::endl;
return 0; return 0;
} }
safe_delete_array(query);
auto row = results.begin(); auto row = results.begin();
uint32 id = atoi(row[0]); uint32 id = atoi(row[0]);
@ -191,14 +194,16 @@ bool Database::CheckBannedIPs(const char* loginIP)
auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP)); auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP));
safe_delete_array(query);
if (!results.Success()) if (!results.Success())
{ {
std::cerr << "Error in CheckBannedIPs query '" << query << "' " << results.ErrorMessage() << std::endl; std::cerr << "Error in CheckBannedIPs query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query);
return true; return true;
} }
safe_delete_array(query);
if (results.RowCount() != 0) if (results.RowCount() != 0)
return true; return true;
@ -211,14 +216,15 @@ bool Database::AddBannedIP(char* bannedIP, const char* notes)
auto results = QueryDatabase(query, MakeAnyLenString(&query, "INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes)); auto results = QueryDatabase(query, MakeAnyLenString(&query, "INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes));
safe_delete_array(query);
if (!results.Success()) if (!results.Success())
{ {
std::cerr << "Error in ReserveName query '" << query << "' " << results.ErrorMessage() << std::endl; std::cerr << "Error in ReserveName query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query);
return false; return false;
} }
safe_delete_array(query);
return true; return true;
} }
@ -250,12 +256,13 @@ bool Database::AddGMIP(char* ip_address, char* name) {
void Database::LoginIP(uint32 AccountID, const char* LoginIP) void Database::LoginIP(uint32 AccountID, const char* LoginIP)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; char *query = nullptr;
char *query = 0;
auto results = QueryDatabase(query, MakeAnyLenString(&query, "INSERT INTO account_ip SET accid=%i, ip='%s' ON DUPLICATE KEY UPDATE count=count+1, lastused=now()", AccountID, LoginIP));
if (!results.Success())
std::cerr << "Error in Log IP query '" << query << "' " << results.ErrorMessage() << std::endl;
if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO account_ip SET accid=%i, ip='%s' ON DUPLICATE KEY UPDATE count=count+1, lastused=now()", AccountID, LoginIP), errbuf)) {
std::cerr << "Error in Log IP query '" << query << "' " << errbuf << std::endl;
}
safe_delete_array(query); safe_delete_array(query);
} }