From 97c2dd0dbcde9664553c90c0f68e4173ba471ff5 Mon Sep 17 00:00:00 2001
From: "Eloan.Andre" <Eloan.ANDRE@etu.uca.fr>
Date: Wed, 22 Mar 2023 15:24:02 +0000
Subject: [PATCH] decoder propre

---
 src/.decoderPropre.py.swp | Bin 0 -> 12288 bytes
 src/decoderPropre.py      |  78 +++++++++++++++++++++++++++++++++-----
 2 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 src/.decoderPropre.py.swp

diff --git a/src/.decoderPropre.py.swp b/src/.decoderPropre.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..2cf2bdc647605d9a4f01cc166dcdfdcdb51d1e3d
GIT binary patch
literal 12288
zcmeI2Pl)716vk^;U3GL-)}tsj-G}L(?dhKBMVM{r!#K0xf`iL0J19*vR43IlHIq(a
zs<PU!>|Q(wf_fA@DINs%;z33B;8{Ug4<dpdJPryT7xmy*NvHqB?xbDxuu>U*)FgTJ
z>eZKeFUd?gt2^hn>3X$JusuS^@y8#tpFX!huAU?$@I0jt=WRCc2<EP=<=I`+4r`Y-
z&egWK;+7JgyKC<XR|TQO?==}%HJe+W&4UYp=Lfv%_w#(3^F{%qz#IyMs=Km&lANip
zt!nFHVUa$1>hc^NjfqjfC}0#Y3K#{90!9I&fKk9G@PAQ2`Nzn0Oy>AtLOX-@SgIZD
zn#L$#6fg=H1&jhl0i%FXz$jo8FbWt2i~>f1J5T{;6S9Dp{cHLU0QmoZ^8SDHFd^T9
zo8US)3)aCC;LnE$`2!q*Z@}l^Ef9ija0dK@?+1PaAAr|DAG`pb2g_gq+<K6Z@4;u_
zQ}79R73_mLIC_APFTi`?DmViO_<Dhm_kjdYfkp7c{e*l39PkV%fm7hi`v`dlya7CL
z7ErJNe!iEGx50UE>jYu}9|9ND!3pryJ?INw2W{~C-GqDxZh$wz7WnNhXa!yYRq!jc
z`~}<uH^9f>T@Yz}2d<I-E@Wvjzh9NE=ypq@%Pih3I9{Pb{lIO;UxJiLPq^Y)+N7=3
z3Vzz8Ble=*Hlc&9=m+?Sq@+)jhX?gumH9q*?Na2Tj0-<w8@Fvm#;w(M#S4`msvYKp
zyuxfdXpfvv^D}0SXnUURAF8U)`i{r!>K<2J!5#Ywb4rDP?+K}R5V<a7d({Ka>23q2
z8Q!=fd1IyodPeilV9YXOMD25q_+w`|(TgrEY!;|+sp|WDlR3`xxn$3B+CtG$rnl(}
z!ji3ncC-{uAGFJ~NUeS5?(u*=NqsL2XpbuuaOx~EJK$1sl6ITycfEif=(z;Cf63u)
z$&%%AWA+M7dRnr|UsifeA5!h*P<v@DcSO$O)crdG3#lWj!9gfhX}z+vx>Rm88Y^p~
zOiG4Hw}Y;&dSf2jrc?p4(JhTF6DU{CUg=Xr8SAgrNk^6J&$~9Xy(M)inLUfKA#>6$
zwv>5ET<r7}-}FLP<@kFsWUdmb|6EjdGSX^}l#+@CDkGz`V!fPfnw?2LlaeIjC#`mQ
zkxSomC67F(Dxk}HQ_4@0%=C1V7G5e$c%2<UT%zl3C_0?!MAsy!;n^JRhjvqBpB+YC
zHA&yOlBm*cR<%i{sw>XaDNae7xR#_xN%o@*NL`#+x2Gv`Xg9MZ84YrKb*dwp|GYv)
zopNgvtdhDE<!p9EO36A*;*2sBdCgg9mM5G`im6b}kapf$mQ}|F>oTc3m4ao>7;QMM
zoUn&>Q~dl3i62ZRe(aIiv&+cjjWT&+!z7Y=LXw4;w8@F6&|I7xZ~Ahc=&?E3Bf3hs
zlo=5w11If-J2~lYjsSX-J#+xup`(QFWK>&{46fUFRftMP>Wgwkhgtf&$!_%YS`y{d
zO?)^jl<!f5I(dYCGD$g#oXF9QJPs*kq;C|XQWu}ZmBrI^tFZ0aoltIUT`r97;CqhO
zVGfNJK{Vk=o1vi&1AQCB=3N@UQ<Si;AGSo#_X0)Zmk`Utcj%&1#ef)sGD&-#Neeu4
z>cf#aKA_!K%9o8=E$$w0W~+T}dw4<<UX8mohbb;qjrn3=GC4wZU-g{Z@ZvM;kgKS7
vF&=tw<U(`;fzg%a6^gIug}c|F(PzK<2q`YsLK)QXT!!ebP`|JCJ(v6iPG8N!

literal 0
HcmV?d00001

diff --git a/src/decoderPropre.py b/src/decoderPropre.py
index 1be7efa..7efeb5a 100644
--- a/src/decoderPropre.py
+++ b/src/decoderPropre.py
@@ -9,18 +9,78 @@ import scapy.contrib.modbus as mb
 
 def decode(pkt):
     if "ModbusADU" in pkt:
-        miniL=[]
+        global miniL
         modpkt = pkt["ModbusADU"]
         print(modpkt.payload.name)
         for i in modpkt.payload.fields:
-            miniL.append(modpkt.payload.getfieldval(i))
-            print(i,modpkt.payload.getfieldval(i))
-            if(i=="coilStatus"):
-                bi=str(bin(modpkt.payload.getfieldval(i)[0]))
-                bi=bi[2:]
-                bi=bi.rjust(8,'0')
-                print([*bi])
+            typeCall = ""
+            print(i,modpkt.payload.getfieldval(i),type(modpkt.payload.get_field(i)))
+
+            if "Multiple" in modpkt.payload.name:
+                typeCall += "m"
+            else:
+                typeCall += "s"
+
+            if "Coil" in modpkt.payload.name:
+                typeCall += "C"
+            else:
+                typeCall += "R"
+            miniL[0] = typeCall
+
+
+            if "Read" in modpkt.payload.name:
+                typeCall += "r"
+                if "Response" in modpkt.payload.name:
+                    byteCount = modpkt.payload.getfieldval("byteCount")
+                    print(byteCount,"cc")
+                    cs = []
+                    if "C" in typeCall:
+                        Value = modpkt.payload.getfieldval("coilStatus")
+                        for j in range(byteCount):
+                            bi=str(bin(Value[j]))
+                            bi=bi[2:]
+                            bi=bi.rjust(8,'0')[::-1]
+                            cs.extend(k for k in [*bi])
+                    else:
+                        cs = modpkt.payload.getfieldval("registerVal")
+                    for j in range(len(cs)):
+                        bigL.append([miniL[0],cs[j],miniL[2]+j])
+                    miniL = [0,0,0]
+                    print(bigL)
+                else:
+                    startAddr = modpkt.payload.getfieldval("startAddr")
+                    miniL[2] = startAddr
+            else:
+                typeCall += "w"
+                if "Response" in modpkt.payload.name:
+                    pass
+                else:
+                    if "m" in typeCall:
+                        addr = modpkt.payload.getfieldval("startAddr")
+                        #byteCount = modpkt.payload.getfieldval("quantityOutput")
+                        outputValue = modpkt.payload.getfieldval("outputsValue")
+                        cs = []
+                        if "C" in typeCall:
+                            for j in range(len(outputValue)):
+                                bi=str(bin(outputValue[j]))
+                                bi = bi[2:]
+                                bi = bi.rjust(8,'0')[::-1]
+                                cs.extend(k for k in [*bi])
+
+                        for j in range(len(cs)):
+                            bigL.append([miniL[0],cs[j],addr+j]) # changer 5 pour mettre l'adresse
+                        print(bigL)
+                    else:
+                        if "C" in typeCall:
+                            addr = modpkt.payload.getfieldval("outputAddr")
+                            outputValue = modpkt.payload.getfieldval("outputValue")
+                        else:
+                            addr = modpkt.payload.getfieldval("registerAddr")
+                            outputValue = modpkt.payload.getfieldval("registerValue")
+                        bigL.append([miniL[0],outputValue,addr])
+
         bigL.append(miniL)
-        print(bigL)
+        #print(bigL)
 bigL = []
+miniL = [0,0,0]
 scapy.sniff(iface="lo", prn=decode)