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=5a9077cae52e2064f790be7711433e83f6c80c5e;hp=5052b6775fa2780cb00434526c67d44c0372cedf;hb=d9563c552e2e8485caa0bcf13c5f357e208698e5;hpb=040e50406cce11014218ee36ae81dda6393ed34d

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 5052b6775f..5a9077cae5 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -17,22 +17,52 @@
 
 . /etc/sysconfig/rc 
 . ${rc_functions}
+
+#Define some defaults
+RED_VDSL_INET_VLAN=7
+RED_VDSL_IPTV_VLAN=8
+RED_VDSL_IPTV_DISABLE=0
+
+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)
+eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/mac/settings)
+
+MAC=$(tr - : <<<$MAC)
 
 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
@@ -44,55 +74,104 @@ if [ "$TYPE" == "STATIC" ]; then
 		echo_failure
 		exit 1
 	fi
-	
-elif [ "${TYPE}" == "DHCP" ]; then
-
-	PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
-	LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
-	DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
-	DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
-
 fi
 
+PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
+LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
+DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
+DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
+
 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
+						if [ -n "$MAC" ]; then
+							boot_mesg "Setting mac address on ${DEVICE} to ${MAC}"	
+							ip link set dev ${DEVICE} address ${MAC}
+							evaluate_retval		
+						fi
+						
+						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
 			
 			boot_mesg "Setting up default gateway ${GATEWAY}..."
 			ip route add default via ${GATEWAY} dev ${DEVICE}
 			evaluate_retval
 			
 			run_subdir ${rc_base}/init.d/networking/red.up/
-			
+
+			# Configure aliases only if red static
+			/usr/local/bin/setaliases
+
 		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
@@ -108,8 +187,8 @@ case "${1}" in
 			iptables -A REDINPUT -p tcp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT
 			iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT
 			
-			if [ -n "${DHCP_HOSTNAME}" ]; then
-				DHCP_START+="-h ${DHCP_HOSTNAME} "
+			if [ -n "${RED_DHCP_HOSTNAME}" ]; then
+				DHCP_START+="-h ${RED_DHCP_HOSTNAME} "
 	  	fi
 	  	
 	  	/sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1
@@ -123,8 +202,8 @@ case "${1}" in
 				boot_mesg_flush
 				boot_mesg "           IP Address:      $IPADDR"
 				boot_mesg_flush
-				if [ -n "${DHCP_HOSTNAME}" ]; then
-					boot_mesg "           Hostname:        $DHCP_HOSTNAME"
+				if [ -n "${RED_DHCP_HOSTNAME}" ]; then
+					boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
 					boot_mesg_flush
 				fi
 				boot_mesg "           Subnet Mask:     $NETMASK"
@@ -133,13 +212,23 @@ case "${1}" in
 				boot_mesg_flush
 				boot_mesg "           DNS Server:      $DNS"
 				boot_mesg_flush
-				
-				echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
-				echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
+				if [ -n "$DNS0" ] && [ -n "$DNS1" ]; then
+					boot_mesg "Overwritting DNS-Server addresses with ${DNS0},${DNS1}"	
+					echo -n ${DNS0} > /var/ipfire/red/dns1
+					echo -n ${DNS1} > /var/ipfire/red/dns2			
+					evaluate_retval		
+				else
+					echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
+					echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
+				fi
 
 				. /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")
@@ -147,30 +236,159 @@ case "${1}" in
 			fi
 		
 		elif [ "$TYPE" == "PPPOE" ]; then
-		
-			eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 			
-			boot_mesg "Bringing up the PPPoE interface on ${DEVICE}..."
-			ip addr add 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
+			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}
+
+			if [ "$TYPE" == "vdsl" ]; then
+				boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..."
+				modprobe 8021q
+				vconfig add ${DEVICE} ${RED_VDSL_INET_VLAN}
+				PPP_NIC=${DEVICE}.${RED_VDSL_INET_VLAN}
+				sleep 0.2
+				ip link set ${PPP_NIC} up
+				TYPE="pppoe"
+
+				if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
+					PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
+					LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
+
+					# Test to see if there is a stale pid file
+					if [ -f "$PIDFILE" ]; then
+						ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
+						if [ $? != 0 ]; then
+							rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+						fi
+					fi
+
+					if [ ! -f "$PIDFILE" ]; then
+						boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
+						vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
+						boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
+						/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
+						RET="$?"
+
+						if [ "$RET" = "0" ]; then
+							. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info
+							echo ""
+							echo_ok
+							boot_mesg "           DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
+							boot_mesg_flush
+							boot_mesg "           IP Address:      $IPADDR"
+							boot_mesg_flush
+							boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
+							boot_mesg_flush
+							boot_mesg "           Subnet Mask:     $NETMASK"
+							boot_mesg_flush
+							boot_mesg "           Default Gateway: $GATEWAY"
+							boot_mesg_flush
+							boot_mesg "           DNS Server:      $DNS"
+							boot_mesg_flush
+
+						else
+							echo ""
+							$(exit "$RET")
+							evaluate_retval
+						fi
+					fi
+				fi
+			fi
+
+			if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
+				PPP_NIC=nas0		
+				boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
+				br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
+				sleep 1
+				if [ "$TYPE" == "pppoeatm" ]; then
+					TYPE="pppoe"
+				fi
+				if [ "$TYPE" == "pptpatm" ]; then
+					TYPE="pptp"
+				fi
+			fi
+			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
+					if [ "$PPTP_NICCFG" == "dhcp" ]; then
+
+						# Test to see if there is a stale pid file
+						if [ -f "$PIDFILE" ]; then
+							ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
+							if [ $? != 0 ]; then
+								rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+							fi
+						fi
+
+						if [ ! -f "$PIDFILE" ]; then
+							boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
+							/sbin/dhcpcd ${DEVICE} -G ${DHCP_START} >/dev/null 2>&1
+							RET="$?"
+
+							if [ "$RET" = "0" ]; then
+								. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
+								echo ""
+								echo_ok
+								boot_mesg "           DHCP Assigned Settings for ${DEVICE}:"
+								boot_mesg_flush
+								boot_mesg "           IP Address:      $IPADDR"
+								boot_mesg_flush
+								boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
+								boot_mesg_flush
+								boot_mesg "           Subnet Mask:     $NETMASK"
+								boot_mesg_flush
+								boot_mesg "           Default Gateway: $GATEWAY"
+								boot_mesg_flush
+								boot_mesg "           DNS Server:      $DNS"
+								boot_mesg_flush
+
+							else
+								echo ""
+								$(exit "$RET")
+								evaluate_retval
+							fi
+						fi
+					else
+						ip addr add $PPTP_NICCFG dev $PPP_NIC
+					fi
+				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 nic-${DEVICE}"
+			if [ "$TYPE" == "pppoe" ]; then
+				[ "${METHOD}" == "PPPOE_PLUGIN" ] && \
+					PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+			fi
 
 			### Synchronous Mode
 			#
 			#PPPOE_SYNC=-s
-    	#PPPD_SYNC=sync
-    	
-    	### Access Concentrator Name
-    	#
+			#PPPD_SYNC=sync
+	
+			### Access Concentrator Name
+			#
 			if [ -n "${CONCENTRATORNAME}" ]; then
 				ACNAME="-C ${CONCENTRATORNAME}"
 			fi
@@ -184,7 +402,7 @@ case "${1}" in
 					SERVICENAME="-S ${SERVICENAME}"
 				fi
 			fi
-			
+
 			### Authentication Types
 			#
 			if [ "${AUTH}" == "pap" ]; then
@@ -194,7 +412,17 @@ case "${1}" in
 			else
 				AUTH=""
 			fi
-	
+
+			### 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
+
 			### Dial On Demand		
 			#
 			if [ "${RECONNECTION}" != "persistent" ]; then
@@ -206,22 +434,32 @@ case "${1}" in
 				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 connect true noipdefault ktune"		
+					DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
 				fi
 			fi
 			
-			### When using plugin the device has to be the last option
-			#
-			[ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" ${DEVICE}"
+			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
 			#
-			PPP_STD_OPTIONS="$PLUGOPTS usepeerdns defaultroute noipdefault noauth"
+			PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth"
 			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}"
 			PPP_STD_OPTIONS+=" mru ${MTU} noaccomp nodeflate nopcomp novj novjccomp"
 			PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
 			PPP_STD_OPTIONS+=" lcp-echo-failure 3 ${AUTH}"
-			
+				
 			### Debugging
 			#
 			if [ "${DEBUG}" == "on" ]; then
@@ -232,87 +470,121 @@ case "${1}" in
 			
 			### PPPoE invocation
 			#
-			PPPOE_CMD="/usr/sbin/pppoe -p /var/run/ppp-ipfire.pid.pppoe -I ${DEVICE}"
-			PPPOE_CMD+=" -T 80 -U $PPPOE_SYNC $ACNAME $SERVICENAMEOPT"
+			if [ "$TYPE" == "pppoe" ]; then
+				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
 			else
 				/usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC >/dev/null 2>&1 &
 				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
+
+		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
+			# 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
+
+		if [ -e $LEASEINFO ]; then
 			boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
-			if [ -e $LEASEINFO ]; then
-				. $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
+			. $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 ""
-						killproc dhcpcd
+						echo_failure
 					fi
-		    fi
-			else
-				boot_mesg -n "LEASEINFO Test failed! - " ${WARNING}
-				boot_mesg "dhcpcd is not running!" ${WARNING}
-				echo_warning
-				exit 1
+				else
+					echo ""
+					killproc dhcpcd
+				fi
 			fi
-		
-		elif [ "$TYPE" == "PPPOE" ]; then
-			boot_mesg "Bringing down the PPPoE interface on ${DEVICE}..."
-			rm -f /var/ipfire/red/keepconnected
-			killproc /usr/sbin/pppd
-			
-			ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
-			
 		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.${RED_VDSL_INET_VLAN} 2> /dev/null`
+			if [ -n "${link_status}" ]; then
+				if echo "${link_status}" | grep -q UP; then
+					boot_mesg "Bringing down the ${DEVICE}.${RED_VDSL_INET_VLAN} interface..."
+					ip link set ${DEVICE}.${RED_VDSL_INET_VLAN} down
+					vconfig del ${DEVICE} ${RED_VDSL_INET_VLAN}
+					evaluate_retval
+				fi
+			else
+				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
 		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