#
########################################################################
+
+
. /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
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
+
+ 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/
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
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
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"
. /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")
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)
- PPPOECONF=/etc/ppp/pppoe.conf
- echo > $PPPOECONF #clear
+ [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
- if [ "${METHOD}" != "PPPOE_PLUGIN" ]; then
- echo "LINUX_PLUGIN=" >> $PPPOECONF
- else
- echo "LINUX_PLUGIN=/usr/lib/pppd/2.4.4/rp-pppoe.so" >> $PPPOECONF
+ PPP_NIC=${DEVICE}
+
+ 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
-
- echo "ETH=${DEVICE}" >> $PPPOECONF
- echo "USER=${USERNAME}" >> $PPPOECONF
-
- echo "PPPOE_TIMEOUT=80" >> $PPPOECONF
-
- #echo "PPPD_EXTRA=\"-U\"" >> $PPPOECONF
- #echo "PPPOE_EXTRA=\"-m ${MTU}\"" >> $PPPOECONF
- if [ -n ${SERVICENAME} ]; then
- echo "SERVICENAME=${SERVICENAME}" >> $PPPOECONF
+ 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 [ -n ${CONCENTRATORNAME} ]; then
- echo "ACNAME=${CONCENTRATORNAME}" >> $PPPOECONF
+ 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
-
- if [ "${DNS}" == "Automatic" ]; then
- echo "PEERDNS=yes" >> $PPPOECONF
- echo "DNSTYPE=NOCHANGE" >> $PPPOECONF
+
+ ### ###
+ ### Configuring the pppd ###
+ ### ###
+
+ ### Plugin Options
+ #
+ 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
+ #
+ if [ -n "${CONCENTRATORNAME}" ]; then
+ ACNAME="-C ${CONCENTRATORNAME}"
+ fi
+
+ ### Service Name
+ #
+ if [ -n "${SERVICENAME}" ]; then
+ if [ "${METHOD}" == "PPPOE_PLUGIN" ]; then
+ PLUGOPTS+=" rp_pppoe_service ${SERVICENAME}"
+ else
+ SERVICENAME="-S ${SERVICENAME}"
+ fi
+ fi
+
+ ### Authentication Types
+ #
if [ "${AUTH}" == "pap" ]; then
- PPPD_EXTRA+="-chap "
+ AUTH="-chap"
elif [ "${AUTH}" == "chap" ]; then
- PPPD_EXTRA+="-pap "
+ AUTH="-pap"
+ 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
-
- echo "FIREWALL=NONE" >> $PPPOECONF
+ ### 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
- echo "DEMAND=${SECONDS}" >> $PPPOECONF
+ DEMAND="demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
+ DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
fi
- else
- echo "DEMAND=no" >> $PPPOECONF
fi
- echo "LCP_INTERVAL=20" >> $PPPOECONF
- echo "LCP_FAILURE=3" >> $PPPOECONF
-
- echo "PIDFILE=/var/run/ppp-ipfire.pid" >> $PPPOECONF
+ 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 $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}"
- #ARGS+=" maxfail ${MAXRETRIES}"
+ ### Debugging
+ #
+ if [ "${DEBUG}" == "on" ]; then
+ DEBUG="debug"
+ else
+ DEBUG=""
+ fi
- [ "${METHOD}" != "PPPOE_PLUGIN" ] && [ "${DEBUG}" == "on" ] && export DEBUG=1
- /usr/sbin/pppoe-start
- evaluate_retval
+ ### PPPoE invocation
+ #
+ 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
+ /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
-
- for i in $( ls -v ${rc_base}/init.d/networking/red.up/* 2> /dev/null); do
- check_script_status
- OUT=$(echo $(basename ${i}) | awk -F- '{ print $2 }')
- case "$OUT" in
- S) ${i} start ;;
- K) ${i} stop ;;
- RS) ${i} restart ;;
- RL) ${i} reload ;;
- *) ${i} ;;
- esac
- done
;;
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
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 PPPoE interface on ${DEVICE}..."
-
- /usr/sbin/pppoe-stop
+ 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}
-
+ # 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}
- for i in $( ls -v ${rc_base}/init.d/networking/red.down/* 2> /dev/null); do
- check_script_status
- OUT=$(echo $(basename ${i}) | awk -F- '{ print $2 }')
- case "$OUT" in
- S) ${i} start ;;
- K) ${i} stop ;;
- RS) ${i} restart ;;
- RL) ${i} reload ;;
- *) ${i} ;;
- esac
- done
+ exit 0;
;;
-
esac
# End
projects / people / pmueller / ipfire-2.x.git / blobdiff