summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-05 22:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-05 22:23:19 +0300
commit12126528a6acd121bb2d2d6831a4ec8ceabf7c62 (patch)
tree308c47df9a8ff4b50420603525d047801663fae8
parentb4e13632aaf59425022797fb6c0c7eff2957cd7d (diff)
downloadtools-12126528a6acd121bb2d2d6831a4ec8ceabf7c62.tar.gz
tools-12126528a6acd121bb2d2d6831a4ec8ceabf7c62.tar.bz2
tools-12126528a6acd121bb2d2d6831a4ec8ceabf7c62.tar.xz
tools-12126528a6acd121bb2d2d6831a4ec8ceabf7c62.zip
servergreps: add basic parsing for idathena.
-rwxr-xr-xservergreps/hercules/packets.py7
-rwxr-xr-xservergreps/hercules/src/idathena.py200
-rwxr-xr-xservergreps/hercules/src/reporter.py7
3 files changed, 214 insertions, 0 deletions
diff --git a/servergreps/hercules/packets.py b/servergreps/hercules/packets.py
index 7638957..90a987d 100755
--- a/servergreps/hercules/packets.py
+++ b/servergreps/hercules/packets.py
@@ -8,6 +8,7 @@ import sys
from src.brathena import Brathena
from src.hercules import Hercules
+from src.idathena import Idathena
from src.manaplus import ManaPlus
from src.ragemu import Ragemu
from src.rathena import Rathena
@@ -42,6 +43,9 @@ ragemu.reportName = "ragemu"
threeceam = Threeceam()
threeceam.dirName = "3ceam"
threeceam.reportName = "3ceam"
+idathena = Idathena()
+idathena.dirName = "idathena"
+idathena.reportName = "idathena"
manaplus = ManaPlus()
reporter = Reporter()
@@ -57,6 +61,8 @@ ragemu.prepareTempFiles("ragemu", packetDir, packetVersion)
ragemu.processPackets(packetDir, packetVersion)
threeceam.prepareTempFiles("3ceam", packetDir, packetVersion)
threeceam.processPackets(packetDir, packetVersion)
+idathena.prepareTempFiles("idathena", packetDir, packetVersion)
+idathena.processPackets(packetDir, packetVersion)
manaplus.processPackets(packetVersion);
reporter.reportManaplus(hercules, manaplus)
@@ -65,3 +71,4 @@ reporter.reportRathena(hercules, rathena)
reporter.reportHerculesFork(hercules, brathena, "brAthena")
reporter.reportHerculesFork(hercules, ragemu, "RagEmu")
reporter.reportThreeceam(hercules, threeceam)
+reporter.reportIdathena(hercules, idathena)
diff --git a/servergreps/hercules/src/idathena.py b/servergreps/hercules/src/idathena.py
new file mode 100755
index 0000000..f8c046f
--- /dev/null
+++ b/servergreps/hercules/src/idathena.py
@@ -0,0 +1,200 @@
+#! /usr/bin/env python2
+# -*- coding: utf8 -*-
+#
+# Copyright (C) 2015-2016 Evol Online
+# Author: Andrei Karas (4144)
+
+import os
+import re
+
+from src.preproc import PreProc
+
+filt = re.compile(".+[.](c|h)", re.IGNORECASE)
+
+class Idathena:
+ namedPackets = dict()
+ packetsSet = set()
+ outPacketsSorted = []
+ inPacketsSorted = []
+ inPackets = dict()
+ functionToId = dict()
+ loginPacketNameToId = dict()
+
+ namedPacketre = re.compile(
+ "((\t|[ ])*)(?P<name>[\w0-9_]+)([ ]*)=" +
+ "([ ]*)0x(?P<value>[0-9a-fA-F]+)")
+ ourPacketre = re.compile(
+ "(WFIFOW|WBUFW)([ ]*)[(]([ ]*)([\w>_-]+),([ ]*)" +
+ "(?P<offset>0)([ ]*)[)]([ ]*)=([ ]*)0x(?P<packet>[0-9a-fA-F]+)([ ]*)[;]")
+ ourPacketre2 = re.compile("PacketType([ ]*)=([ ]*)(?P<name>[\w_]+);")
+ ourPacketre3 = re.compile(
+ "(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("int cmde([ ]*)=([ ]*)0x(?P<packet>[0-9a-fA-F]+);")
+ outPacketLoginre = re.compile(
+ "([ ]*)PACKET_ID_(?P<name>[A-Z0-9_]+)([ ]*)=" +
+ "([ ]*)0x(?P<packet>[0-9a-fA-F]+),")
+ serverpacketLoginOutre = re.compile("packet_id([ ]*)=([ ]*)(?P<name>[\w_]+);")
+ clientpacketre = re.compile(
+ "(\t*)packet[(]0x(?P<packet>[0-9a-fA-F]+),(?P<len>[\w-]+)" +
+ ",(?P<function>[0-9a-zA-Z_>-]+)(,|[)])")
+ lclifPacketre = re.compile(
+ "([ ]*)[{][ ]PACKET_ID_CA_(?P<name>[A-Z0-9_]+),([^,]+)," +
+ "([ ]*)[&](?P<function>[0-9a-zA-Z_>-]+)([ ]*)[}],")
+
+ def collectNamedPackets(self, fileName):
+ with open(fileName, "r") as f:
+ for line in f:
+ m = self.namedPacketre.search(line)
+ if m is not None:
+ if m.group("name") not in self.namedPackets:
+ self.namedPackets[m.group("name")] = []
+ data = m.group("value").lower()
+ while len(data) < 4:
+ data = "0" + data
+ self.namedPackets[m.group("name")].append(data)
+
+
+ def addServerPacket(self, data):
+ if data == "cmde":
+ return
+ if data in self.namedPackets:
+ for val in self.namedPackets[data]:
+ if int(val, 16) > 4096:
+ return
+ self.packetsSet.add(val)
+ else:
+ try:
+ if int(data, 16) > 4096:
+ return
+ except:
+ pass
+ self.packetsSet.add(data.lower())
+
+
+ def collectOutPackets(self, parentDir):
+ files = os.listdir(parentDir)
+ for file1 in files:
+ if file1[0] == ".":
+ continue
+ file2 = os.path.abspath(parentDir + os.path.sep + file1)
+ if not os.path.isfile(file2):
+ if file2.find("/src/evol") <= 0:
+ self.collectOutPackets(file2)
+ elif filt.search(file1):
+ with open(file2, "r") as f:
+ for line in f:
+ m = self.ourPacketre4.findall(line)
+ if len(m) > 0:
+ for str in m:
+ data = str[2]
+ 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[2]
+ while len(data) < 4:
+ data = "0" + data
+ self.addServerPacket(data)
+ m = self.outPacketLoginre.findall(line)
+ if len(m) > 0:
+ for str in m:
+ data = str[4]
+ while len(data) < 4:
+ data = "0" + data
+ self.loginPacketNameToId["PACKET_ID_" + str[1]] = data
+ m = self.ourPacketre.findall(line)
+ if len(m) == 0:
+ m = self.ourPacketre3.findall(line)
+ if len(m) > 0:
+ for str in m:
+ if str[9] == "0":
+ continue
+ data = str[9]
+ if data == "cmd":
+ continue
+ while len(data) < 4:
+ data = "0" + data
+ self.addServerPacket(data)
+
+ m = self.ourPacketre2.findall(line)
+ if len(m) > 0:
+ for str in m:
+ if str[2] == "0":
+ continue
+ data = str[2]
+ if len(data) > 2 and data[0:2] == "0x":
+ data = data[2:]
+ while len(data) < 4:
+ data = "0" + data
+ self.addServerPacket(data)
+ m = self.serverpacketLoginOutre.findall(line)
+ if len(m) > 0:
+ for str in m:
+ if str[2] in self.loginPacketNameToId:
+ data = str[2]
+ data = self.loginPacketNameToId[data]
+ self.addServerPacket(data)
+
+
+ def sortOutPackets(self):
+ for packet in self.packetsSet:
+ self.outPacketsSorted.append(packet)
+ self.outPacketsSorted.sort()
+
+
+ def collectInPackets(self, packetsH, lclifPackets):
+ with open(packetsH, "r") as f:
+ for line in f:
+ m = self.clientpacketre.search(line)
+ if m is not None:
+ data = m.group("packet").lower()
+ while len(data) < 4:
+ data = "0" + data
+ self.inPackets[data] = \
+ (int(m.group("len")), m.group("function"))
+ self.functionToId[m.group("function")] = data
+ with open(lclifPackets, "r") as f:
+ for line in f:
+ m = self.lclifPacketre.search(line)
+ if m is not None:
+ name = "PACKET_ID_CA_" + m.group("name")
+ if name not in self.loginPacketNameToId:
+ print "Wrong login packet name: " + name
+ continue
+ data = self.loginPacketNameToId[name]
+ self.inPackets[data] = (0, m.group("function"))
+ self.functionToId[m.group("function")] = data
+
+
+ def sortInPackets(self):
+ for packet in self.inPackets:
+ self.inPacketsSorted.append(packet)
+ self.inPacketsSorted.sort()
+
+
+ def processPackets(self, packetDir, packetVersion):
+# namedPacketsPath = packetDir + "/src/" + self.dirName + "/packets_struct.h"
+ srcPath = packetDir + "/src/" + self.dirName
+# serverInPacketsHPath = packetDir + "/src/" + self.dirName + "/packets.h"
+# serverLoginInPackets = packetDir + "/src/" + self.dirName + "/lclif.c"
+# self.collectNamedPackets(namedPacketsPath)
+ self.collectOutPackets(srcPath)
+# self.collectInPackets(serverInPacketsHPath, serverLoginInPackets)
+# self.sortInPackets()
+ self.sortOutPackets()
+
+
+ def prepareTempFiles(self, codeDir, packetDir, packetVersion):
+ proc = PreProc()
+ proc.init(packetDir + "/src/" + self.dirName)
+ proc.defines = "-DPACKETVER=" + packetVersion + " -D_SOCKET_H_ -DWFIFOW\\(fd,pos\\)=WFIFOW\\(fd,pos\\) -DWBUFW\\(p,pos\\)=WBUFW\\(p,pos\\)"
+ proc.includes = "-I../links/" + codeDir + "/src -I../links/" + codeDir + "/3rdparty"
+ proc.inDir = "../links/" + codeDir + "/src/"
+ proc.outDir = packetDir + "/src/" + self.dirName + "/"
+ proc.run("char", "char.c");
+ proc.run("login", "login.c");
+ proc.run("map", "clif.c");
diff --git a/servergreps/hercules/src/reporter.py b/servergreps/hercules/src/reporter.py
index 2d0b4c5..18caa5a 100755
--- a/servergreps/hercules/src/reporter.py
+++ b/servergreps/hercules/src/reporter.py
@@ -227,3 +227,10 @@ class Reporter:
for packet in threeceam.outPacketsSorted:
if packet not in hercules.packetsSet:
w.write("Exists only in 3CeaM: " + packet + "\n")
+
+
+ def reportIdathena(self, hercules, idathena):
+ with open(self.packetDir + "/" + hercules.reportName + "_" + idathena.reportName + "_outpackets.txt", "w") as w:
+ for packet in idathena.outPacketsSorted:
+ if packet not in hercules.packetsSet:
+ w.write("Exists only in idAthena: " + packet + "\n")