From b45e52ccf17b5f13be479b89b67b7e5ac81a2f79 Mon Sep 17 00:00:00 2001 From: Foxtrot Date: Tue, 3 Sep 2019 17:05:20 +0100 Subject: [PATCH] DWall: Update binary and fix Start/Stop functionality. This commit resolves #73. --- DWall/api/module.php | 4 ++-- DWall/assets/http_sniffer | Bin 5512 -> 9920 bytes DWall/module.info | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DWall/api/module.php b/DWall/api/module.php index 4403c41..271f69f 100644 --- a/DWall/api/module.php +++ b/DWall/api/module.php @@ -33,13 +33,13 @@ class DWall extends Module private function disable() { exec("killall http_sniffer"); - exec("kill \$(ps | grep DWall | head -n1 | awk '{print $1}')"); + exec("kill \$(ps -aux | grep DWall | head -n1 | awk '{print $2}')"); $this->response = array("success" => true); } private function getStatus() { - if (trim(exec("ps -w | grep [D]Wall.py")) != "" && trim(exec("ps -w | grep [h]ttp_sniffer")) != "") { + if (trim(exec("ps -aux | grep [D]Wall.py")) != "" && trim(exec("ps -aux| grep [h]ttp_sniffer")) != "") { $this->response = array("running" => true); } else { $this->response = array("running" => false); diff --git a/DWall/assets/http_sniffer b/DWall/assets/http_sniffer index 579b6a83baadfb974f848219d8ea09b2639b5f18..42a3cc26cab8d7855b07c9b72c67077585d06f0b 100755 GIT binary patch literal 9920 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 UR3~3Y&UL91?Qkb#Eh)SI06RvjhyVZp literal 5512 zcmcIoUu>IK6+fTy11FWQ{L>+I6CpLRAD06OLnl$xJ=l zvYpb2!J@6OA!TzPn6^n3WK+xXFyS%~iV$6+q@55?eE?|>eF)N!@=&2XOb}32^ZVWJ z+HuotV-H;E`rO|=_nvd_Ip>~xKRW2vMbrlJtkCi;5j31Dr;CodhiVjxt)fiBLe6LFQI;NvaP%jk9 zfJbx{SpshZb(iM*Ab%3_y()$Uj4EBIfn4qH-vZsKa9`$5jE=s*p+bJ@P$Boo>=+u^ zgVoZ(q`W7_KRd>F&5_q8(V$_z=uu;zrr!hYhK)gFw>Uj(paF4wbD%+ScF|V5#PRoY{B(AU3E!|-FNhVdHs z^K4=~suSzQOoXMX#4RXqg=fr}M>pP14gKl1_VR zF8xdV9X+?jk86HXo{mSrpuLlu{JGLx0sV^DSN85mQvX*rVIJgu9RnMRZnHM^h`MqaY}zKQ_B?c z#Z#J9C{sKVFW4GN>5iM5A&qa z%)sz9_YCb%)sl8SlAfwo)74t0LJrzsU@K1?dvbIv{TOZ_U0T_M8F8x^Dnk-`SAEBY zuk%lJTaN=RKszEccS)eBDP1echzE3wDzt?)Q))c1=jQhZ-gr;!R4-&_!yg_v5x(IYJ2xP`=U#05RuYZhh}F0Rn_iJYabAucID!34 zz7b2AGV-cFazQHQS4>Clv9n_Qn%Ezm^JSy4`DbBIZG({Mdy8Y?i-OvVPaJzRY++u| z_K5+zINfG2WS{Lz62muxb?B~RU3KVwdtYRsj&;CS$+kU|jJ`|M&H402O4+9`$r$K1 z12^r9kwyBMKE@h;NZp+Ub0#tNeB*t2!@sZ*Yh0Cu#x=Rn_&^qA&5XUXBJbJ(G3+4E zPBMlys_Bgt_;^*Kwy)U?PpNmQz^{%y-fKZG&J0e6>Hj7v_X9bJII2A=KG@uupXnX9 zbG_s9KSeB&{zO8Go|SGp3!D{m@d-TGo)G`y5eY0Ek*>wV5?VSe_brY~_tLoRSsW8{ zX-xWBa>cQ@KAa!ugdVK1zm6JTg&nWreLjg8akz)T8pntejqR}h?`~f|<}N@k&aVh$ zTEN(&r-yRu*KmFyS7ey_102VGWsk$X&)Mo#e+Lh7(3WRoti4U1{dwfQ4j<`tEbcT9 zvXM&=i_7aV#KQSHe2sWmXvGm?;7^EwA;dsZ$G|XRAcYukU_Xa*VbA-q_b9Nk!?{uR zA|gidM)a9;;3-?PFEJ`%#3bL0jDZGed)^q%iBEQ!Q+M%^7d<_QD~D~FGGmZyVXj38 zoye^yz8)X+HnmRnaqQhdteKDNnEwAS`>#0=%=I6~fLI~s#+xi?S73uX** z1{y0kpQs!Xb-Z=8aB{TSRQ|yEm`6O%yJFTqkc2pl0pE4bVbT5=fl4l2l|KORkyZq}|`zG~b?ew!+1J=%O8gK2R>fNe*uFvZde8uy9 z*V-XF0eS13>*WqH5XYY;>!VMWrS>x%UxD8)sC6e=`N_*8feoqwf0%m3Nierq>?1}# zrcKqEQR^P>3os91eK%TTfNjM)vU^<1{D?ft^!ysMTVpZrL$>iYiFt8p9IGS#;+KsH zzrKITMXvaecOmaSbuV5K`+ym~Zuc~suj2mhdsKqRF*fhL17`D9$PDDz&%2BF7-b>W zl^-Y%?*!Aob|%L0c2s@0v%6iqH^_@~pYgtVg%hB+CEscZ7%R;da#pcav$7R8Q**5e zyi>oAS8J(adC%yBa_DrXa;P#}Je2!Ercl6}ID1Mu=6SDNt5&kczXN`Inmh+3YFsg1 zv+%KzvvTfqX0}iRJ)O_GU$^#G`7!+MYGy_OE0v$lWZlQn*`CMuyB?3>2d$BcYdu?< zwJN1j?Hl)Uy6mr7`KsDOrf40mJ?&QT)Yfx2;21w7iuvM