From 11d80e856811ceddec805ce68b0a17b13f5cf25e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Sep 2014 12:38:59 +0300 Subject: In debug packets logging also display offset. --- src/net/eathena/messagein.cpp | 5 +++-- src/net/eathena/messageout.cpp | 7 ++++--- src/net/messagein.cpp | 26 ++++++++++++++------------ src/net/messageout.cpp | 7 ++++--- src/net/tmwa/messagein.cpp | 5 +++-- src/net/tmwa/messageout.cpp | 7 ++++--- 6 files changed, 32 insertions(+), 25 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index e3918dd3a..60d89980d 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -59,9 +59,10 @@ int16_t MessageIn::readInt16(const char *const str) memcpy(&value, mData + static_cast(mPos), sizeof(int16_t)); #endif } + DEBUGLOG2("readInt16: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 2; PacketCounters::incInBytes(2); - DEBUGLOG2("readInt16: " + toStringPrint(static_cast(value)), str); return value; } @@ -78,9 +79,9 @@ int32_t MessageIn::readInt32(const char *const str) memcpy(&value, mData + static_cast(mPos), sizeof(int32_t)); #endif } + DEBUGLOG2("readInt32: " + toStringPrint(value), mPos, str); mPos += 4; PacketCounters::incInBytes(4); - DEBUGLOG2("readInt32: " + toStringPrint(value), str); return value; } diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index 7c5d328cb..1b0dae6f1 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -57,7 +57,6 @@ void MessageOut::expand(const size_t bytes) void MessageOut::writeInt16(const int16_t value, const char *const str) { - DEBUGLOG2("writeInt16: " + toStringPrint(static_cast(value)), str); expand(2); #if SDL_BYTEORDER == SDL_BIG_ENDIAN int16_t swap = SDL_Swap16(value); @@ -65,13 +64,15 @@ void MessageOut::writeInt16(const int16_t value, const char *const str) #else memcpy(mData + static_cast(mPos), &value, sizeof(int16_t)); #endif + DEBUGLOG2("writeInt16: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 2; PacketCounters::incOutBytes(2); } void MessageOut::writeInt32(const int32_t value, const char *const str) { - DEBUGLOG2("writeInt32: " + toStringPrint(value), str); + DEBUGLOG2("writeInt32: " + toStringPrint(value), mPos, str); expand(4); #if SDL_BYTEORDER == SDL_BIG_ENDIAN int32_t swap = SDL_Swap32(value); @@ -95,7 +96,7 @@ void MessageOut::writeCoordinates(const uint16_t x, DEBUGLOG2(strprintf("writeCoordinates: %u,%u %u", static_cast(x), static_cast(y), - static_cast(direction)), str); + static_cast(direction)), mPos, str); unsigned char *const data = reinterpret_cast(mData) + static_cast(mPos); mNetwork->mOutSize += 3; diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index b131e85e0..92447cde2 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -53,9 +53,10 @@ unsigned char MessageIn::readUInt8(const char *const str) if (mPos < mLength) value = static_cast(mData[mPos]); + DEBUGLOG2("readUInt8: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 1; PacketCounters::incInBytes(1); - DEBUGLOG2("readUInt8: " + toStringPrint(static_cast(value)), str); return value; } @@ -65,9 +66,10 @@ signed char MessageIn::readInt8(const char *const str) if (mPos < mLength) value = static_cast(mData[mPos]); + DEBUGLOG2("readInt8: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 1; PacketCounters::incInBytes(1); - DEBUGLOG2("readInt8: " + toStringPrint(static_cast(value)), str); return value; } @@ -120,7 +122,7 @@ void MessageIn::readCoordinates(uint16_t &restrict x, DEBUGLOG2(std::string("readCoordinates: ").append(toString( static_cast(x))).append(",").append(toString( static_cast(y))).append(",").append(toString( - static_cast(serverDir))), str); + static_cast(serverDir))), mPos, str); } else { @@ -157,7 +159,7 @@ void MessageIn::readCoordinatePair(uint16_t &restrict srcX, static_cast(srcX))).append(",").append(toString( static_cast(srcY))).append(" ").append(toString( static_cast(dstX))).append(",").append(toString( - static_cast(dstY))), str); + static_cast(dstY))), mPos, str); } else { @@ -173,9 +175,9 @@ void MessageIn::readCoordinatePair(uint16_t &restrict srcX, void MessageIn::skip(const unsigned int length, const char *const str) { + DEBUGLOG2("skip: " + toString(static_cast(length)), mPos, str); mPos += length; PacketCounters::incInBytes(length); - DEBUGLOG2("skip: " + toString(static_cast(length)), str); } std::string MessageIn::readString(int length, const char *const dstr) @@ -187,8 +189,8 @@ std::string MessageIn::readString(int length, const char *const dstr) // Make sure the string isn't erroneous if (length < 0 || mPos + length > mLength) { + DEBUGLOG2("readString error", mPos, dstr); mPos = mLength + 1; - DEBUGLOG2("readString error", dstr); return ""; } @@ -199,9 +201,9 @@ std::string MessageIn::readString(int length, const char *const dstr) const std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : static_cast(length)); + DEBUGLOG2("readString: " + str, mPos, dstr); mPos += length; PacketCounters::incInBytes(length); - DEBUGLOG2("readString: " + str, dstr); return str; } @@ -225,9 +227,7 @@ std::string MessageIn::readRawString(int length, const char *const dstr) std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : static_cast(length)); - mPos += length; - PacketCounters::incInBytes(length); - DEBUGLOG2("readString: " + str, dstr); + DEBUGLOG2("readString: " + str, mPos, dstr); if (stringEnd) { @@ -240,10 +240,12 @@ std::string MessageIn::readRawString(int length, const char *const dstr) stringEnd2 ? stringEnd2 - stringBeg2 : len2); if (hiddenPart.length() > 0) { - DEBUGLOG2("readString2: " + hiddenPart, dstr); + DEBUGLOG2("readString2: " + hiddenPart, mPos, dstr); return str.append("|").append(hiddenPart); } } + mPos += length; + PacketCounters::incInBytes(length); return str; } @@ -257,8 +259,8 @@ unsigned char *MessageIn::readBytes(int length, const char *const dstr) // Make sure the string isn't erroneous if (length < 0 || mPos + length > mLength) { + DEBUGLOG2("readBytesString error", mPos, dstr); mPos = mLength + 1; - DEBUGLOG2("readBytesString error", dstr); return nullptr; } diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index ff778d89a..0026538b5 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -47,9 +47,10 @@ MessageOut::MessageOut(const int16_t id A_UNUSED) : void MessageOut::writeInt8(const int8_t value, const char *const str) { - DEBUGLOG2("writeInt8: " + toStringPrint(static_cast(value)), str); expand(1); mData[mPos] = value; + DEBUGLOG2("writeInt8: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 1; PacketCounters::incOutBytes(1); } @@ -83,8 +84,8 @@ void MessageOut::writeString(const std::string &string, length - stringLength); } + DEBUGLOG2("writeString: " + string, mPos, str); mPos += length; - DEBUGLOG2("writeString: " + string, str); PacketCounters::incOutBytes(length); } @@ -117,8 +118,8 @@ void MessageOut::writeStringNoLog(const std::string &string, length - stringLength); } + DEBUGLOG2("writeString: ***", mPos, str); mPos += length; - DEBUGLOG2("writeString: ***", str); PacketCounters::incOutBytes(length); } diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index 18686f347..d467048d7 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -59,9 +59,10 @@ int16_t MessageIn::readInt16(const char *const str) memcpy(&value, mData + static_cast(mPos), sizeof(int16_t)); #endif } + DEBUGLOG2("readInt16: " + toStringPrint(static_cast(value)), + mPos, str); mPos += 2; PacketCounters::incInBytes(2); - DEBUGLOG2("readInt16: " + toStringPrint(static_cast(value)), str); return value; } @@ -78,9 +79,9 @@ int32_t MessageIn::readInt32(const char *const str) memcpy(&value, mData + static_cast(mPos), sizeof(int32_t)); #endif } + DEBUGLOG2("readInt32: " + toStringPrint(value), mPos, str); mPos += 4; PacketCounters::incInBytes(4); - DEBUGLOG2("readInt32: " + toStringPrint(value), str); return value; } diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index a740df563..a66c1c2b1 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -57,7 +57,8 @@ void MessageOut::expand(const size_t bytes) void MessageOut::writeInt16(const int16_t value, const char *const str) { - DEBUGLOG2("writeInt16: " + toStringPrint(static_cast(value)), str); + DEBUGLOG2("writeInt16: " + toStringPrint(static_cast(value)), + mPos, str); expand(2); #if SDL_BYTEORDER == SDL_BIG_ENDIAN int16_t swap = SDL_Swap16(value); @@ -71,7 +72,7 @@ void MessageOut::writeInt16(const int16_t value, const char *const str) void MessageOut::writeInt32(const int32_t value, const char *const str) { - DEBUGLOG2("writeInt32: " + toStringPrint(value), str); + DEBUGLOG2("writeInt32: " + toStringPrint(value), mPos, str); expand(4); #if SDL_BYTEORDER == SDL_BIG_ENDIAN int32_t swap = SDL_Swap32(value); @@ -94,7 +95,7 @@ void MessageOut::writeCoordinates(const uint16_t x, { DEBUGLOG2(strprintf("writeCoordinates: %u,%u %u", static_cast(x), static_cast(y), - static_cast(direction)), str); + static_cast(direction)), mPos, str); unsigned char *const data = reinterpret_cast(mData) + static_cast(mPos); mNetwork->mOutSize += 3; -- cgit v1.2.3-60-g2f50