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=08d6c927af8a21d38107419b57f61ffaa1a6b1de;hp=20e052a353e1ba6b5debee3bc245afdefc91af03;hb=bbe6aff7cdfcc56a0b5d6faa02b77e66806f4be2;hpb=58e9b9dc29759ad26c214edd975783c931c3391a

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 20e052a353..08d6c927af 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -15,9 +15,20 @@
 #
 ########################################################################
 
+
+
 . /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)
+eval $(/usr/local/bin/readhash /var/ipfire/mac/settings)
+
+MAC=$(tr - : <<<$MAC)
 
 TYPE="${RED_TYPE}"
 DEVICE="${RED_DEV}"
@@ -79,6 +90,11 @@ case "${1}" in
 				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
@@ -114,11 +130,46 @@ case "${1}" in
 			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
@@ -169,6 +220,7 @@ case "${1}" in
 				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")
@@ -188,22 +240,88 @@ case "${1}" in
 			[ -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"
+
+
+				PIDFILE="/var/run/dhcpcd-${DEVICE}.8.pid"
+				LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.8.info"
+				DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
+				DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
+
+
+				# 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}.8.pid > /dev/null
+					fi
+				fi
+				if [ ! -f "$PIDFILE" ]; then
+					#DHCP for VDSL IPTV
+					boot_mesg "Createing VLAN Interface ${DEVICE}.8 ..."
+					vconfig add ${DEVICE} 8
+
+					boot_mesg -n "Starting dhcpcd on the ${DEVICE}.8 interface..."
+
+					/sbin/dhcpcd ${DEVICE}.8 ${DHCP_START} >/dev/null 2>&1
+					RET="$?"
+
+					if [ "$RET" = "0" ]; then
+						. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.8.info
+						echo ""
+						echo_ok
+						boot_mesg "           DHCP Assigned Settings for ${DEVICE}.8:"
+						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
+
+			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
-				TYPE="pppoe"
+				if [ "$TYPE" == "pppoeatm" ]; then
+					TYPE="pppoe"
+				fi
+				if [ "$TYPE" == "pptpatm" ]; then
+					TYPE="pptp"
+				fi
 			fi
-			if [ "$TYPE" == "pppoe" ]; then			
+			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 PPPoE interface on $PPP_NIC ..."
+				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}..."
@@ -215,10 +333,10 @@ case "${1}" in
 			
 			### 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
 			#
@@ -259,7 +377,6 @@ case "${1}" in
 				DNS=""
 				echo nameserver=$DNS1 > /etc/ppp/resolv.conf
 				echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-				
 			fi
 
 			### Dial On Demand		
@@ -277,14 +394,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
@@ -309,10 +430,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
@@ -324,7 +452,10 @@ case "${1}" in
 			## 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
 		;;
 
@@ -339,7 +470,7 @@ case "${1}" in
 				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,9 +502,8 @@ 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
@@ -381,24 +511,39 @@ case "${1}" in
 			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 [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
-			link_status=`ip link show $DEVICE 2> /dev/null`
+			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} interface..."
-					ip link set ${DEVICE} down
+					boot_mesg "Bringing down the ${DEVICE}.7 interface..."
+					ip link set ${DEVICE}.7 down
+					vconfig del ${DEVICE} 7
 					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
-		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