From 6a1f22c60b87bb989c24c27519c38f5ef830c63d Mon Sep 17 00:00:00 2001
From: root <huangmantao@gmail.com>
Date: Sat, 30 May 2020 01:27:41 +0000
Subject: [PATCH] fix bugs

---
 iptable_docker.sh |  9 +++++++--
 test.py           | 13 ++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/iptable_docker.sh b/iptable_docker.sh
index 3b78d7f..5e3dc47 100755
--- a/iptable_docker.sh
+++ b/iptable_docker.sh
@@ -3,9 +3,14 @@
 # iptable_docker.sh $if
 if="$1"
 gw="$(ip -4 r show dev $if | awk '/default/ {print $3}')"
-network="$(ip -o addr show dev $if| awk '$3 == "inet" {print $4}')"
+network="$(ip -o route show dev $if |awk '$1 != "default" {print $1}')"
+#network="$(ip -o route show dev $if |awk '$6 == "src" {print $1}')"
+echo nameserver 1.1.1.1 > /etc/resolv.conf
+#network="$(ip -o addr show dev $if| awk '$3 == "inet" {print $4}')"
 #ip="$(ip -4 a show dev $if | awk -F '[ \t/]+' '/inet .*global/ {print $3}')"
-
+echo if=$if
+echo network=$network
+echo gw=$gw
 # Drop all IPv6 traffic
 ip6tables -F
 ip6tables -X
diff --git a/test.py b/test.py
index 8525258..6779583 100644
--- a/test.py
+++ b/test.py
@@ -3,18 +3,18 @@ import tornado.web
 import json
 import argparse
 import os
+import subprocess
 from o_manager import OManager
-
+dir_path = os.path.dirname(os.path.realpath(__file__))
 
 ap = argparse.ArgumentParser()
 ap.add_argument("-i", "--interface", required=False,
-                help="path to the session folder")
+        help="interface (default: eth0)", default="eth0")
 ap.add_argument("-s", "--session_folder", required=True,
-                help="path to the session folder", default="eth0")
+                help="path to the session folder")
 args = vars(ap.parse_args())
 session_folder = args["session_folder"]
 interface = args["interface"]
-
 om = OManager(session_folder, interface)
 
 
@@ -120,5 +120,8 @@ def make_app():
 if __name__ == "__main__":
     app = make_app()
     app.listen(8000)
-    os.popen("iptable_docker.sh {interface}")
+    proc = subprocess.Popen([os.path.join(dir_path, "iptable_docker.sh"), interface], 
+            stdout=subprocess.PIPE)
+    outs, errs = proc.communicate()
+    print(outs.decode())
     tornado.ioloop.IOLoop.current().start()