From 236706b8432ac16534cb4d8d426a5b526b9e660b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 18 Oct 2011 02:24:46 +0300 Subject: Add method to reset send buffer pointer in created MessageOut instance. --- src/net/tmwa/messageout.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index da86f06f6..d97851d4a 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -56,6 +56,9 @@ class MessageOut : public Net::MessageOut void writeCoordinates(unsigned short x, unsigned short y, unsigned char direction); + void resetPos() + { mPos = 0; } + private: void expand(size_t size); -- cgit v1.2.3-60-g2f50 From 990c96c992c4cf21173c904dd85f0b378e1c89b0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 19 Oct 2011 01:05:22 +0300 Subject: Hide passwords from packets logs. --- src/net/messageout.cpp | 28 ++++++++++++++++++++++++++++ src/net/messageout.h | 7 +++++++ src/net/tmwa/loginhandler.cpp | 6 +++--- 3 files changed, 38 insertions(+), 3 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index a8b66f5ae..f18f65a93 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -82,6 +82,34 @@ void MessageOut::writeString(const std::string &string, int length) PacketCounters::incOutBytes(length); } +void MessageOut::writeStringNoLog(const std::string &string, int length) +{ + DEBUGLOG("writeString: ***"); + int stringLength = static_cast(string.length()); + if (length < 0) + { + // Write the length at the start if not fixed + writeInt16(static_cast(stringLength)); + length = stringLength; + } + else if (length < stringLength) + { + // Make sure the length of the string is no longer than specified + stringLength = length; + } + expand(length); + + // Write the actual string + memcpy(mData + mPos, string.c_str(), stringLength); + + // Pad remaining space with zeros + if (length > stringLength) + memset(mData + mPos + stringLength, '\0', length - stringLength); + + mPos += length; + PacketCounters::incOutBytes(length); +} + char *MessageOut::getData() const { return mData; diff --git a/src/net/messageout.h b/src/net/messageout.h index 39a2e68bd..4445bbbe8 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -56,6 +56,13 @@ class MessageOut */ virtual void writeString(const std::string &string, int length = -1); + /** + * Writes a string. If a fixed length is not given (-1), it is stored + * as a short at the start of the string. + */ + virtual void writeStringNoLog(const std::string &string, + int length = -1); + /** * Returns the content of the message. */ diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index cac8df623..bdc944d63 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -118,8 +118,8 @@ void LoginHandler::changePassword(const std::string &username A_UNUSED, const std::string &newPassword) { MessageOut outMsg(CMSG_CHAR_PASSWORD_CHANGE); - outMsg.writeString(oldPassword, 24); - outMsg.writeString(newPassword, 24); + outMsg.writeStringNoLog(oldPassword, 24); + outMsg.writeStringNoLog(newPassword, 24); } void LoginHandler::sendLoginRegister(const std::string &username, @@ -128,7 +128,7 @@ void LoginHandler::sendLoginRegister(const std::string &username, MessageOut outMsg(0x0064); outMsg.writeInt32(0); // client version outMsg.writeString(username, 24); - outMsg.writeString(password, 24); + outMsg.writeStringNoLog(password, 24); /* * eAthena calls the last byte "client version 2", but it isn't used at -- cgit v1.2.3-60-g2f50 From 2b696349cc1d6289b21ff667ae92a79cf9cabd17 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 19 Oct 2011 01:14:05 +0300 Subject: Add to debug log number of sended and received bytes. --- src/net/tmwa/network.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 0af74c295..e26f48324 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -260,6 +260,7 @@ void Network::flush() SDL_mutexP(mMutex); ret = SDLNet_TCP_Send(mSocket, mOutBuffer, mOutSize); + DEBUGLOG("Send " + toString(mOutSize) + " bytes"); if (ret < static_cast(mOutSize)) { setError("Error in SDLNet_TCP_Send(): " + @@ -427,6 +428,7 @@ void Network::receive() } else { + DEBUGLOG("Receive " + toString(ret) + " bytes"); mInSize += ret; if (mToSkip) { -- cgit v1.2.3-60-g2f50 From f1beb8d910253a31b9dd239071effa2d518ceee0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 23 Oct 2011 00:25:26 +0300 Subject: Add chat commands for using server side ignore for all whispers. Commands: /serverignoreall and /serverunignoreall --- src/commandhandler.cpp | 17 ++++++++++++++++ src/commandhandler.h | 6 ++++++ src/gui/chatwindow.cpp | 2 ++ src/net/chathandler.h | 4 ++++ src/net/ea/chathandler.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++ src/net/ea/chathandler.h | 2 ++ src/net/manaserv/chathandler.h | 4 ++++ src/net/tmwa/chathandler.cpp | 17 +++++++++++++++- src/net/tmwa/chathandler.h | 4 ++++ src/net/tmwa/protocol.h | 2 ++ 10 files changed, 102 insertions(+), 1 deletion(-) (limited to 'src/net/tmwa') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index f1b7518c5..7a4773d81 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -190,6 +190,10 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleAddIgnoreAttack(args, tab); else if (type == "dump") handleDump(args, tab); + else if (type == "serverignoreall") + handleServerIgnoreAll(args, tab); + else if (type == "serverunignoreall") + handleServerUnIgnoreAll(args, tab); else if (tab->handleCommand(type, args)) ; else if (type == "hack") @@ -1020,6 +1024,18 @@ void CommandHandler::handleCacheInfo(const std::string &args A_UNUSED, #endif } +void CommandHandler::handleServerIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED) +{ + Net::getChatHandler()->ignoreAll(); +} + +void CommandHandler::handleServerUnIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED) +{ + Net::getChatHandler()->unIgnoreAll(); +} + #ifdef DEBUG_DUMP_LEAKS void showRes(std::string str, ResourceManager::Resources *res); @@ -1076,6 +1092,7 @@ void CommandHandler::handleDump(const std::string &args, + toString(res->size())); } } + #elif defined ENABLE_MEM_DEBUG void CommandHandler::handleDump(const std::string &args A_UNUSED, ChatTab *tab A_UNUSED) diff --git a/src/commandhandler.h b/src/commandhandler.h index 52080dfcd..a082f950e 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -290,6 +290,12 @@ class CommandHandler void handleAddIgnoreAttack(const std::string &args, ChatTab *tab A_UNUSED); + void handleServerIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED); + + void handleServerUnIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED); + void handleDump(const std::string &args, ChatTab *tab); void handleCacheInfo(const std::string &args, ChatTab *tab A_UNUSED); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 59bd173bd..d8bc7f3c4 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -294,6 +294,8 @@ void ChatWindow::fillCommands() mCommands.push_back("/removeattack "); mCommands.push_back("/addignoreattack "); mCommands.push_back("/blacklist "); + mCommands.push_back("/serverignoreall"); + mCommands.push_back("/serverunignoreall"); } void ChatWindow::resetToDefaultSize() diff --git a/src/net/chathandler.h b/src/net/chathandler.h index a0e232027..fc6c10376 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -64,6 +64,10 @@ class ChatHandler virtual void who() = 0; virtual void sendRaw(const std::string &args) = 0; + + virtual void ignoreAll() = 0; + + virtual void unIgnoreAll() = 0; }; } diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 60af645be..35e8597f0 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -353,4 +353,49 @@ void ChatHandler::processMVP(Net::MessageIn &msg) } } +void ChatHandler::processIgnoreAllResponse(Net::MessageIn &msg) +{ + int action = msg.readInt8(); + int fail = msg.readInt8(); + if (!localChatTab) + return; + + switch (action) + { + case 0: + { + switch (fail) + { + case 0: + localChatTab->chatLog(_("All whispers ignored."), + BY_SERVER); + break; + default: + localChatTab->chatLog(_("All whispers ignore failed."), + BY_SERVER); + break; + } + break; + } + case 1: + { + switch (fail) + { + case 0: + localChatTab->chatLog(_("All whispers unignored."), + BY_SERVER); + break; + default: + localChatTab->chatLog(_("All whispers unignore failed."), + BY_SERVER); + break; + } + break; + } + default: + // unknown result + break; + } +} + } // namespace Ea diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index d000b673d..cff9bf589 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -84,6 +84,8 @@ class ChatHandler : public Net::ChatHandler virtual void processMVP(Net::MessageIn &msg); + virtual void processIgnoreAllResponse(Net::MessageIn &msg); + protected: typedef std::queue WhisperQueue; WhisperQueue mSentWhispers; diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h index 5eb2a0ff4..beea40423 100644 --- a/src/net/manaserv/chathandler.h +++ b/src/net/manaserv/chathandler.h @@ -133,6 +133,10 @@ class ChatHandler : public MessageHandler, public Net::ChatHandler * Handle who responses. */ void handleWhoResponse(Net::MessageIn &msg); + + void ignoreAll() + + void unIgnoreAll() }; } // namespace ManaServ diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 4e4318595..fe6592d93 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -60,6 +60,7 @@ ChatHandler::ChatHandler() SMSG_WHISPER_RESPONSE, SMSG_GM_CHAT, SMSG_MVP, // MVP + SMSG_IGNORE_ALL_RESPONSE, 0 }; handledMessages = _messages; @@ -96,6 +97,9 @@ void ChatHandler::handleMessage(Net::MessageIn &msg) processMVP(msg); break; + case SMSG_IGNORE_ALL_RESPONSE: + processIgnoreAllResponse(msg); + default: break; } @@ -249,5 +253,16 @@ void ChatHandler::processRaw(MessageOut &outMsg, std::string &line) } } -} // namespace TmwAthena +void ChatHandler::ignoreAll() +{ + MessageOut outMsg(CMSG_IGNORE_ALL); + outMsg.writeInt8(0); +} +void ChatHandler::unIgnoreAll() +{ + MessageOut outMsg(CMSG_IGNORE_ALL); + outMsg.writeInt8(1); +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index d9e927e03..197ba12b3 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -57,6 +57,10 @@ class ChatHandler : public MessageHandler, public Ea::ChatHandler void sendRaw(const std::string &args); + void ignoreAll(); + + void unIgnoreAll(); + void processRaw(MessageOut &outMsg, std::string &line); }; diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 3a753e351..caf3c8e53 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -331,5 +331,7 @@ enum #define SMSG_BEING_IP_RESPONSE 0x020c #define SMSG_PVP_MAP_MODE 0x0199 #define SMSG_PVP_SET 0x019a +#define CMSG_IGNORE_ALL 0x00d0 +#define SMSG_IGNORE_ALL_RESPONSE 0x00d2 #endif -- cgit v1.2.3-60-g2f50