From e77bb0dcd3681cb1ad2bdff3b93c2978894ed3c4 Mon Sep 17 00:00:00 2001 From: Senorsen Date: Wed, 12 Nov 2014 21:16:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=80=E8=BF=91=E5=AF=B9VP?= =?UTF-8?q?N=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=8F=98=E5=8C=96=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=9B=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/route.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/route.sh b/lib/route.sh index 5ce8eca..2359123 100755 --- a/lib/route.sh +++ b/lib/route.sh @@ -33,7 +33,8 @@ echo "[INFO] Setting up ip route." gateway=$(ip route get 10.10.0.21 | grep via | awk '{print $3}') -devs_count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | awk '{print $7}' | wc -l) +# Recently VPN server 10.5.1.7 has the P-t-P: 172.172.172.2, after some updates. +devs_count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.\|172.172.172.' | awk '{print $7}' | wc -l) if [ "${devs_count}" -eq "0" ]; then dev=$(ip route get 10.10.0.21 | head -n1 | awk '{print $5}') @@ -78,22 +79,23 @@ case "$gateway" in ip route replace 58.196.224.0/20 via $gateway ip route replace 58.200.100.0/24 via $gateway - # The public CERNET IP of most ZJU servers, which can be reached directly in the Intranet. - # Most of them do have a 10.* IP, but sometimes school DNS just returns the public ones. + # The public CERNET IP of most ZJU servers, which can be reached directly in the Intranet through 10.0.0.0/8. + # If these servers are DNATed(have 210.32.*.* IP), we can't reach it through our gateway or VPN P-t-P. + # However these addresses also belong to Yu Quan Campus, our VPN, etc., + # Which can be reached through our internal gateway. ip route replace 210.32.0.0/20 via $gateway ip route replace 210.32.128.0/19 via $gateway ip route replace 210.32.160.0/21 via $gateway ip route replace 210.32.168.0/22 via $gateway ip route replace 210.32.172.0/23 via $gateway ip route replace 210.32.176.0/20 via $gateway - - # 玉泉和我们 vpn 后的 ip ip route replace 222.205.0.0/17 via $gateway ;; esac # NEXTHOP -devs=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | awk '{print $7}') +# Recently VPN server 10.5.1.7 has the P-t-P: 172.172.172.2, after some updates. +devs=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.\|172.172.172.' | awk '{print $7}') cmd="ip route replace default" for dev in $devs; do cmd="${cmd} nexthop dev ${dev}"