echo -n "${GATEWAY}" > /var/ipfire/red/remote-ipaddress
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/
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}
+ [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
- PPPOECONF=/etc/ppp/pppoe.conf
- echo > $PPPOECONF #clear
-
- if [ "${METHOD}" != "PPPOE_PLUGIN" ]; then
- echo "LINUX_PLUGIN=" >> $PPPOECONF
+ if [ "$TYPE" == "pppoe" ]; then
+ boot_mesg "Bringing up the PPPoE interface on ${DEVICE}..."
+ ip addr add 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
else
- echo "LINUX_PLUGIN=/usr/lib/pppd/2.4.4/rp-pppoe.so" >> $PPPOECONF
+ boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
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
+
+ ### ###
+ ### Configuring the pppd ###
+ ### ###
+
+ ### Plugin Options
+ #
+ [ "${METHOD}" == "PPPOE_PLUGIN" ] && \
+ PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so nic-${DEVICE}"
- if [ -n ${SERVICENAME} ]; then
- echo "SERVICENAME=${SERVICENAME}" >> $PPPOECONF
- fi
- if [ -n ${CONCENTRATORNAME} ]; then
- echo "ACNAME=${CONCENTRATORNAME}" >> $PPPOECONF
+ ### Synchronous Mode
+ #
+ #PPPOE_SYNC=-s
+ #PPPD_SYNC=sync
+
+ ### Access Concentrator Name
+ #
+ if [ -n "${CONCENTRATORNAME}" ]; then
+ ACNAME="-C ${CONCENTRATORNAME}"
fi
-
- if [ "${DNS}" == "Automatic" ]; then
- echo "PEERDNS=yes" >> $PPPOECONF
- echo "DNSTYPE=NOCHANGE" >> $PPPOECONF
+
+ ### 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
-
- 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 connect true noipdefault ktune"
fi
+ fi
+
+ ### When using pppoe-plugin the device has to be the last option
+ #
+ [ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" ${DEVICE}"
+
+ if [ "$TYPE" == "modem" ]; then
+ PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer"
+ elif [ "$TYPE" == "serial" ]; then
+ PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /bin/true"
+ fi
+
+ ### Standard PPP options we always use
+ #
+ PPP_STD_OPTIONS="$PLUGOPTS usepeerdns 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}"
+ [ "${TYPE}" eq "pppoe" ] || PPP_STD_OPTIONS+=" lock modem crtscts user ${USERNAME}"
+
+ ### Debugging
+ #
+ if [ "${DEBUG}" == "on" ]; then
+ DEBUG="debug"
else
- echo "DEMAND=no" >> $PPPOECONF
+ DEBUG=""
fi
- echo "LCP_INTERVAL=20" >> $PPPOECONF
- echo "LCP_FAILURE=3" >> $PPPOECONF
-
- echo "PIDFILE=/var/run/ppp-ipfire.pid" >> $PPPOECONF
-
- #ARGS+=" maxfail ${MAXRETRIES}"
+ ### PPPoE invocation
+ #
+ if [ "${TYPE}" == "pppoe" ]; then
+ PPPOE_CMD="/usr/sbin/pppoe -p /var/run/ppp-ipfire.pid.pppoe -I ${DEVICE}"
+ PPPOE_CMD+=" -T 80 -U $PPPOE_SYNC $ACNAME $SERVICENAMEOPT"
+ fi
- [ "${METHOD}" != "PPPOE_PLUGIN" ] && [ "${DEBUG}" == "on" ] && export DEBUG=1
- /usr/sbin/pppoe-start
- evaluate_retval
+ ### Run everything
+ #
+ if [ "${METHOD}" == "PPPOE_PLUGIN" ]; then
+ /usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND >/dev/null 2>&1 &
+ evaluate_retval
+ else
+ /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC >/dev/null 2>&1 &
+ evaluate_retval
+ fi
+
+ /etc/rc.d/init.d/connectd start
+
fi
;;
elif [ "$TYPE" == "PPPOE" ]; then
boot_mesg "Bringing down the PPPoE interface on ${DEVICE}..."
-
- /usr/sbin/pppoe-stop
+ rm -f /var/ipfire/red/keepconnected
+ kill -TERM /usr/sbin/pppd 2>/dev/null
evaluate_retval
+ sleep 5
+
ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
fi
projects / people / pmueller / ipfire-2.x.git / blobdiff