From f2a8575fcd4dd5278be5a6ea0937d2e01e89f87a Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 14 Apr 2019 07:38:59 -0400
Subject: [PATCH] revert back network settings after lokinet shutdown

---
 config/lokilaunch.sh   | 33 +++++++++++++++++++++++----------
 includes/functions.php | 12 +++++++-----
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/config/lokilaunch.sh b/config/lokilaunch.sh
index 313b277..fa51b7f 100644
--- a/config/lokilaunch.sh
+++ b/config/lokilaunch.sh
@@ -2,22 +2,35 @@
 
 case "$1" in
   start)
-        echo -n "Starting LOKINET"
+        echo -n "Starting LOKINET\n"
         /home/pi/loki-network/lokinet > /dev/null 2>&1 &
-        sudo iptables -t nat -A POSTROUTING -s 10.3.141.0/24 -o lokitun0 -j MASQUERADE #LOKI$
-        ehco -n "rerouted iptables"
-        sudo ip rule add from 10.3.141.1 lookup main prio 1000 #LOKIPAP
-        echo -n "added wlan0 address rule"
-        sudo ip rule add from 10.3.141.0/24 lookup lokinet prio 1000 #LOKIPAP
-        echo -n "added wifi-clients rule"
+        sudo iptables -t nat -A POSTROUTING -s 10.3.141.0/24 -o lokitun0 -j MASQUERADE #LOKIPAP
+        ehco -n "rerouted iptables\n"
+        sudo ip rule add from 10.3.141.1 lookup main prio 1000
+        echo -n "added wlan0 address rule\n"
+        sudo ip rule add from 10.3.141.0/24 lookup lokinet prio 1000
+        echo -n "added wifi-clients rule\n"
         sudo ip route add default dev lokitun0 table lokinet
-        echo -n "added lokitun0 route"
-        echo -n "Restarting DNSMASQ"
+        echo -n "added lokitun0 route\n"
+        echo -n "Restarting DNSMASQ\n"
         sudo /etc/init.d/dnsmasq restart
         ;;
+
   stop)
-        echo -n "Stopping daemon"
+        echo -n "Stopping daemon\n"
         pkill lokinet
+        sudo iptables -t nat -F
+        sudo iptables -F
+        sudo iptables -t nat -A POSTROUTING -j MASQUERADE
+        ehco -n "rerouted iptables\n"
+        sudo ip rule del from 10.3.141.1 lookup main prio 1000 #LOKIPAP
+        echo -n "removed wlan0 address rule\n"
+        sudo ip rule del from 10.3.141.0/24 lookup lokinet prio 1000 #LOKIPAP
+        echo -n "removed wifi-clients rule\n"
+        sudo ip route del default dev lokitun0 table lokinet
+        echo -n "removed lokitun0 route\m"
+        echo -n "Restarting DNSMASQ\n"
+        sudo /etc/init.d/dnsmasq restart
         ;;
   gen)
         echo -n "NEW lokinet.ini FILE CREATED\n"
diff --git a/includes/functions.php b/includes/functions.php
index 1ab7635..f9fe791 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -610,18 +610,20 @@ function SaveTORAndVPNConfig()
         }
     } elseif (isset($_POST['StartLokinet'])) {
         ?>
-        <div class="alert alert-success">
-          Starting Lokinet background daemon process.
-        </div>
-        <?php
+    <div class="alert alert-success">
+      Starting Lokinet background daemon process.
+    </div>
+    <?php
     $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh start');
     echo "<pre><strong>$output</strong></pre>";
     } elseif (isset($_POST['StopLokinet'])) {
-        exec('sudo /home/pi/loki-network/lokilaunch.sh "stop" > /dev/null &', $return); ?>
+        ?>
     <div class="alert alert-danger">
       Stopping Lokinet background daemon process.
     </div>
     <?php
+    $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh stop');
+    echo "<pre><strong>$output</strong></pre>";
     } elseif (isset($_POST['GenerateLokinet'])) {
         ?>
     <div class="alert alert-warning">