#
########################################################################
+
+
. /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}"
[ -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 "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}..."
### 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
#
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
## Create & Enable vnstat
/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
/etc/rc.d/init.d/connectd start
-
- elif [ "${TYPE}" == "PPTP" ]; then
- 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}
-
- boot_mesg "Bringing up the PPTP interface on $PPP_NIC ..."
- ip addr flush dev $PPP_NIC >/dev/null 2>&1
- ip addr add 10.0.0.140/24 broadcast 10.0.0.255 dev $PPP_NIC
-
- ### 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
-
- ### ###
- ### Configuring the pppd ###
- ### ###
-
- ### 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
- DEMAND="demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
- DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
- fi
- fi
-
- ### Standard PPP options we always use
- #
- PPP_STD_OPTIONS="$DNS defaultroute noipdefault noauth"
- PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
- PPP_STD_OPTIONS+=" user ${USERNAME} remotename ${USERNAME} lcp-echo-interval 10"
- PPP_STD_OPTIONS+=" lcp-echo-failure 10"
-
- ### Debugging
- #
- if [ "${DEBUG}" == "on" ]; then
- DEBUG="debug"
- else
- DEBUG=""
- fi
-
- PPTP_CMD="pptp 10.0.0.138 --nolaunchpppd"
-
- /usr/sbin/pppd pty "$PPTP_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC >/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
+ exit 0
fi
;;
echo_warning
fi
- if [ "$TYPE" == "PPPOE" ] || [ "$TYPE" == "PPTP" ]; 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 [ "$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
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
projects / people / pmueller / ipfire-2.x.git / blobdiff