Cleanups

eliasmagnush · Jan 24, 2015 · 672cd9b · 672cd9b
1 parent f43f33f
commit 672cd9b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 127 deletions.
diff --git a/utils/manna/start-nat-full-lollipop.sh b/utils/manna/start-nat-full-lollipop.sh
@@ -82,16 +82,17 @@ iptables -t nat -A PREROUTING -i $phy  -p tcp --destination-port 110 -j REDIRECT
 
 sleep 5
 
-#echo "Hit enter to kill me"
-#read
-#pkill dhcpd
-#pkill sslstrip
-#pkill sslsplit
-#pkill hostapd
-#pkill python
-## Restore
-#iptables-restore < /tmp/rules.txt
-#rm /tmp/rules.txt
-## Remove iface and routes
-#ip addr flush dev $phy
-#ip link set $phy down
+echo "Hit enter to kill me"
+read
+pkill dhcpd
+pkill sslstrip
+pkill sslsplit
+pkill hostapd
+pkill python
+# Restore
+iptables-restore < /tmp/rules.txt
+rm /tmp/rules.txt
+# Remove iface and routes
+ip addr flush dev $phy
+ip link set $phy down
+
diff --git a/utils/manna/start-noupstream-eap-mod.sh b/utils/manna/start-noupstream-eap-mod.sh
diff --git a/utils/manna/start-noupstream-mod.sh b/utils/manna/start-noupstream-mod.sh
diff --git a/utils/manna/stop-mana-lollipop b/utils/manna/stop-mana-lollipop
@@ -1,3 +1,20 @@
 #!/bin/bash
 # This is a quick helper script to kill mana in the Kali chroot for lollipop
+
 echo "This is not finished yet"
+
+upstream=wlan0
+phy=wlan1
+
+
+pkill dhcpd
+pkill sslstrip
+pkill sslsplit
+pkill hostapd
+pkill python
+# Restore
+iptables-restore < /tmp/rules.txt
+rm /tmp/rules.txt
+# Remove iface and routes
+ip addr flush dev $phy
+ip link set $phy down