From 4a9c7b4ca8e87fc78c2eaac597e62bebbb962aec Mon Sep 17 00:00:00 2001
From: "Eloan.Andre" <Eloan.ANDRE@etu.uca.fr>
Date: Wed, 22 Mar 2023 16:13:28 +0000
Subject: [PATCH] =?UTF-8?q?relier=20decoderPropre=20=C3=A0=20la=20base?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/.decoderPropre.py.swp                  | Bin 12288 -> 0 bytes
 src/__pycache__/ecritureBDD.cpython-39.pyc | Bin 0 -> 941 bytes
 src/__pycache__/triPacket.cpython-39.pyc   | Bin 0 -> 709 bytes
 src/decoderPropre.py                       |  31 ++++++++++++++++-----
 4 files changed, 24 insertions(+), 7 deletions(-)
 delete mode 100644 src/.decoderPropre.py.swp
 create mode 100644 src/__pycache__/ecritureBDD.cpython-39.pyc
 create mode 100644 src/__pycache__/triPacket.cpython-39.pyc

diff --git a/src/.decoderPropre.py.swp b/src/.decoderPropre.py.swp
deleted file mode 100644
index 2cf2bdc647605d9a4f01cc166dcdfdcdb51d1e3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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!

diff --git a/src/__pycache__/ecritureBDD.cpython-39.pyc b/src/__pycache__/ecritureBDD.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d403fd431e42605df7d367f47a17abd66899823e
GIT binary patch
literal 941
zcmYjP&2H2%5VjrXr(5=ddZ`dngjCc>6<hVdg&$FxMXFR~QFjX>5~@P%mW4D4wo|&R
zY%k@?m2-Q92jCHS2n%t5Q(u7#jNKw?XTBLvW<2AW$-3PRg7xX<4fcf~^vfKsF3_Pz
zKyn3uA%+W-V#`VDSWZ*Q2y;H5)Mb>pz&(bCDDuw110^{&>~a~|&<2pC0M?Quqt7V9
z8fU_Uv+#SZC#p*IhU@)a%oWeoxGHzq?zmK<ks$Y^$a_2&W7P=$IF9es6WuxFV!XG_
z_Y3Zt2<A3~g^_bBn=>pA$UNJo@e>4wW@P$pdaTeJ++v0o5g@VXSfq=HxgY6_wB(eW
zp_$X77`<Gc(bhS2nAbuHz>Zo^%8ZZ2J$gnkdUsdRmYiTAz}r283X}mzo{_-cH~cv&
z*C<i}WH7f!CSNg{xfo3sRHt=Mu=)SOWa%EeW#@vgqE*nggrNqDA8?<&r@Vft`TkF{
z3VzTIKM|(#=N3#c&K-b=YWlj8N(U@c*{e))O&iID4(d$G_myDNbTb+Dw@2Y-G8%+K
zm8nLC&(^ng`onN}Nv_y0jKV<@ZVZwqTbmoBa5-a4a4GqUn$$cB<3YIdG+rO|!(o3E
z9%cn^#DgVyFPhg*EhpN~tFnX^YcFqvtVHVbBc3;k+tz`$Iye}sG!Ru$yvp*o+Rcj!
zQl0A`<-9hNk#^(D{QE*wLc6tqNr}AFFD_CxmzWru<dt?HjK*W_a%22|=!6+bJ%44Y
z0#L{h0AULI77k$F2I`OiU&9MH1m5`*V6g}`k)H<ep1i8}*F+Z-saIzu%cLeX)BZkJ
hrmFT)*8WOl(~*nt!Tp1ZH3ffYIweg4CT2ha=P#&7;8Oqq

literal 0
HcmV?d00001

diff --git a/src/__pycache__/triPacket.cpython-39.pyc b/src/__pycache__/triPacket.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8a2525fb15476d48e9c20be267354169caaafe85
GIT binary patch
literal 709
zcmZ8eO>5gg5S`hTzf!v-B$SpW;HxfGZoQP!HV*V;0=^kaFxtfkE0Vez7aZi1bL_c4
zq0qmy*PQ$pdg{!oHK7CZu}^QFW_A~&(GjryxOi<Y6u_e#o*HBDfxRAcFkmo;JD3B4
zQAR(&98F|8oR#U$Anxs%1u^<(Hgy@To&7YKq$uED)0{i(SM2pq4g?MCkZ`5lOHu}R
z$l5Ri(t;bcQtpy*{U07N{+XhN=Xk}u1HZ%ggJ`xmg>!qNF6T(tq3TMt)JyJN!WJ8t
zz?b8#YLHdc4&O5N^?So#WtzA*y&qJIdYor9StlFaABB4SEi-m6z+QIS%Z0@~AJL|=
zJ`#%WR4yyX>)aN8WNcclD|@p@SC+AwoY(v{)=a)xk;mL)_6yuG>-@e<Tv<{w`*@v9
zEZLN@vbZ(3%y;XW>!fyRLN067-c%bWuPJlX=Ntfs*vIG)hj@--6*2Z412dIr|CzLj
zU$NIOIJ8f*RfG*+%TBcq6XP^iq1%OBwHq<lchj;cY&sw0Q%h8CtPLx);Y1jN!=PvK
ohlm64DDIT=G}b|_)fMDPw_Jq_68(2~rCI0pz1(+D7^?osA3=nYR{#J2

literal 0
HcmV?d00001

diff --git a/src/decoderPropre.py b/src/decoderPropre.py
index a76cdae..d1ff279 100644
--- a/src/decoderPropre.py
+++ b/src/decoderPropre.py
@@ -7,11 +7,13 @@
 import scapy.all as scapy
 import scapy.contrib.modbus as mb
 
+from triPacket import triPacket
+import getpass
+
 def decode(pkt):
     if "ModbusADU" in pkt:
         global miniL
         modpkt = pkt["ModbusADU"]
-        print(modpkt.payload.name)
         typeCall = ""
 
         if "Multiple" in modpkt.payload.name:
@@ -30,7 +32,6 @@ def decode(pkt):
             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")
@@ -42,9 +43,9 @@ def decode(pkt):
                 else:
                     cs = modpkt.payload.getfieldval("registerVal")
                 for j in range(len(cs)):
-                    bigL.append([miniL[0],cs[j],miniL[2]+j])
+                    #bigL.append([miniL[0],cs[j],miniL[2]+j])
+                    triPacket([miniL[0][1],miniL[2]+j,cs[j]],connec)
                 miniL = [0,0,0]
-                print(bigL)
             else:
                 startAddr = modpkt.payload.getfieldval("startAddr")
                 miniL[2] = startAddr
@@ -66,8 +67,9 @@ def decode(pkt):
                             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)
+                        #bigL.append([miniL[0],cs[j],addr+j]) # changer 5 pour mettre l'adresse
+                        triPacket([miniL[0][1],addr+j,cs[j]],connec)
+                    #print(bigL)
                 else:
                     if "C" in typeCall:
                         addr = modpkt.payload.getfieldval("outputAddr")
@@ -75,9 +77,24 @@ def decode(pkt):
                     else:
                         addr = modpkt.payload.getfieldval("registerAddr")
                         outputValue = modpkt.payload.getfieldval("registerValue")
-                    bigL.append([miniL[0],outputValue,addr])
+                    triPacket([miniL[0][1],addr,outputValue],connec)
+                    #bigL.append([miniL[0],outputValue,addr])
 
         #print(bigL)
 bigL = []
+print("In order for data sniffed to be stored inside the database, please register the following :")
+db_host = input('host of the database server : ')
+if not db_host:
+    db_host = '192.168.128.141'
+db_name = input('name of the database : ')
+if not db_name:
+    db_name = 'dblodufour1'
+db_user = input('login of the user : ')
+if not db_user:
+    db_user = 'lodufour1'
+db_password = getpass.getpass('user password : ')
+connec=[db_host,db_name,db_user,db_password]
+
+
 miniL = [0,0,0]
 scapy.sniff(iface="lo", prn=decode)