From 2c7fa190838c5cfce925ed644709c96653319437 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sat, 13 Apr 2019 23:32:14 -0400
Subject: [PATCH] shell_exec start lokinet verbose

---
 config/lokilaunch.sh   | 11 ++++++++++-
 includes/functions.php |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/config/lokilaunch.sh b/config/lokilaunch.sh
index df624a4..780c647 100644
--- a/config/lokilaunch.sh
+++ b/config/lokilaunch.sh
@@ -2,8 +2,17 @@
 
 case "$1" in
   start)
-        echo -n "Starting Lokinet"
+        echo -n "Starting LOKINET"
         /home/pi/loki-network/lokinet
+        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 ip route add default dev lokitun0 table lokinet
+        echo -n "added lokitun0 route"
+        echo -n "Restarting DNSMASQ"
         ;;
   stop)
         echo -n "Stopping daemon"
diff --git a/includes/functions.php b/includes/functions.php
index b7d25fa..ab57138 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -609,7 +609,9 @@ function SaveTORAndVPNConfig()
             echo htmlspecialchars($line, ENT_QUOTES).'<br />' , PHP_EOL;
         }
     } elseif (isset($_POST['StartLokinet'])) {
-        exec('sudo /home/pi/loki-network/lokilaunch.sh "start" > /dev/null &', $return); ?>
+        $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh "start"');
+        echo "<pre><strong>$output</strong></pre>";
+         ?>
    <div class="alert alert-success">
      Starting Lokinet background daemon process.
    </div>