X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fnetworking%2Fred;h=6a85eb48e65d3d6d1e0153816935501749126e70;hp=1ed52ddf3242a2e72be03523bc75f0c589e82365;hb=7e0cd11d132f2c79c4d7de4869a4f8c6a4c67474;hpb=7f5fdd04d23b54a88668338ad98e280495727420

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 1ed52ddf32..6a85eb48e6 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -15,24 +15,47 @@
 #
 ########################################################################
 
+
+
 . /etc/sysconfig/rc 
 . ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
+if [ "$RRDLOG" == "" ]; then
+	RRDLOG=/var/log/rrd
+fi
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 TYPE="${RED_TYPE}"
 DEVICE="${RED_DEV}"
 
-if [ "$TYPE" == "STATIC" ]; then
-	ADDRESS="${RED_ADDRESS}"
-	BROADCAST="${RED_BROADCAST}"
-	NETADDRESS="${RED_NETADDRESS}"
-	NETMASK="${RED_NETMASK}"
+if [ "$TYPE" == "STATIC" ] || [ "$TYPE" == "DHCP" ]; then
+	if [ "$DEVICE" == "" ]; then
+		boot_mesg "No device for red network. Please run setup." ${FAILURE}
+		echo_failure
+		[ "${1}" == "start" ] && exit 0
+	fi
+fi
+	
+if [ "${TYPE}" == "STATIC" ]; then
+	if [ "${DEVICE}" != "${GREEN_DEV}" ]; then
+		ADDRESS="${RED_ADDRESS}"
+		BROADCAST="${RED_BROADCAST}"
+		NETADDRESS="${RED_NETADDRESS}"
+		NETMASK="${RED_NETMASK}"
+	else
+		ADDRESS="${GREEN_ADDRESS}"
+		BROADCAST="${GREEN_BROADCAST}"
+		NETADDRESS="${GREEN_NETADDRESS}"
+		NETMASK="${GREEN_NETMASK}"
+	fi
 	GATEWAY="${DEFAULT_GATEWAY}"
 	# DNS1
 	# DNS2
 
 	if [ -z "${BROADCAST}" ]; then
-		boot_mesg "BROADCAST variable missing from input, cannot continue." ${FAILURE}
+		boot_mesg "BROADCAST variable missing, cannot continue." ${FAILURE}
 		echo_failure
 		exit 1
 	fi
@@ -56,30 +79,40 @@ fi
 
 case "${1}" in
 	start)
-		boot_mesg "Bringing up the ${DEVICE} interface..."
-		boot_mesg_flush
-		
-		# Check if an interface is there...
-		if ip link show ${DEVICE} > /dev/null 2>&1; then
-			link_status=`ip link show ${DEVICE} 2> /dev/null`
-			if [ -n "${link_status}" ]; then
-				if ! echo "${link_status}" | grep -q UP; then
-					ip link set ${DEVICE} up
+		if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
+			boot_mesg "Bringing up the ${DEVICE} interface..."
+			boot_mesg_flush
+			# Check if an interface is there...
+			if ip link show ${DEVICE} > /dev/null 2>&1; then
+				link_status=`ip link show ${DEVICE} 2> /dev/null`
+				if [ -n "${link_status}" ]; then
+					if ! echo "${link_status}" | grep -q UP; then
+						ip link set ${DEVICE} up
+					fi
 				fi
+			else
+				boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE}
+				echo_failure
+				exit 1
 			fi
-		else
-			boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE}
-			echo_failure
-			exit 1
 		fi
+
+		## Create & Enable vnstat
+		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
 		
 		if [ "${TYPE}" == "STATIC" ]; then
-			boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
-			ip addr add ${args} dev ${DEVICE}
-			evaluate_retval
+		
+			if [ "$DEVICE" != "${GREEN_DEV}" ]; then
+				boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
+				ip addr add ${args} dev ${DEVICE}
+				evaluate_retval
+			fi
 			echo -n "${DEVICE}" > /var/ipfire/red/iface
 			echo -n "${ADDRESS}"  > /var/ipfire/red/local-ipaddress
 			echo -n "${GATEWAY}" > /var/ipfire/red/remote-ipaddress
+			grep -v "gateway" /etc/hosts > /tmp/hosts
+			echo "$GATEWAY gateway"  >> /tmp/hosts
+			mv /tmp/hosts /etc/hosts
 			echo -n "${DNS1}" > /var/ipfire/red/dns1
 			echo -n "${DNS2}" > /var/ipfire/red/dns2
 			touch /var/ipfire/red/active
@@ -91,9 +124,41 @@ case "${1}" in
 			run_subdir ${rc_base}/init.d/networking/red.up/
 			
 		elif [ "${TYPE}" == "DHCP" ]; then
+
+			if [ -e $LEASEINFO ]; then
+				boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
+				. $LEASEINFO
+				if [ "$LEASETIME" = "4294967295" ]; then
+					# do nothing, just echo ok
+					echo ""
+					echo_ok
+				else
+					if [ -n "$DHCP_STOP" ]; then
+						/sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
+						RET="$?"
+						if [ "$RET" -eq 0 ]; then
+							echo ""
+							echo_ok
+						elif [ "$RET" -eq 1 ]; then
+							boot_mesg "dhcpcd not running!" ${WARNING}
+							echo_warning
+						else
+							echo ""
+							echo_failure
+						fi
+					else
+						echo ""
+						killproc dhcpcd
+					fi
+				fi
+			fi
+
 			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
@@ -140,7 +205,11 @@ case "${1}" in
 
 				. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
 				echo "$IPADDR"  > /var/ipfire/red/local-ipaddress
+				grep -v "gateway" /etc/hosts > /tmp/hosts
+				echo "$GATEWAY gateway"  >> /tmp/hosts
+				mv /tmp/hosts /etc/hosts
 				echo "$GATEWAY" > /var/ipfire/red/remote-ipaddress
+				touch /var/ipfire/red/active
 			else
 				echo ""
 				$(exit "$RET")
@@ -150,40 +219,65 @@ case "${1}" in
 		elif [ "$TYPE" == "PPPOE" ]; then
 			
 			if ( ps ax | grep -q [p]ppd ); then 
-			    echo Error! A pppd is still running. Stop it first.
-			    echo
-			    exit 1;
+			    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}
-			
-			if [ "$TYPE" == "pppoeatm" ]; then
+
+			if [ "$TYPE" == "vdsl" ]; then
+				boot_mesg "Createing VLAN Interface ${DEVICE}.7 ..."
+				modprobe 8021q
+				vconfig add ${DEVICE} 7
+				PPP_NIC=${DEVICE}.7
+				sleep 0.2
+				ip link set ${PPP_NIC} up
+				TYPE="pppoe"
+			fi
+
+			if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
 				PPP_NIC=nas0		
-				boot_mesg "Create ATM-Bridge as $PPP_NIC ..."
+				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"
+				if [ "$TYPE" == "pppoeatm" ]; then
+					TYPE="pppoe"
+				fi
+				if [ "$TYPE" == "pptpatm" ]; then
+					TYPE="pptp"
+				fi
 			fi
-			if [ "$TYPE" == "pppoe" ]; then			
-				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
+			if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then
+				if [ "$PPP_NIC" == "" ]; then
+					boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
+					echo_failure
+					exit 0
+				fi
+				boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
+				ip addr flush dev $PPP_NIC >/dev/null 2>&1
+				if [ "$TYPE" == "pptp" ]; then
+					ip addr add $PPTP_NICCFG dev $PPP_NIC
+				fi
+				ip link set ${PPP_NIC} up
 			else
 				boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
 			fi
+			
 			###                      ###
 			### Configuring the pppd ###
 			###                      ###
 			
 			### Plugin Options
 			#			
-			[ "${METHOD}" == "PPPOE_PLUGIN" ] && \
-				PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
-
-				# PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so nic-$PPP_NIC"
+			if [ "$TYPE" == "pppoe" ]; then
+				[ "${METHOD}" == "PPPOE_PLUGIN" ] && \
+					PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+			fi
 
 			### Synchronous Mode
 			#
@@ -224,7 +318,6 @@ case "${1}" in
 				DNS=""
 				echo nameserver=$DNS1 > /etc/ppp/resolv.conf
 				echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-				
 			fi
 
 			### Dial On Demand		
@@ -242,14 +335,18 @@ case "${1}" in
 				fi
 			fi
 			
-			### When using pppoe-plugin the device has to be the last option
-			#
-			[ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" $PPP_NIC"
+			if [ "$TYPE" == "pppoe" ]; then
+				### When using pppoe-plugin the device has to be the last option
+				#
+				[ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" $PPP_NIC"
+			fi
 			
 			if [ "$TYPE" == "modem" ]; then
 				PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts"
+				METHOD="PPPOE_PLUGIN"
 			elif [ "$TYPE" == "serial" ]; then
 				PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /bin/true lock modem crtscts"
+				METHOD="PPPOE_PLUGIN"
 			fi
 		
 			### Standard PPP options we always use
@@ -274,10 +371,17 @@ case "${1}" in
 				PPPOE_CMD="/usr/sbin/pppoe -p /var/run/ppp-ipfire.pid.pppoe -I $PPP_NIC"
 				PPPOE_CMD+=" -T 80 -U $PPPOE_SYNC $ACNAME $SERVICENAMEOPT"
 			fi
+
+			### PPTP ###
+			#
+			if [ "$TYPE" == "pptp" ]; then
+				PPPOE_CMD="pptp $PPTP_PEER --nolaunchpppd"
+				METHOD=""
+			fi
 			
 			### Run everything
 			#
-			if [ "${METHOD}" == "PPPOE_PLUGIN" ]; then
+			if [ "$METHOD" == "PPPOE_PLUGIN" ]; then
 				/usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND >/dev/null 2>&1 &
 				evaluate_retval
 				# echo PLUGIN: /usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND
@@ -286,20 +390,28 @@ case "${1}" in
 				evaluate_retval
 				# echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC
 			fi
-			
+			## Create & Enable vnstat
+			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
 			/etc/rc.d/init.d/connectd start
-
+			# Add a NaN value to ppp0 rrd to supress spikes at reconnect
+			rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+				$(date +%s):: > /dev/null 2>&1
+			exit 0
 		fi
 		;;
 
 	stop)
 		if [ "$TYPE" == "STATIC" ]; then
-			boot_mesg "Removing IPv4 address ${ADDRESS} from the ${DEVICE} interface..."
-			ip addr del ${args} dev ${DEVICE}
-			evaluate_retval
-			
+			boot_mesg "Stopping default gateway ${GATEWAY}..."
+			ip route del default via ${GATEWAY} >/dev/null 2>&1
+			echo_ok
+			if [ "$DEVICE" != "${GREEN_DEV}" ]; then
+				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
@@ -331,31 +443,49 @@ 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
 			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
-			killall -w -s TERM br2684ctl >/dev/null 2>&1
-			ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
-			
+			# Add a NaN value to ppp0 rrd to supress spikes at reconnect
+			rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
+				$(date +%s):: > /dev/null 2>&1
 		fi
-		
-		link_status=`ip link show $DEVICE 2> /dev/null`
-		if [ -n "${link_status}" ]; then
-			if echo "${link_status}" | grep -q UP; then
-				boot_mesg "Bringing down the ${DEVICE} interface..."
-				ip link set ${DEVICE} down
-				evaluate_retval
+
+		if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
+			link_status=`ip link show $DEVICE.7 2> /dev/null`
+			if [ -n "${link_status}" ]; then
+				if echo "${link_status}" | grep -q UP; then
+					boot_mesg "Bringing down the ${DEVICE}.7 interface..."
+					ip link set ${DEVICE}.7 down
+					vconfig del ${DEVICE} 7
+					evaluate_retval
+				fi
+			fi
+			link_status=`ip link show $DEVICE 2> /dev/null`
+			if [ -n "${link_status}" ]; then
+				if echo "${link_status}" | grep -q UP; then
+					boot_mesg "Bringing down the ${DEVICE} interface..."
+					ip link set ${DEVICE} down
+					evaluate_retval
+				fi
 			fi
 		fi
-		
+		killall -w -s KILL /usr/sbin/pppd >/dev/null 2>&1
+		killall -w -s KILL pptp >/dev/null 2>&1
+		killall -w -s KILL br2684ctl >/dev/null 2>&1
+
+		## 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
 
 # End