X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fnetworking%2Fred;h=24b7069e648e79dbdf57231a8137f41491e12c84;hb=f8841352f20a49b01c9c6163683e769c81c6c422;hp=9bc848228ae5ada2597b41425f134f3a144e5ca9;hpb=13704e5b1c27dee12c68daf48adb663f12b6f14d;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 9bc848228a..24b7069e64 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -119,6 +119,9 @@ case "${1}" in
 			boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."		
 			echo -n "${DEVICE}" > /var/ipfire/red/iface
 
+			## Create & Enable vnstat
+			/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
+
 			# Test to see if there is a stale pid file
 			if [ -f "$PIDFILE" ]; then
 				ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
@@ -194,7 +197,6 @@ case "${1}" in
 				boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
 				br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
 				sleep 1
-				ifconfig $PPP_NIC up
 				TYPE="pppoe"
 			fi
 			if [ "$TYPE" == "pppoe" ]; then			
@@ -204,7 +206,8 @@ case "${1}" in
 					exit 0
 				fi
 				boot_mesg "Bringing up the PPPoE interface on $PPP_NIC ..."
-				ip addr add 1.1.1.1/24 broadcast 1.1.1.255 dev $PPP_NIC
+				ip addr flush dev $PPP_NIC >/dev/null 2>&1
+				ip link set ${PPP_NIC} up
 			else
 				boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
 			fi
@@ -259,7 +262,6 @@ case "${1}" in
 				DNS=""
 				echo nameserver=$DNS1 > /etc/ppp/resolv.conf
 				echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-				
 			fi
 
 			### Dial On Demand		
@@ -325,6 +327,70 @@ case "${1}" in
 			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
 			/etc/rc.d/init.d/connectd start
 
+		elif [ "${TYPE}" == "PPTP" ]; then
+			if ( ps ax | grep -q [p]ppd ); then
+			    boot_mesg "pppd is still running." ${FAILURE}
+			    echo_failure
+			    exit 1
+			fi
+
+			eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
+
+			[ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
+
+			PPP_NIC=${DEVICE}
+
+			boot_mesg "Bringing up the PPTP interface on $PPP_NIC ..."
+			ip addr flush dev $PPP_NIC >/dev/null 2>&1
+			ip addr add 10.0.0.140/24 broadcast 10.0.0.255 dev $PPP_NIC
+
+			### DNS Config
+			#
+			if [ "${DNS}" == "Automatic" ]; then
+				DNS="usepeerdns"
+			else
+				DNS=""
+				echo nameserver=$DNS1 > /etc/ppp/resolv.conf
+				echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
+			fi
+
+			###                      ###
+			### Configuring the pppd ###
+			###                      ###
+
+			### Dial On Demand
+			#
+			if [ "${RECONNECTION}" != "persistent" ]; then
+				if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then
+					SECONDS=$[${TIMEOUT} * 60]
+				else
+					SECONDS=300
+				fi
+				if [ "${RECONNECTION}" == "dialondemand" ]; then
+					touch /var/ipfire/red/dial-on-demand
+					DEMAND="demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
+					DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
+				fi
+			fi
+
+			### Standard PPP options we always use
+			#
+			PPP_STD_OPTIONS="$DNS defaultroute noipdefault noauth"
+			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
+			PPP_STD_OPTIONS+=" user ${USERNAME} remotename ${USERNAME} lcp-echo-interval 10"
+			PPP_STD_OPTIONS+=" lcp-echo-failure 10"
+
+			### Debugging
+			#
+			if [ "${DEBUG}" == "on" ]; then
+				DEBUG="debug"
+			else
+				DEBUG=""
+			fi
+
+			PPTP_CMD="pptp 10.0.0.138 --nolaunchpppd"
+
+			/usr/sbin/pppd pty "$PPTP_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC >/dev/null 2>&1 &
 		fi
 		;;
 
@@ -334,12 +400,12 @@ case "${1}" in
 			ip route del default via ${GATEWAY} >/dev/null 2>&1
 			echo_ok
 			if [ "$DEVICE" != "${GREEN_DEV}" ]; then
-				boot_mesg "Removing IPv4 address ${ADDRESS} from the ${DEVICE} interface..."
-				ip addr del ${args} dev ${DEVICE}
+				boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..."
+				ip addr flush dev ${DEVICE}
 				evaluate_retval
 			fi
 			run_subdir ${rc_base}/init.d/networking/red.down/
-			
+
 		elif [ "$TYPE" == "DHCP" ]; then
 			boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
 			if [ -e $LEASEINFO ]; then
@@ -371,17 +437,15 @@ case "${1}" in
 				boot_mesg -n "LEASEINFO Test failed! - " ${WARNING}
 				boot_mesg "dhcpcd is not running!" ${WARNING}
 				echo_warning
-				exit 1
 			fi
-		
-		elif [ "$TYPE" == "PPPOE" ]; then
+
+		if [ "$TYPE" == "PPPOE" ] || [ "$TYPE" == "PPTP" ]; then
 			boot_mesg "Bringing down the PPP interface ..."
 			## Disable vnstat collection
 			/usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
 			rm -f /var/ipfire/red/keepconnected
 			killall -w -s TERM /usr/sbin/pppd 2>/dev/null
 			evaluate_retval
-			ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE} >/dev/null 2>&1
 		fi
 
 		if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
@@ -394,12 +458,14 @@ case "${1}" in
 				fi
 			fi
 		fi
+
 		killall -w -s KILL /usr/sbin/pppd >/dev/null 2>&1
 		killall -w -s KILL br2684ctl >/dev/null 2>&1
-		rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
 
 		## Disable vnstat collection
 		/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
+
+		rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
 		exit 0;
 		;;
 esac