summaryrefslogtreecommitdiff
path: root/servergreps/packets.py
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-19 11:56:33 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-19 11:56:33 +0300
commit355cca0a0d1c754a7715f20e4ad925fa94082261 (patch)
tree58de549e3a8f394a63f089ab1fd5b2835efd2d1b /servergreps/packets.py
parentcf384d2d4c396daf164240aa3b16ca56ab4ac3bd (diff)
downloadtools-355cca0a0d1c754a7715f20e4ad925fa94082261.tar.gz
tools-355cca0a0d1c754a7715f20e4ad925fa94082261.tar.bz2
tools-355cca0a0d1c754a7715f20e4ad925fa94082261.tar.xz
tools-355cca0a0d1c754a7715f20e4ad925fa94082261.zip
servergreps: add packets based on constant name and not id.
Diffstat (limited to 'servergreps/packets.py')
-rwxr-xr-xservergreps/packets.py5
1 files changed, 5 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: