From 8333597dfaecfca2cac6b98390a8fb7131cb2a09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 Jan 2012 19:29:52 +0300 Subject: Add support for logging bytes from packets. --- src/net/messagein.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/net/messagein.cpp') diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 4fb61dc6a..8a51667db 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -262,6 +262,21 @@ char *MessageIn::readBytes(int length) buf[length + 1] = 0; mPos += length; +#ifdef ENABLEDEBUGLOG + std::string str; + for (int f = 0;f < length; f ++) + str += strprintf ("%02x", buf[f]); + str += " "; + for (int f = 0;f < length; f ++) + { + if (buf[f]) + str += strprintf ("%c", buf[f]); + else + str += "_"; + } + logger->log("ReadBytes: " + str); +#endif + PacketCounters::incInBytes(length); return buf; } -- cgit v1.2.3-70-g09d2 From e5695ad6c41d4deb79504998b2bc5caeb1e61285 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 28 Jan 2012 20:59:11 +0300 Subject: Fix ReadBytes possible issues. --- src/net/messagein.cpp | 6 +++--- src/net/messagein.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/net/messagein.cpp') diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 8a51667db..6efc3ddfe 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -241,7 +241,7 @@ std::string MessageIn::readRawString(int length) return str; } -char *MessageIn::readBytes(int length) +unsigned char *MessageIn::readBytes(int length) { // Get string length if (length < 0) @@ -255,7 +255,7 @@ char *MessageIn::readBytes(int length) return nullptr; } - char *buf = new char[length + 2]; + unsigned char *buf = new unsigned char[length + 2]; memcpy (buf, mData + mPos, length); buf[length] = 0; @@ -265,7 +265,7 @@ char *MessageIn::readBytes(int length) #ifdef ENABLEDEBUGLOG std::string str; for (int f = 0;f < length; f ++) - str += strprintf ("%02x", buf[f]); + str += strprintf ("%02x", (unsigned)buf[f]); str += " "; for (int f = 0;f < length; f ++) { diff --git a/src/net/messagein.h b/src/net/messagein.h index 8dd43a1a0..1eb5bf232 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -95,7 +95,7 @@ class MessageIn virtual std::string readRawString(int length); - char *readBytes(int length); + unsigned char *readBytes(int length); virtual ~MessageIn() { } -- cgit v1.2.3-70-g09d2 From 9ae83b4bb267c032f9499e80bc6b3bcd9fb37e71 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 29 Jan 2012 18:17:21 +0300 Subject: Fix code style. --- src/gui/widgets/vertcontainer.h | 2 +- src/mumblemanager.cpp | 1 - src/net/inventoryhandler.h | 2 +- src/net/manaserv/specialhandler.cpp | 4 ++-- src/net/messagein.cpp | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/net/messagein.cpp') diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 9460c837e..b4e43d31d 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -40,7 +40,7 @@ class VertContainer : public Container, public gcn::WidgetListener int leftSpacing = 0); virtual void add2(gcn::Widget *widget, bool resizable, - int spacing = -1); + int spacing = -1); virtual void add1(gcn::Widget *widget, int spacing = -1); diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index 766f4085e..14ca7d527 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -78,7 +78,6 @@ void MumbleManager::init() #if defined BSD4_4 return; #endif - if (mLinkedMem || !config.getBoolValue("enableMumble")) return; diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 45f7c3028..642d6f1c1 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -58,7 +58,7 @@ class InventoryHandler //void changeCart() = 0; virtual void moveItem2(int source, int slot, int amount, - int destination) = 0; + int destination) = 0; // TODO: fix/remove me virtual size_t getSize(int type) const = 0; diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp index 73fa864a3..c168afd7c 100644 --- a/src/net/manaserv/specialhandler.cpp +++ b/src/net/manaserv/specialhandler.cpp @@ -59,8 +59,8 @@ void SpecialHandler::useBeing(int id A_UNUSED, int level A_UNUSED, // TODO } -void SpecialHandler::usePos(int id A_UNUSED, int level A_UNUSED, int x A_UNUSED, - int y A_UNUSED) +void SpecialHandler::usePos(int id A_UNUSED, int level A_UNUSED, + int x A_UNUSED, int y A_UNUSED) { // TODO } diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 6efc3ddfe..0547ed337 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -264,10 +264,10 @@ unsigned char *MessageIn::readBytes(int length) #ifdef ENABLEDEBUGLOG std::string str; - for (int f = 0;f < length; f ++) + for (int f = 0; f < length; f ++) str += strprintf ("%02x", (unsigned)buf[f]); str += " "; - for (int f = 0;f < length; f ++) + for (int f = 0; f < length; f ++) { if (buf[f]) str += strprintf ("%c", buf[f]); -- cgit v1.2.3-70-g09d2