. ${rc_functions}
#Define some defaults
-RED_VDSL_INET_VLAN=7
-RED_VDSL_IPTV_VLAN=8
-RED_VDSL_IPTV_DISABLE=0
+INET_VLAN=7
+IPTV_VLAN=8
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
if [ "$RRDLOG" == "" ]; then
eval $(/usr/local/bin/readhash /var/ipfire/mac/settings)
MAC=$(tr - : <<<$MAC)
+MAC1=$(tr - : <<<$MAC1)
MAC2=$(tr - : <<<$MAC2)
TYPE="${RED_TYPE}"
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 "
+DHCP_START=" "
+DHCP_STOP="-k "
case "${1}" in
start)
if [ -e $LEASEINFO ]; then
boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
. $LEASEINFO
- if [ "$LEASETIME" = "4294967295" ]; then
+ if [ "$dhcp_lease_time" = "4294967295" ]; then
# do nothing, just echo ok
echo ""
echo_ok
fi
fi
- boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
+ boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
echo -n "${DEVICE}" > /var/ipfire/red/iface
## Create & Enable vnstat
echo_ok
boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
boot_mesg_flush
- boot_mesg " IP Address: $IPADDR"
+ boot_mesg " IP Address: $ip_address"
boot_mesg_flush
if [ -n "${RED_DHCP_HOSTNAME}" ]; then
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
boot_mesg_flush
fi
- boot_mesg " Subnet Mask: $NETMASK"
+ boot_mesg " Subnet Mask: $subnet_mask"
boot_mesg_flush
- boot_mesg " Default Gateway: $GATEWAY"
+ boot_mesg " Default Gateway: $routers"
boot_mesg_flush
- boot_mesg " DNS Server: $DNS"
+ boot_mesg " DNS Server: $domain_name_servers"
boot_mesg_flush
- 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")
fi
elif [ "$TYPE" == "PPPOE" ]; then
-
+
if ( ps ax | grep -q [p]ppd ); then
boot_mesg "pppd is still running." ${FAILURE}
echo_failure
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
[ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
-
- PPP_NIC=${DEVICE}
-
- 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"
- DHCP_START="-N -R -L /var/ipfire/dhcpc "
- DHCP_STOP="-k "
- # 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}
- if [ -n "$MAC2" ]; then
- boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"
- ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
- evaluate_retval
- fi
- 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="$?"
+ # We force the plugin method, anyway.
+ METHOD="PPPOE_PLUGIN"
- 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
+ PPP_NIC=${DEVICE}
- else
- echo ""
- $(exit "$RET")
- evaluate_retval
- fi
- fi
- fi
- fi
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
PPP_NIC=nas0
+ DEVICE=nas0
boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
sleep 1
TYPE="pptp"
fi
fi
+
+ if [ "$TYPE" == "vdsl" ]; then
+ boot_mesg "Createing VLAN Interface ${DEVICE}.${INET_VLAN} ..."
+ modprobe 8021q
+ vconfig add ${DEVICE} ${INET_VLAN}
+ if [ -n "$MAC1" ]; then
+ boot_mesg "Setting mac address on ${DEVICE}.${INET_VLAN} to ${MAC1}"
+ ip link set dev ${DEVICE}.${INET_VLAN} address ${MAC1}
+ evaluate_retval
+ fi
+ PPP_NIC=${DEVICE}.${INET_VLAN}
+ sleep 0.2
+ ip link set ${PPP_NIC} up
+ TYPE="pppoe"
+ fi
+ if [ "${IPTV}" == "enable" ]; then
+ PIDFILE="/var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid"
+ LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${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}.${IPTV_VLAN}.pid > /dev/null
+ fi
+ fi
+
+ if [ ! -f "$PIDFILE" ]; then
+ boot_mesg "Createing VLAN Interface ${DEVICE}.${IPTV_VLAN} ..."
+ modprobe 8021q
+ vconfig add ${DEVICE} ${IPTV_VLAN}
+ if [ -n "$MAC2" ]; then
+ boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}"
+ ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2}
+ evaluate_retval
+ fi
+ boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${IPTV_VLAN} interface..."
+ /sbin/dhcpcd ${DEVICE}.${IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
+ RET="$?"
+
+ if [ "$RET" = "0" ]; then
+ . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info
+ echo ""
+ echo_ok
+ boot_mesg " DHCP Assigned Settings for ${DEVICE}.${IPTV_VLAN}:"
+ boot_mesg_flush
+ boot_mesg " IP Address: $ip_address"
+ boot_mesg_flush
+ boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
+ boot_mesg_flush
+ boot_mesg " Subnet Mask: $subnet_mask"
+ boot_mesg_flush
+ boot_mesg " Default Gateway: $routers"
+ boot_mesg_flush
+ boot_mesg " DNS Server: $domain_name_servers"
+ boot_mesg_flush
+
+ else
+ echo ""
+ $(exit "$RET")
+ evaluate_retval
+ fi
+ fi
+ fi
if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then
if [ "$PPP_NIC" == "" ]; then
boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
ip addr flush dev $PPP_NIC >/dev/null 2>&1
if [ "$TYPE" == "pptp" ]; then
if [ "$PPTP_NICCFG" == "dhcp" ]; then
- DHCP_START="-N -R -L /var/ipfire/dhcpc "
- DHCP_STOP="-k "
-
# 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
+ rm -f /var/run/dhcpcd-${DEVICE}.pid > /dev/null
fi
fi
if [ ! -f "$PIDFILE" ]; then
boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
- /sbin/dhcpcd ${DEVICE} -G ${DHCP_START} >/dev/null 2>&1
+ /sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1
RET="$?"
if [ "$RET" = "0" ]; then
echo_ok
boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
boot_mesg_flush
- boot_mesg " IP Address: $IPADDR"
+ boot_mesg " IP Address: $ip_address"
boot_mesg_flush
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
boot_mesg_flush
- boot_mesg " Subnet Mask: $NETMASK"
+ boot_mesg " Subnet Mask: $subnet_mask"
boot_mesg_flush
- boot_mesg " Default Gateway: $GATEWAY"
+ boot_mesg " Default Gateway: $routers"
boot_mesg_flush
- boot_mesg " DNS Server: $DNS"
+ boot_mesg " DNS Server: $domain_name_servers"
boot_mesg_flush
-
+ /sbin/route add $PPTP_PEER gw $routers $PPP_NIC
else
echo ""
$(exit "$RET")
#
if [ "$TYPE" == "pppoe" ]; then
[ "${METHOD}" == "PPPOE_PLUGIN" ] && \
- PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+ PLUGOPTS="plugin rp-pppoe.so"
fi
### Synchronous Mode
#
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+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
PPP_STD_OPTIONS+=" lcp-echo-failure 3 ${AUTH}"
if [ -e $LEASEINFO ]; then
boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
. $LEASEINFO
- if [ "$LEASETIME" = "4294967295" ]; then
+ if [ "$dchp_lease_time" = "4294967295" ]; then
# do nothing, just echo ok
echo ""
echo_ok
fi
if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
- link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null`
+ link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null`
if [ -n "${link_status}" ]; then
if echo "${link_status}" | grep -q UP; then
- 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}
+ boot_mesg "Bringing down the ${DEVICE}.${INET_VLAN} interface..."
+ ip link set ${DEVICE}.${INET_VLAN} down
+ vconfig rem ${DEVICE}.${INET_VLAN}
evaluate_retval
fi
else
projects / people / pmueller / ipfire-2.x.git / blobdiff