diff options
Diffstat (limited to 'servergreps/hercules/src/hercules.py')
| -rwxr-xr-x | servergreps/hercules/src/hercules.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/servergreps/hercules/src/hercules.py b/servergreps/hercules/src/hercules.py index 7c1b230..d069005 100755 --- a/servergreps/hercules/src/hercules.py +++ b/servergreps/hercules/src/hercules.py @@ -33,6 +33,9 @@ class Hercules: "(WFIFOW|WBUFW)([ ]*)[(]([ ]*)([\w>_-]+),([ ]*)" + "(?P<offset>0)([ ]*)[)]([ ]*)=([ ]*)(?P<packet>[0-9\w]+)([ ]*)[;]") ourPacketre4 = re.compile("int cmd([ ]*)=([ ]*)0x(?P<packet>[0-9a-fA-F]+);") + ourPacketre5 = re.compile( + "(WFIFOW|WBUFW)([ ]*)[(]([ ]*)([\w>_-]+),([ ]*)" + + "(count[*]p_len)([ ]*)[)]([ ]*)=([ ]*)(?P<packet>[0-9\w]+)([ ]*)[;]") outPacketLoginre = re.compile( "([ ]*)PACKET_ID_(?P<name>[A-Z0-9_]+)([ ]*)=" + "([ ]*)0x(?P<packet>[0-9a-fA-F]+),") @@ -69,6 +72,10 @@ class Hercules: return self.packetsSet.add(val) else: + if len(data) > 2 and data[:2] == "0x": + data = data[2:] + while len(data) < 4: + data = "0" + data try: if int(data, 16) > 4096: return @@ -96,6 +103,13 @@ class Hercules: while len(data) < 4: data = "0" + data self.addServerPacket(data) + m = self.ourPacketre5.findall(line) + if len(m) > 0: + for str in m: + data = str[9] + while len(data) < 4: + data = "0" + data + self.addServerPacket(data) m = self.outPacketLoginre.findall(line) if len(m) > 0: for str in m: |