Fix ip-up doesnt touch red/active

[people/teissler/ipfire-2.x.git] / src / ppp / ip-up

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 0f32820c08c390140423e95ec49672d2ea877a75..af5dd2908f912768fa4f1755d0f738b0ac95ba6f 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -43,12 +43,29 @@ fi
 echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
-grep -v "gateway" /etc/hosts > /tmp/hosts
-echo "$5 gateway"  >> /tmp/hosts
-mv /tmp/hosts /etc/hosts
-
 touch /var/ipfire/red/active
 
 run_subdir ${rc_base}/init.d/networking/red.up/
 
+#Check if gateway has answerd to ping, if not replace with ping.ipfire.org
+TEST=`/usr/bin/ping -c 2 $5 2>/dev/null | tail -2 | head -1 | cut -d"," -f2`;
+
+grep -v "gateway" /etc/hosts > /tmp/hosts
+
+if [ "$TEST" == " 2 packets received" ]; then
+       #ping the ppp-gateway
+       echo "$5        gateway" >> /tmp/hosts
+else
+       #no answer
+       FIRE=`nslookup ping.ipfire.org | tail -2  | head -1 | cut -d" " -f2`;
+       if [ "$FIRE" == "server" ]; then
+           #DNS lookup failed use direct ip
+           echo "85.88.28.124  gateway" >> /tmp/hosts
+       else
+           #use ping.ipfire.org
+           echo "$FIRE gateway" >> /tmp/hosts
+       fi
+fi
+mv /tmp/hosts /etc/hosts
+
 [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up