Merge branch 'master' of https://codefirst.iut.uca.fr/git/louis.dufour/Detection_d_intrusion

src/decoderBrut.py

@@ -3,6 +3,7 @@
 
 import scapy.all as scapy
 import scapy.contrib.modbus as mb
+from triPacket import triPacket
 
 def decode(pkt):
     prt=0
@@ -44,12 +45,12 @@ def decode(pkt):
                 valInter2=valInter[1:-1]
                 miniL[2]=valInter2
     if miniL.count(0)==0:
-        if(type(miniL[2])==list):
+        if type(miniL[2])==list:
             if miniL[0]=="r":
                 for i in range(len(miniL[2])):
-                    if("0x" in miniL[2][i]):
+                    if "0x" in miniL[2][i]:
                         miniL[2][i]=int(miniL[2][i],16)
-                    if("0x" in str(miniL[1])):
+                    if "0x" in str(miniL[1]):
                         miniL[1]=int(miniL[1],16)
                     bigL.append([miniL[0],miniL[1]+i,miniL[2][i]])
             if miniL[0]=="c":
@@ -92,7 +93,8 @@ def decode(pkt):
             bigL.append(miniL)
         
         if bigL!=[]:
-            print(bigL)
+            print("attention")
+            triPacket(bigL)
 
 
         miniL = [0,0,0,0]

src/triPacket.py

@@ -0,0 +1,16 @@
+def triPacket(lPkt):
+    if type(lPkt)!=list:
+        print('pas liste')
+        return
+    if len(lPkt)==0:
+        print('vide')
+        return
+    if len(lPkt)==1:
+        triPacket(lPkt[0])
+        return
+    if len(lPkt)==3 and type(lPkt[0])==str:        
+        print(lPkt[0],int(lPkt[1]),int(lPkt[2]))
+        return
+    else:
+        for i in lPkt:
+            triPacket(i)