servergreps: add packets based on constant name and not id.

2 files changed, 52 insertions, 0 deletions

diff --git a/servergreps/packets.py b/servergreps/packets.py
index 4e3e922..1f7dbf2 100755
--- a/servergreps/packets.py
+++ b/servergreps/packets.py
@@ -10,6 +10,7 @@ import re
 filt = re.compile(".+[.]c", re.IGNORECASE)
 serverpacketre = re.compile("(WFIFOW|WBUFW)([ ]*)[(]([ ]*)([\w>_-]+),([ ]*)"
     + "(?P<offset>0)([ ]*)[)]([ ]*)=([ ]*)0x(?P<packet>[0-9a-fA-F]+)([ ]*)[;]")
+serverpacketre2 = re.compile("[.]PacketType([ ]*)=([ ]*)(?P<name>[\w]+);")
 protocolre = re.compile("#define[ ](?P<name>[A-Z0-9_]+)([ ]*)0x(?P<packet>[0-9a-fA-F]+)")
 
 packetsSet = set()
@@ -35,6 +36,10 @@ def collectServerPackets(parentDir):
                             while len(data) < 4:
                                 data = "0" + data
                             packetsSet.add(data.lower())
+                    m = serverpacketre2.findall(line)
+                    if len(m) > 0:
+                        for str in m:
+                            packetsSet.add(str[2].lower())
 
 def sortServerPackets():
     for packet in packetsSet:
diff --git a/servergreps/serverpackets.txt b/servergreps/serverpackets.txt
index fa59230..151334a 100644
--- a/servergreps/serverpackets.txt
+++ b/servergreps/serverpackets.txt
@@ -364,6 +364,7 @@ b08 client name: SMSG_CHAT_JOIN_CHANNEL
 b0a client name: SMSG_BEING_ATTRS
 b0b client name: SMSG_NPC_AREA
 b10 client name: SMSG_ONLINE_LIST
+xa1a
 2710
 2711
 2712
@@ -570,3 +571,49 @@ b10 client name: SMSG_ONLINE_LIST
 3893
 3894
 7531 client name: SMSG_SERVER_VERSION_RESPONSE
+additemtype
+authoktype
+banking_checktype
+banking_deposit_acktype
+banking_withdraw_acktype
+bgqueue_acktype
+bgqueue_battlebeginstype
+bgqueue_notice_deletetype
+bgqueue_notify_entrytype
+bgqueue_updateinfotype
+cart_additem_acktype
+cartlistequiptype
+cartlistnormaltype
+damagetype
+dropflooritemtype
+equipitemacktype
+graffiti_entrytype
+idle_unit2type
+idle_unittype
+inventorylistequiptype
+inventorylistnormaltype
+item_drop_announcetype
+maptypeproperty2type
+monsterhptype
+notify_bounditemtype
+npcmarketopentype
+npcmarketresultacktype
+package_item_announcetype
+partyleaderchangedtype
+rouletteinfoacktype
+roulettercvitemacktype
+roulettgenerateacktype
+sc_noticktype
+script_cleartype
+skill_entrytype
+spawn_unit2type
+spawn_unittype
+status_change2type
+status_change_endtype
+status_changetype
+storagelistequiptype
+storagelistnormaltype
+unequipitemacktype
+unit_walkingtype
+viewequipacktype
+wisendtype