summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-01 12:38:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:54 +0300
commit11d80e856811ceddec805ce68b0a17b13f5cf25e (patch)
tree31e4c919f5acd2e20b5f805bbe8524b1d0f9f754 /src/net/eathena
parenta15146e08d00f9986edfde7a15a70790b64cc1ce (diff)
downloadplus-11d80e856811ceddec805ce68b0a17b13f5cf25e.tar.gz
plus-11d80e856811ceddec805ce68b0a17b13f5cf25e.tar.bz2
plus-11d80e856811ceddec805ce68b0a17b13f5cf25e.tar.xz
plus-11d80e856811ceddec805ce68b0a17b13f5cf25e.zip
In debug packets logging also display offset.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/messagein.cpp5
-rw-r--r--src/net/eathena/messageout.cpp7
2 files changed, 7 insertions, 5 deletions
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<size_t>(mPos), sizeof(int16_t));
#endif
}
+ DEBUGLOG2("readInt16: " + toStringPrint(static_cast<int>(value)),
+ mPos, str);
mPos += 2;
PacketCounters::incInBytes(2);
- DEBUGLOG2("readInt16: " + toStringPrint(static_cast<int>(value)), str);
return value;
}
@@ -78,9 +79,9 @@ int32_t MessageIn::readInt32(const char *const str)
memcpy(&value, mData + static_cast<size_t>(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<int>(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<size_t>(mPos), &value, sizeof(int16_t));
#endif
+ DEBUGLOG2("writeInt16: " + toStringPrint(static_cast<int>(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<unsigned>(x),
static_cast<unsigned>(y),
- static_cast<unsigned>(direction)), str);
+ static_cast<unsigned>(direction)), mPos, str);
unsigned char *const data = reinterpret_cast<unsigned char*>(mData)
+ static_cast<size_t>(mPos);
mNetwork->mOutSize += 3;