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 -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
else
echo ""
elif [ "$TYPE" == "PPPOE" ]; then
if ( ps ax | grep -q [p]ppd ); then
- echo Error! A pppd is still running. Stop it first.
- echo
- exit 1;
+ 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
if [ "$TYPE" == "pppoeatm" ]; then
PPP_NIC=nas0
- boot_mesg "Create ATM-Bridge as $PPP_NIC ..."
+ 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"
fi
if [ "$TYPE" == "pppoe" ]; 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 ..."
- ip addr add 1.1.1.1/24 broadcast 1.1.1.255 dev $PPP_NIC
+ ip addr flush dev $PPP_NIC >/dev/null 2>&1
+ ip link set ${PPP_NIC} up
else
boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
fi
+
### ###
### Configuring the pppd ###
### ###
DNS=""
echo nameserver=$DNS1 > /etc/ppp/resolv.conf
echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-
fi
### Dial On 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
+ 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 &
fi
;;
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
+
+ if [ "$TYPE" == "PPPOE" ] || [ "$TYPE" == "PPTP" ]; 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
- killall -w -s TERM br2684ctl >/dev/null 2>&1
- ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}
-
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 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 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