WIP: fix tun/tap

rickyzhang82 · Sep 16, 2014 · 75a397f · 75a397f
1 parent 2eb279c
commit 75a397f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
@@ -825,6 +825,8 @@ dnl Check that the host supports TUN/TAP devices
 AC_CACHE_CHECK([whether TUN/TAP is supported],
   ac_cv_tun_tap_support, [
   AC_TRY_COMPILE([
+    #include <sys/socket.h>
+    #include <string.h>
     #if defined(HAVE_LINUX_IF_H) && defined(HAVE_LINUX_IF_TUN_H)
     #include <linux/if.h>
     #include <linux/if_tun.h>

diff --git a/BasiliskII/src/Unix/ether_unix.cpp b/BasiliskII/src/Unix/ether_unix.cpp
@@ -81,7 +81,6 @@
 using std::map;
 #endif
 
-#define DEBUG 0
 #include "debug.h"
 
 #define STATISTICS 0
@@ -207,17 +206,23 @@ static bool execute_network_script(const char *action)
 	int pid = fork();
 	if (pid >= 0) {
 		if (pid == 0) {
-			char *args[4];
+                        char *args[4];
 			args[0] = (char *)net_if_script;
 			args[1] = net_if_name;
 			args[2] = (char *)action;
 			args[3] = NULL;
 			execv(net_if_script, args);
-			exit(1);
-		}
-		int status;
-		while (waitpid(pid, &status, 0) != pid);
-		return WIFEXITED(status) && WEXITSTATUS(status) == 0;
+                        exit(0);
+            }
+            int status;
+            while (waitpid(pid, &status, 0) != pid);
+            int result1 = WIFEXITED(status);
+            int result2 = (WEXITSTATUS(status) == 0);
+            D(bug("WIFEXITED(status): %d\n", result1));
+            D(bug("(WEXITSTATUS(status) == 0): %d\n", result2));
+            D(bug("status: (%d), WEXITSTATUS(status): (%d)\n" , status, WEXITSTATUS(status)));
+            return result1 && result2;
+            /*return WIFEXITED(status) && WEXITSTATUS(status) == 0;*/
 	}
 
 	return false;
@@ -324,9 +329,11 @@ bool ether_init(void)
 			WarningAlert(str);
 			goto open_error;
 		}
+        D(bug("wait for hacking\n"));
+        char command=getchar();
 
 		// Get network config script file path
-		net_if_script = PrefsFindString("etherconfig");
+        net_if_script = PrefsFindString("etherconfig");
 		if (net_if_script == NULL)
 			net_if_script = ETHERCONFIG_FILE_NAME;
 
@@ -336,7 +343,8 @@ bool ether_init(void)
 			WarningAlert(str);
 			goto open_error;
 		}
-		net_if_name = strdup(ifr.ifr_name);
+        net_if_name = strdup(ifr.ifr_name);
+            D(bug("Bring up tun device %s by script.\n", net_if_name));
 		if (!execute_network_script("up")) {
 			sprintf(str, GetString(STR_TUN_TAP_CONFIG_WARN), "script execute error");
 			WarningAlert(str);

diff --git a/BasiliskII/src/Unix/tunconfig b/BasiliskII/src/Unix/tunconfig
@@ -77,7 +77,7 @@ $IPTABLES -L -n -t nat > /dev/null || exit 1
 #########################################################
 
 {
-    $IPTABLES -t nat -D POSTROUTING -s $TUN_NET -d ! $TUN_NET -j MASQUERADE
+    $IPTABLES -t nat -D POSTROUTING -s $TUN_NET ! -d $TUN_NET -j MASQUERADE
 } >& /dev/null
 
 #########################################################
@@ -96,7 +96,7 @@ $IPTABLES -L -n -t nat > /dev/null || exit 1
     $IFCONFIG $TUN_DEV $TUN_HOST
 
     # masquerade the tun network
-    $IPTABLES -t nat -A POSTROUTING -s $TUN_NET -d ! $TUN_NET -j MASQUERADE
+    $IPTABLES -t nat -A POSTROUTING -s $TUN_NET ! -d $TUN_NET -j MASQUERADE
 }
 
 exit 0