servergreps: add logging for wrong client to server packet id.

13 files changed, 66 insertions, 3 deletions

diff --git a/servergreps/hercules/00000000/clientbadpackets.txt b/servergreps/hercules/00000000/clientbadpackets.txt
new file mode 100644
index 0000000..8da9a64
--- /dev/null
+++ b/servergreps/hercules/00000000/clientbadpackets.txt
@@ -0,0 +1,3 @@
+00f3 CMSG_CHAT_MESSAGE                 client: clif->pGlobalMessage                server: clif->pMoveToKafra                  Change id to 008c
+0193 CMSG_CLOSE_STORAGE                client: clif->pCloseKafra                   server: clif->pSolveCharName                Change id to 00f7
+0202 CMSG_PLAYER_CHANGE_DIR            client: clif->pChangeDir                    server: clif->pFriendsListAdd               Change id to 009b
diff --git a/servergreps/hercules/00000007/clientbadpackets.txt b/servergreps/hercules/00000007/clientbadpackets.txt
new file mode 100644
index 0000000..8da9a64
--- /dev/null
+++ b/servergreps/hercules/00000007/clientbadpackets.txt
@@ -0,0 +1,3 @@
+00f3 CMSG_CHAT_MESSAGE                 client: clif->pGlobalMessage                server: clif->pMoveToKafra                  Change id to 008c
+0193 CMSG_CLOSE_STORAGE                client: clif->pCloseKafra                   server: clif->pSolveCharName                Change id to 00f7
+0202 CMSG_PLAYER_CHANGE_DIR            client: clif->pChangeDir                    server: clif->pFriendsListAdd               Change id to 009b
diff --git a/servergreps/hercules/20120700/clientbadpackets.txt b/servergreps/hercules/20120700/clientbadpackets.txt
new file mode 100644
index 0000000..ae71c27
--- /dev/null
+++ b/servergreps/hercules/20120700/clientbadpackets.txt
@@ -0,0 +1,4 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pWantToConnection             Change id to 0817
+0436 CMSG_SKILL_USE_POSITION           client: clif->pUseSkillToPos                server: clif->pFriendsListAdd               Change id to 0438
+0871 CMSG_PLAYER_CHANGE_ACT            client: clif->pActionRequest                server: clif->pChangeDir                    Change id to 0369
+089c CMSG_MAP_SERVER_CONNECT           client: clif->pWantToConnection             server: clif->pFriendsListAdd               Change id to 022d
diff --git a/servergreps/hercules/20130000/clientbadpackets.txt b/servergreps/hercules/20130000/clientbadpackets.txt
new file mode 100644
index 0000000..b075c94
--- /dev/null
+++ b/servergreps/hercules/20130000/clientbadpackets.txt
@@ -0,0 +1,7 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pWantToConnection             Change id to 0817
+0436 CMSG_SKILL_USE_POSITION           client: clif->pUseSkillToPos                server: clif->pFriendsListAdd               Change id to 0438
+0811 CMSG_BUYINGSTORE_SELL             client: clif->pReqTradeBuyingStore          server: clif->pSearchStoreInfo              Change id to 0940
+0819 CMSG_SEARCHSTORE_SEARCH           client: clif->pSearchStoreInfo              server: clif->pStoragePassword              Change id to 0811
+0871 CMSG_PLAYER_CHANGE_ACT            client: clif->pActionRequest                server: clif->pChangeDir                    Change id to 0369
+089c CMSG_MAP_SERVER_CONNECT           client: clif->pWantToConnection             server: clif->pFriendsListAdd               Change id to 022d
+0940 CMSG_SEARCHSTORE_NEXT_PAGE        client: clif->pSearchStoreInfoNextPage      server: clif->pReqTradeBuyingStore          Change id to 0835
diff --git a/servergreps/hercules/20130221/clientbadpackets.txt b/servergreps/hercules/20130221/clientbadpackets.txt
new file mode 100644
index 0000000..b075c94
--- /dev/null
+++ b/servergreps/hercules/20130221/clientbadpackets.txt
@@ -0,0 +1,7 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pWantToConnection             Change id to 0817
+0436 CMSG_SKILL_USE_POSITION           client: clif->pUseSkillToPos                server: clif->pFriendsListAdd               Change id to 0438
+0811 CMSG_BUYINGSTORE_SELL             client: clif->pReqTradeBuyingStore          server: clif->pSearchStoreInfo              Change id to 0940
+0819 CMSG_SEARCHSTORE_SEARCH           client: clif->pSearchStoreInfo              server: clif->pStoragePassword              Change id to 0811
+0871 CMSG_PLAYER_CHANGE_ACT            client: clif->pActionRequest                server: clif->pChangeDir                    Change id to 0369
+089c CMSG_MAP_SERVER_CONNECT           client: clif->pWantToConnection             server: clif->pFriendsListAdd               Change id to 022d
+0940 CMSG_SEARCHSTORE_NEXT_PAGE        client: clif->pSearchStoreInfoNextPage      server: clif->pReqTradeBuyingStore          Change id to 0835
diff --git a/servergreps/hercules/20140000/clientbadpackets.txt b/servergreps/hercules/20140000/clientbadpackets.txt
new file mode 100644
index 0000000..0240309
--- /dev/null
+++ b/servergreps/hercules/20140000/clientbadpackets.txt
@@ -0,0 +1,5 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pItemListWindowSelected       Change id to 094c
+035f CMSG_MAP_PING                     client: clif->pTickSend                     server: clif->pWalkToXY                     Change id to 0438
+0436 CMSG_SKILL_USE_POSITION           client: clif->pUseSkillToPos                server: clif->pFriendsListAdd               Change id to 091e
+088a CMSG_NAME_REQUEST                 client: clif->pGetCharNameRequest           server: clif->pTickSend                     Change id to 0926
+0940 CMSG_SEARCHSTORE_NEXT_PAGE        client: clif->pSearchStoreInfoNextPage      server: clif->pFriendsListAdd               Change id to 0369
diff --git a/servergreps/hercules/20140403/clientbadpackets.txt b/servergreps/hercules/20140403/clientbadpackets.txt
new file mode 100644
index 0000000..f282dbd
--- /dev/null
+++ b/servergreps/hercules/20140403/clientbadpackets.txt
@@ -0,0 +1,8 @@
+0202 CMSG_PLAYER_CHANGE_DIR            client: clif->pChangeDir                    server: clif->pTakeItem                     Change id to 0360
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pWantToConnection             Change id to 0867
+0360 CMSG_BUYINGSTORE_OPEN             client: clif->pReqClickBuyingStore          server: clif->pChangeDir                    Change id to 023b
+0361 CMSG_HOMUNCULUS_MENU              client: clif->pHomMenu                      server: clif->pReqOpenBuyingStore           Change id to 0896
+07e4 CMSG_ITEM_PICKUP                  client: clif->pTakeItem                     server: clif->pFriendsListAdd               Change id to 0958
+07ec CMSG_MOVE_TO_STORAGE              client: clif->pMoveToKafra                  server: clif->pSolveCharName                Change id to 095c
+0815 CMSG_BUYINGSTORE_CREATE           client: clif->pReqOpenBuyingStore           server: clif->pChangeDir                    Change id to 0944
+0940 CMSG_SEARCHSTORE_NEXT_PAGE        client: clif->pSearchStoreInfoNextPage      server: clif->pTakeItem                     Change id to 085d
diff --git a/servergreps/hercules/20141016/clientbadpackets.txt b/servergreps/hercules/20141016/clientbadpackets.txt
new file mode 100644
index 0000000..82f7e9b
--- /dev/null
+++ b/servergreps/hercules/20141016/clientbadpackets.txt
@@ -0,0 +1,2 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pMoveFromKafra                Change id to 0817
+0940 CMSG_SEARCHSTORE_NEXT_PAGE        client: clif->pSearchStoreInfoNextPage      server: clif->pTakeItem                     Change id to 0835
diff --git a/servergreps/hercules/20141022/clientbadpackets.txt b/servergreps/hercules/20141022/clientbadpackets.txt
new file mode 100644
index 0000000..f8a64c9
--- /dev/null
+++ b/servergreps/hercules/20141022/clientbadpackets.txt
@@ -0,0 +1,2 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pMoveFromKafra                Change id to 0817
+0835 CMSG_SEARCHSTORE_CLICK            client: clif->pSearchStoreInfoNextPage      server: clif->pSearchStoreInfoListItemClick Change id to 0940
diff --git a/servergreps/hercules/20150226/clientbadpackets.txt b/servergreps/hercules/20150226/clientbadpackets.txt
new file mode 100644
index 0000000..f8a64c9
--- /dev/null
+++ b/servergreps/hercules/20150226/clientbadpackets.txt
@@ -0,0 +1,2 @@
+022d CMSG_BUYINGSTORE_CLOSE            client: clif->pReqCloseBuyingStore          server: clif->pMoveFromKafra                Change id to 0817
+0835 CMSG_SEARCHSTORE_CLICK            client: clif->pSearchStoreInfoNextPage      server: clif->pSearchStoreInfoListItemClick Change id to 0940
diff --git a/servergreps/hercules/20150513/clientbadpackets.txt b/servergreps/hercules/20150513/clientbadpackets.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/servergreps/hercules/20150513/clientbadpackets.txt
diff --git a/servergreps/hercules/20150805/clientbadpackets.txt b/servergreps/hercules/20150805/clientbadpackets.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/servergreps/hercules/20150805/clientbadpackets.txt
diff --git a/servergreps/hercules/packets.py b/servergreps/hercules/packets.py
index 38a8143..25e223d 100755
--- a/servergreps/hercules/packets.py
+++ b/servergreps/hercules/packets.py
@@ -31,7 +31,7 @@ clientPackets = dict()
 sizes = dict()
 manaplusUsedPacketsSet = set()
 namedPackets = dict()
-#idToServerFunction = dict()
+serverFunctionToId = dict()
 
 def addServerPacket(data):
     if data in namedPackets:
@@ -143,8 +143,7 @@ def collectClientPackets(fileName):
                 while len(data) < 4:
                     data = "0" + data
                 clientPackets[data] = (int(m.group("len")), m.group("function"));
-                #idToServerFunction[data] = m.group("function")
-                #print "{0},{1},{2}".format(m.group("packet"), m.group("len"), m.group("function"))
+                serverFunctionToId[m.group("function")] = data
 
 def collectManaPlusSizes(fileName):
     cnt = 0
@@ -298,6 +297,27 @@ def printPackets(packetDir):
             w.write(data)
             w.write("\n")
 
+    rev = []
+    with open(packetDir + "/clientbadpackets.txt", "w") as w:
+        for packet in clientPacketsManaPlusClient:
+            if packet in clientPackets and clientPacketsManaPlusClient[packet][2] != clientPackets[packet][1]:
+                packet1 = clientPacketsManaPlusClient[packet]
+                packet2 = clientPackets[packet]
+                if packet1[2] in serverFunctionToId:
+                    data = serverFunctionToId[packet1[2]]
+                else:
+                    data = "UNKNOWN"
+                rev.append("{0:4} {1:33} client: {2:35} server: {3:35} Change id to {4}".format(packet,
+                    packet1[0],
+                    packet1[2],
+                    packet2[1],
+                    data))
+        rev.sort()
+
+        for data in rev:
+            w.write(data)
+            w.write("\n")
+
 def showHelp():
     print("Usage: packets.py version");
     exit(1)