Use correct ping binary for pingtest

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

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index cd266d5d037243f7e6e2f79c622c5e289242a92d..65284b03814d4ac424ba83760943d4ffd902fdb6 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -1,5 +1,26 @@
 #!/bin/sh
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+. /etc/sysconfig/rc
+. $rc_functions
 
 PRIMARY_DNS=$DNS1
 SECONDARY_DNS=$DNS2
@@ -23,8 +44,27 @@ echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
 
-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