add nt::china_route_novia

Signed-off-by: jet tsang zeon-git <zeon-git@jettsang.com>

2 files changed, 32 insertions, 85 deletions

diff --git a/src/badvpn.sh b/src/badvpn.sh
index 056a3ad..ee85e22 100755
--- a/src/badvpn.sh
+++ b/src/badvpn.sh
@@ -94,93 +94,12 @@ function badvpn::maketun() {
 }
 
 function badvpn::tunroute(){
-    $GFWPATH/gfw-up6.sh tun64 fd00::01:1989:0604:64 2>&1 > /dev/null &
+    nt::world_route6 fd00::1:1989:604:64 tun64
     ip route delete default
     ip route add default via 10.19.89.64 dev tun64
 }
-function badvpn::route() {
-    $GFWPATH/gfw-up.sh 10.19.89.64 2>&1 > /dev/null &
-    $GFWPATH/gfw-up6.sh tun64 fd00::01:1989:0604:64 2>&1 > /dev/null &
-}
-
-function badvpn::nogwroute() {
-    badvpn::route
-}
-
-function badvpn::sockscnroute() {
-    badvpn::maketun
-    server=$1
-    case $OSNAME in
-    Linux)
-            if [ "$DEV" != "ppp0" ]; then
-                ip route add $server via $DEFAULTROUTE > /dev/null 2>&1 > /dev/null
-            else
-                ip route add $server dev ppp0 > /dev/null 2>&1 > /dev/null
-            fi
-            ip route delete default
-            ip route add default via 10.19.89.64 dev tun64
-            for ip in $(cat $GFWPATH/iplist/cn_rules); do
-                if [ "$DEV" != "ppp0" ]; then
-                    ip route add $ip via $DEFAULTROUTE > /dev/null 2>&1 > /dev/null
-                else
-                    ip route add $ip dev ppp0 > /dev/null 2>&1 > /dev/null
-                fi
-            done
-            $GFWPATH/gfw-up6.sh tun64 fd00::01:1989:0604:64 2>&1 > /dev/null &
-            ;;
-    Darwin)
-            ;;
-    *)
-            exit 1
-            ;;
-    esac
-}
-function badvpn::pppcnroute() {
-    badvpn::maketun
-    server=$1
-    case $OSNAME in
-    Linux)
-            ip route add $server dev ppp0 > /dev/null 2>&1 > /dev/null
-            ip route delete deufalt > /dev/null 2>&1 > /dev/null
-            ip route add default via 10.19.89.64 dev tun64 > /dev/null 2>&1 > /dev/null
-            for ip in $(cat $GFWPATH/iplist/cn_rules); do
-                ip route add $ip dev ppp0 > /dev/null 2>&1 > /dev/null
-            done
-            $GFWPATH/gfw-up6.sh tun64 fd00::01:1989:0604:64 2>&1 > /dev/null &
-            ;;
-    Darwin)
-            ;;
-    *)
-            exit 1
-            ;;
-    esac
-}
-function badvpn::cnroute() {
-    case $OSNAME in
-    Linux)
-            for ip in $(cat $GFWPATH/iplist/cn_rules); do
-                ip route add $ip dev ppp0 > /dev/null 2>&1 > /dev/null
-            done
-            ;;
-    Darwin)
-            ;;
-    *)
-            exit 1
-            ;;
-    esac
-}
 
-function badvpn::cnroutecustom() {
-    case $OSNAME in
-    Linux)
-            for ip in $(cat $GFWPATH/iplist/cn_rules); do
-                ip route add $ip via $1 dev $2 > /dev/null 2>&1 > /dev/null
-            done
-            ;;
-    Darwin)
-            ;;
-    *)
-            exit 1
-            ;;
-    esac
+function badvpn::world_route() {
+    nt::world_route6 fd00::1:1989:604:64 tun64
+    nt::world_route 10.19.89.64 tun64
 }
diff --git a/src/lib.sh b/src/lib.sh
index 09fff8f..9d6e998 100755
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -117,6 +117,34 @@ function nt::portforward()
     iptables -t nat -A PREROUTING -d $sourceip -p tcp --dport $sourceport -j DNAT --to $destinationip:$destinationport
 }
 
+function nt::china_route_novia() {
+    case $OSNAME in
+    Linux)
+            for ip in $(cat $IPLISTPATH/cn_rules); do
+                ip route add $ip dev $1 > /dev/null 2>&1 > /dev/null
+            done
+            ;;
+    Darwin)
+            ;;
+    *)
+            exit 1
+            ;;
+    esac
+}
+function nt::china_route() {
+    case $OSNAME in
+    Linux)
+            for ip in $(cat $IPLISTPATH/cn_rules); do
+                ip route add $ip via $1 dev $2 > /dev/null 2>&1 > /dev/null
+            done
+            ;;
+    Darwin)
+            ;;
+    *)
+            exit 1
+            ;;
+    esac
+}
 
 function nt::world_route() {
     case $OSNAME in