diff options
Diffstat (limited to 'src/banmaster/banmaster.cpp')
| -rw-r--r-- | src/banmaster/banmaster.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/banmaster/banmaster.cpp b/src/banmaster/banmaster.cpp index 9aacfda0..e9057579 100644 --- a/src/banmaster/banmaster.cpp +++ b/src/banmaster/banmaster.cpp @@ -54,7 +54,7 @@ int SendResponse(NETADDR *pAddr, NETADDR *pCheck) CBan* pBan = CheckBan(pCheck); if(pBan) { - net_addr_str(pCheck, pIpBanContent, NETADDR_MAXSTRSIZE); + net_addr_str(pCheck, pIpBanContent, NETADDR_MAXSTRSIZE, 0); char *pIpBanReason = pIpBanContent + (str_length(pIpBanContent) + 1); str_copy(pIpBanReason, pBan->m_aReason, 256); @@ -80,12 +80,12 @@ void AddBan(NETADDR *pAddr, const char *pReason) CBan *pBan = CheckBan(pAddr); char aAddressStr[NETADDR_MAXSTRSIZE]; - net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr)); + net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr), 0); if(pBan) { char aAddressStr[NETADDR_MAXSTRSIZE]; - net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr)); + net_addr_str(pAddr, aAddressStr, sizeof(aAddressStr), 0); dbg_msg("banmaster", "updated ban, ip=%s oldreason='%s' reason='%s'", aAddressStr, pBan->m_aReason, pReason); str_copy(pBan->m_aReason, pReason, sizeof(m_aBans[m_NumBans].m_aReason)); @@ -124,7 +124,7 @@ void PurgeBans() { // remove ban char aBuf[NETADDR_MAXSTRSIZE]; - net_addr_str(&m_aBans[i].m_Address, aBuf, sizeof(aBuf)); + net_addr_str(&m_aBans[i].m_Address, aBuf, sizeof(aBuf), 0); dbg_msg("banmaster", "ban expired, ip=%s reason='%s'", aBuf, m_aBans[i].m_aReason); m_aBans[i] = m_aBans[m_NumBans - 1]; m_NumBans--; @@ -174,7 +174,7 @@ int main(int argc, const char **argv) // ignore_convention net_init(); IKernel *pKernel = IKernel::Create(); - IStorage *pStorage = CreateStorage("Teeworlds", argc, argv); // ignore_convention + IStorage *pStorage = CreateStorage("Teeworlds", IStorage::STORAGETYPE_BASIC, argc, argv); // ignore_convention m_pConsole = CreateConsole(CFGFLAG_BANMASTER); m_pConsole->RegisterPrintCallback(2, StandardOutput, 0); @@ -220,9 +220,9 @@ int main(int argc, const char **argv) // ignore_convention while(m_Net.Recv(&Packet)) { char aAddressStr[NETADDR_MAXSTRSIZE]; - net_addr_str(&Packet.m_Address, aAddressStr, sizeof(aAddressStr)); + net_addr_str(&Packet.m_Address, aAddressStr, sizeof(aAddressStr), 0); - if(Packet.m_DataSize >= sizeof(BANMASTER_IPCHECK) && mem_comp(Packet.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0) + if(Packet.m_DataSize >= (int)sizeof(BANMASTER_IPCHECK) && mem_comp(Packet.m_pData, BANMASTER_IPCHECK, sizeof(BANMASTER_IPCHECK)) == 0) { char *pAddr = (char *)Packet.m_pData + sizeof(BANMASTER_IPCHECK); NETADDR CheckAddr; @@ -237,7 +237,7 @@ int main(int argc, const char **argv) // ignore_convention int Banned = SendResponse(&Packet.m_Address, &CheckAddr); char aBuf[NETADDR_MAXSTRSIZE]; - net_addr_str(&CheckAddr, aBuf, sizeof(aBuf)); + net_addr_str(&CheckAddr, aBuf, sizeof(aBuf), 0); dbg_msg("banmaster", "responded to checkmsg, ip=%s checkaddr=%s result=%s", aAddressStr, aBuf, (Banned) ? "ban" : "ok"); } } |