suricata: Change midstream policy to "pass-flow"

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

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index ec4fc82b5f9d1c10978e8c20d00298518a2a15d6..2e636e72d934d3c98bbdd9468f5a38f770f61af2 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -22,57 +22,40 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
-PRIMARY_DNS=$DNS1
-SECONDARY_DNS=$DNS2
-
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 
-if [ "$DNS" == "Automatic" ]; then
-       if [ "$TYPE" == "isdn" ]; then
-               echo -n "$MS_DNS1" > /var/ipfire/red/dns1
-               echo -n "$MS_DNS2" > /var/ipfire/red/dns2
-       else
-               echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
-               echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
-       fi
-else
-       echo -n "$DNS1" > /var/ipfire/red/dns1
-       echo -n "$DNS2" > /var/ipfire/red/dns2
-fi
+# Write DNS servers to configuration
+echo "${DNS1}" > /var/run/dns1
+echo "${DNS2}" > /var/run/dns2
 
 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
 touch /var/ipfire/red/active
-mv /tmp/hosts /etc/hosts
-
-#Start pingtest in background and store the pid
-ping -c 2 $5 > /tmp/gatewayping &
-PINGPID=$!
 
+/sbin/ip route replace default via ${IPREMOTE} dev ppp0
 run_subdir ${rc_base}/init.d/networking/red.up/
 
-[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up
-
-#Make sure that pingtest has enough time
-sleep 3
-
-#Kill the pingtest
-kill $PINGPID >/dev/null 2>&1
-
 #Check if gateway has answerd to ping, if not replace with ping.ipfire.org
-TEST=`cat /tmp/gatewayping | tail -2 | head -1 | cut -d"," -f2`;
+TEST=`/usr/bin/ping -c 2 $5 2>/dev/null | tail -2 | head -1 | cut -d"," -f2`;
+
+grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
 
-if [ "$TEST" == " 2 packets received" ]; then
-       echo Ping gateway
+if [ "$TEST" == " 2 received" ]; then
+       #ping the ppp-gateway
+       echo "$5        gateway" >> /tmp/hosts
 else
-       echo Ping ipfire
-       FIRE=`nslookup ping.ipfire.org | tail -2  | head -1 | cut -d" " -f2`;
-       grep -v "gateway" /etc/hosts > /tmp/hosts
-       echo "$FIRE gateway" >> /tmp/hosts
-       mv /tmp/hosts /etc/hosts
+       #no answer
+       HOST=`host ping.ipfire.org`;
+       FIRE=`echo $HOST | cut -d" " -f4`;
+       CHK=`echo $HOST | cut -d" " -f3`;
+       if [ "$CHK" == "address" ]; then
+           #use ping.ipfire.org
+           echo "$FIRE gateway" >> /tmp/hosts
+       else
+           #DNS lookup failed use direct ip
+           echo "81.3.27.38    gateway" >> /tmp/hosts
+       fi
 fi
-rm -f /tmp/gatewayping
+mv /tmp/hosts /etc/hosts
+