hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-files: replace udhcpc script with an improved version

Browse Source 
SVN-Revision: 15635
master
Jo-Philipp Wich 16 years ago
parent 4cdb76c219
commit ca609a2431
1 changed files with 116 additions and 74 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 152
      package/base-files/files/usr/share/udhcpc/default.script

152
package/base-files/files/usr/share/udhcpc/default.script
Unescape View File

@ -1,85 +1,127 @@
#!/bin/sh #!/bin/sh
[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1 [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
. /etc/functions.sh . /etc/functions.sh
include /lib/network include /lib/network
RESOLV_CONF="/tmp/resolv.conf.auto" RESOLV_CONF="/tmp/resolv.conf.auto"
hotplug_event() { change_state () {
scan_interfaces uci_revert_state "$1" "$2" "$3" "$4"
for ifc in $interfaces; do uci_set_state "$1" "$2" "$3" "$4"
config_get ifname $ifc ifname }
[ "$ifname" = "$interface" ] || continue
config_get proto $ifc proto uci_get() {
[ "$proto" = "dhcp" ] || continue uci -P /dev/null get "$1" 2>/dev/null
[ ifup = "$1" ] && { }
config_get userdns "$ifc" dns
[ -n "$userdns" ] && { setup_interface () {
for i in $userdns; do local old_ip
echo "custom dns $i" local old_broadcast
echo "nameserver $i" >> "${RESOLV_CONF}.tmp" local old_subnet
done local old_router
dns="$userdns" local old_dns
} local user_dns
uci_set_state network "$ifc" ipaddr "$ip" local user_router
uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
uci_set_state network "$ifc" dnsdomain "$domain" config_get old_ip "$ifc" ipaddr
uci_set_state network "$ifc" dns "$dns" config_get old_broadcast "$ifc" broadcast
uci_set_state network "$ifc" gateway "$router" 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}"
} }
env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
done
}
case "$1" in # Default Route
deconfig) change_state network "$ifc" lease_gateway "$router"
ifconfig $interface 0.0.0.0 config_get old_router "$ifc" gateway
hotplug_event ifdown user_router=$(uci_get "network.$ifc.gateway")
;; [ -n "$user_router" ] && router="$user_router"
renew|bound)
ifconfig $interface $ip \
netmask ${subnet:-255.255.255.0} \
broadcast ${broadcast:-+}
[ -n "$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 for i in $router ; do
echo "adding router $i"
route add default gw $i dev $interface route add default gw $i dev $interface
valid="$valid|$i" valid_gw="${valid_gw:+$valid_gw|}$i"
done done
echo "deleting old routes" eval $(route -n | awk '
$(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}') /^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"
} }
[ -n "$dns" ] && \
echo -n > "${RESOLV_CONF}.tmp"
[ -n "$dns" ] && { # DNS
[ -s "${RESOLV_CONF}.tmp" ] || { 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 for i in $dns ; do
echo "adding dns $i"
echo "nameserver $i" >> "${RESOLV_CONF}.tmp" echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
done done
}
${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp" ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF" mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
change_state network "$ifc" dnsdomain "$domain"
change_state network "$ifc" dns "$dns"
} }
if [ "$1" = "renew" ]; then
hotplug_event update # UCI State
else change_state network "$ifc" lease_server "$serverid"
hotplug_event ifup change_state network "$ifc" lease_acquired "$(date '+%s')"
fi 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 # user rules
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
;; done
esac
exit 0 exit 0

Write Preview
Loading…
Cancel
Save