. /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}"
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)
if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; 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
exit 1
fi
fi
+
+ ## Create & Enable vnstat
+ /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
if [ "${TYPE}" == "STATIC" ]; then
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
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
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")
[ -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}.${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
- 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
+ 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}.${RED_VDSL_IPTV_VLAN} interface..."
+ /sbin/dhcpcd ${DEVICE} ${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
- 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 link set ${PPP_NIC} up
else
boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
fi
### 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
#
DNS=""
echo nameserver=$DNS1 > /etc/ppp/resolv.conf
echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-
fi
### Dial On Demand
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
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
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
;;
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
- . $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
- else
- 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
- ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE} >/dev/null 2>&1
+ # 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..."
+ . $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
if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
- link_status=`ip link show $DEVICE 2> /dev/null`
+ 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} interface..."
- ip link set ${DEVICE} down
+ 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 TERM /usr/sbin/pppd >/dev/null 2>&1
- killall -w -s TERM br2684ctl >/dev/null 2>&1
+ 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
projects / people / pmueller / ipfire-2.x.git / blobdiff