summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-06 12:51:12 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-06 12:51:12 +0000
commit499a89fad2a72b3064a713b73dd99d792c535a5f (patch)
tree1baba3e5a4e89ab44c2154556fca24a088311226
parente3bd6b245abb37a08f7fe7b20832b90bd7f09d52 (diff)
[package] base-files: replace udhcpc script with an improved version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15635 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script190
1 files changed, 116 insertions, 74 deletions
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 84c7297838..7dfb0f93e2 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -1,85 +1,127 @@
#!/bin/sh
[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
+
. /etc/functions.sh
include /lib/network
-
RESOLV_CONF="/tmp/resolv.conf.auto"
-hotplug_event() {
- scan_interfaces
- for ifc in $interfaces; do
- config_get ifname $ifc ifname
- [ "$ifname" = "$interface" ] || continue
-
- config_get proto $ifc proto
- [ "$proto" = "dhcp" ] || continue
- [ ifup = "$1" ] && {
- config_get userdns "$ifc" dns
- [ -n "$userdns" ] && {
- for i in $userdns; do
- echo "custom dns $i"
- echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
- done
- dns="$userdns"
- }
- uci_set_state network "$ifc" ipaddr "$ip"
- uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
- uci_set_state network "$ifc" dnsdomain "$domain"
- uci_set_state network "$ifc" dns "$dns"
- uci_set_state network "$ifc" gateway "$router"
- }
-
- env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
- done
+change_state () {
+ uci_revert_state "$1" "$2" "$3" "$4"
+ uci_set_state "$1" "$2" "$3" "$4"
}
-case "$1" in
- deconfig)
- ifconfig $interface 0.0.0.0
- hotplug_event ifdown
- ;;
- renew|bound)
- ifconfig $interface $ip \
- netmask ${subnet:-255.255.255.0} \
- broadcast ${broadcast:-+}
-
- [ -n "$router" ] && {
- for i in $router ; do
- echo "adding router $i"
- route add default gw $i dev $interface
- valid="$valid|$i"
-
- done
-
- echo "deleting old routes"
- $(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
- }
-
- [ -n "$dns" ] && \
- echo -n > "${RESOLV_CONF}.tmp"
+uci_get() {
+ uci -P /dev/null get "$1" 2>/dev/null
+}
+
+setup_interface () {
+ local old_ip
+ local old_broadcast
+ local old_subnet
+ local old_router
+ local old_dns
+ local user_dns
+ local user_router
+
+ config_get old_ip "$ifc" ipaddr
+ config_get old_broadcast "$ifc" broadcast
+ config_get old_subnet "$ifc" netmask
+
+ [ "$ip" != "$old_ip" ] \
+ || [ "${broadcast:-+}" != "$old_broadcast" ] \
+ || [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && {
+ echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"
+ ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}
+
+ change_state network "$ifc" ipaddr "$ip"
+ change_state network "$ifc" broadcast "${broadcast:-+}"
+ change_state network "$ifc" netmask "${subnet:-255.255.255.0}"
+ }
+
+
+ # 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 "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "$old_router" ] && {
+ echo "udhcpc: setting default routers: $router"
+
+ local valid_gw=""
+ for i in $router ; do
+ route add default gw $i dev $interface
+ valid_gw="${valid_gw:+$valid_gw|}$i"
+ done
- [ -n "$dns" ] && {
- [ -s "${RESOLV_CONF}.tmp" ] || {
- for i in $dns ; do
- echo "adding dns $i"
- echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
- done
- }
-
- ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
-
- mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
- }
-
- if [ "$1" = "renew" ]; then
- hotplug_event update
- else
- hotplug_event ifup
- fi
-
- # user rules
- [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
- ;;
-esac
+ eval $(route -n | awk '
+ /^0.0.0.0\W{9}('$valid_gw')\W/ {next}
+ /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}
+ ')
+
+ change_state network "$ifc" gateway "$router"
+ }
+
+
+ # DNS
+ config_get old_dns "$ifc" dns
+ user_dns=$(uci_get "network.$ifc.dns")
+ [ -n "$user_dns" ] && dns="$user_dns"
+
+ [ -n "$dns" ] && [ "$dns" != "$old_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"
+ }
+
+
+ # UCI State
+ change_state network "$ifc" lease_server "$serverid"
+ change_state network "$ifc" lease_acquired "$(date '+%s')"
+ change_state network "$ifc" lease_lifetime "$lease"
+ [ -n "$ntpsrv" ] && change_state network "$ifc" lease_ntpsrv "$ntpsrv"
+ [ -n "$timesvr" ] && change_state network "$ifc" lease_timesrv "$timesvr"
+ [ -n "$hostname" ] && change_state network "$ifc" lease_hostname "$hostname"
+ [ -n "$timezone" ] && change_state network "$ifc" lease_timezone "$timezone"
+
+
+ # Hotplug
+ env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
+}
+
+
+scan_interfaces
+
+for ifc in $interfaces; do
+ config_get ifname "$ifc" ifname
+ [ "$ifname" = "$interface" ] || continue
+
+ config_get proto "$ifc" proto
+ [ "$proto" = "dhcp" ] || continue
+
+ 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"
+ ;;
+ renew)
+ setup_interface update
+ ;;
+ bound)
+ setup_interface ifup
+ ;;
+ esac
+
+ # user rules
+ [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+done
exit 0