RESOLV_CONF="/tmp/resolv.conf.auto"
change_state () {
+ [ -n "$ifc" ] || return
uci_revert_state "$1" "$2" "$3" "$4"
uci_set_state "$1" "$2" "$3" "$4"
}
-uci_get() {
- uci -P /dev/null get "$1" 2>/dev/null
-}
-
setup_interface () {
local old_ip
local old_broadcast
local user_dns
local user_router
- config_get old_ip "$ifc" ipaddr
- config_get old_broadcast "$ifc" broadcast
- config_get old_subnet "$ifc" netmask
+ [ -n "$ifc" ] && {
+ config_get old_ip "$ifc" ipaddr
+ config_get old_broadcast "$ifc" broadcast
+ config_get old_subnet "$ifc" netmask
+ }
[ "$ip" != "$old_ip" ] \
|| [ "${broadcast:-+}" != "$old_broadcast" ] \
# Default Route
- change_state network "$ifc" lease_gateway "$router"
- config_get old_router "$ifc" gateway
- user_router=$(uci_get "network.$ifc.gateway")
- [ -n "$user_router" ] && router="$user_router"
+ [ -n "$ifc" ] && {
+ change_state network "$ifc" lease_gateway "$router"
+ config_get old_router "$ifc" gateway
+ user_router=$(uci_get "network.$ifc.gateway")
+ [ -n "$user_router" ] && router="$user_router"
+ }
- [ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "$old_router" ] && {
+ [ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "255.255.255.255" ] && [ "$router" != "$old_router" ] && {
echo "udhcpc: setting default routers: $router"
local valid_gw=""
change_state network "$ifc" gateway "$router"
}
+ # CIDR STATIC ROUTES (rfc3442)
+ [ -n "$cidrroute" ] && {
+ # This defines how many CIDR Routes can be assigned so that we do not enter
+ # an endless loop on malformed data
+ MAXCIDRROUTES=24;
+ while [ ${MAXCIDRROUTES} -gt "0" ]; do
+ # Format is
+ # $MASK $NW $GW
+ # $NW == AAA.BBB.CCC.DDD
+ # $GW == EEE.FFF.CCC.DDD
+ # $MASK AAA.[BBB].[CCC].[DDD] EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8 9
+ MASK=$(echo $cidrroute | awk '{ print $1 }')
+ if [ ${MASK} = "0" ] ; then
+ # $MASK EEE.FFF.GGG.HHH
+ # 1 2 3 5 6
+ NW="0"
+ GW=$(echo $cidrroute | awk '{ print $2"."$3"."$4"."$5 }' )
+ elif [ ${MASK} -le "8" ] ; then
+ # $MASK AAA EEE.FFF.GGG.HHH
+ # 1 2 3 5 6 7
+ NW=$(echo $cidrroute | awk '{ print $2 }' )
+ GW=$(echo $cidrroute | awk '{ print $3"."$4"."$5"."$6 }' )
+ elif [ ${MASK} -le "16" ] ; then
+ # $MASK AAA.BBB EEE.FFF.GGG.HHH
+ # 1 2 3 5 6 7 8
+ NW=$(echo $cidrroute | awk '{ print $2"."$3 }' )
+ GW=$(echo $cidrroute | awk '{ print $4"."$5"."$6"."$7 }' )
+ elif [ ${MASK} -le "24" ] ; then
+ # $MASK AAA.BBB.CCC EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8
+ NW=$(echo $cidrroute | awk '{ print $2"."$3"."$4 }' )
+ GW=$(echo $cidrroute | awk '{ print $5"."$6"."$7"."$8 }' )
+
+ else
+ # $MASK AAA.BBB.CCC.DDD EEE.FFF.GGG.HHH
+ # 1 2 3 4 5 6 7 8 9
+ NW=$(echo $cidrroute | awk '{ print $2"."$3"."$4"."$5 }' )
+ GW=$(echo $cidrroute | awk '{ print $6"."$7"."$8"."$9 }' )
+ fi
+ echo [$ROUTECOUNTER] Route Network: $NW/$MASK Gateway: $GW on $interface
+
+ # TODO: Check for malformed data here to eliminate counter workaround
+ # Malformed data is: ... or xxx... or xxx.yyy.. or xxx.yyy.zzz.
+
+ [ -n "$NW" ] && [ -n "$GW" ] && {
+ route add $NW gw $GW dev $interface
+ }
+
+ # Clear the strings incase they don't get set next time around
+ if [ ${NW} = "0" ]; then
+ NW=""
+ fi
+ TMP="$MASK $NW $GW "
+ NW=""
+ GW=""
+
+ # Remove the '.' so that we can delete them from the input with sed
+ TMP=$(echo $TMP | sed "s/\./ /g")
+
+ # Remove the previous entry from cidrroute
+ cidrroute=$(echo $cidrroute | sed "s/$TMP//g")
+
+ # Add to counter
+ let ROUTECOUNTER=$ROUTECOUNTER+1;
+ let MAXCIDRROUTES=$MAXCIDRROUTES-1;
+
+ # Leave the loop if cidrroutes is empty (we've parsed everything)
+ [ ! -n "$cidrroute" ] && break
+
+ done
+
+ echo "done."
+ }
# DNS
- config_get old_dns "$ifc" dns
+ old_dns=$(uci_get_state network "$ifc" dns)
+ old_domain=$(uci_get_state network "$ifc" dnsdomain)
user_dns=$(uci_get "network.$ifc.dns")
[ -n "$user_dns" ] && dns="$user_dns"
- [ -n "$dns" ] && [ "$dns" != "$old_dns" ] && {
+ [ -n "$dns" ] && [ "$dns" != "$old_dns" -o -n "$user_dns" ] && {
echo "udhcpc: setting dns servers: $dns"
- echo -n > "${RESOLV_CONF}.tmp"
- for i in $dns ; do
- echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
- done
- ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
- mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
-
- change_state network "$ifc" dnsdomain "$domain"
- change_state network "$ifc" dns "$dns"
+ add_dns "$ifc" $dns
+
+ [ -n "$domain" ] && [ "$domain" != "$old_domain" ] && {
+ echo "udhcpc: setting dns domain: $domain"
+ sed -i -e "${old_domain:+/^search $old_domain$/d; }/^search $domain$/d" "${RESOLV_CONF}"
+ echo "search $domain" >> "${RESOLV_CONF}"
+ change_state network "$ifc" dnsdomain "$domain"
+ }
}
+ [ -n "$ifc" ] || return
# UCI State
change_state network "$ifc" lease_server "$serverid"
scan_interfaces
-
-for ifc in $interfaces; do
- config_get ifname "$ifc" ifname
- [ "$ifname" = "$interface" ] || continue
-
- config_get proto "$ifc" proto
- [ "$proto" = "dhcp" ] || continue
+applied=
+for ifc in $interfaces __default; do
+ if [ "$ifc" = __default ]; then
+ ifc=""
+ [ -n "$applied" ] && continue
+ else
+ config_get ifname "$ifc" ifname
+ [ "$ifname" = "$interface" ] || continue
+
+ config_get proto "$ifc" proto
+ [ "$proto" = "dhcp" ] || continue
+ applied=true
+ fi
case "$1" in
deconfig)
ifconfig "$interface" 0.0.0.0
- env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
- uci_revert_state network "$ifc"
+ [ -n "$ifc" ] && {
+ env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
+
+ config_get device "$ifc" device
+ config_get ifname "$ifc" ifname
+ config_get aliases "$ifc" aliases
+ uci_revert_state network "$ifc"
+ [ -n "$device" ] && uci_set_state network "$ifc" device "$device"
+ [ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
+ [ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
+ }
;;
renew)
setup_interface update
setup_interface ifup
;;
esac
-
- # user rules
- [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
done
+# user rules
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+
exit 0
projects / openwrt.git / blobdiff