netifd: Add configurable DHCP release behavior

[openwrt.git] / package / network / config / netifd / files / lib / netifd / proto / dhcp.sh

diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 0117b27..7f4af25 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -5,23 +5,30 @@
 init_proto "$@"
 
 proto_dhcp_init_config() {
-       proto_config_add_string "ipaddr"
-       proto_config_add_string "netmask"
-       proto_config_add_string "hostname"
-       proto_config_add_string "clientid"
-       proto_config_add_string "vendorid"
-       proto_config_add_boolean "broadcast"
-       proto_config_add_string "reqopts"
-       proto_config_add_string "iface6rd"
-       proto_config_add_string "sendopts"
+       renew_handler=1
+
+       proto_config_add_string 'ipaddr:ipaddr'
+       proto_config_add_string 'hostname:hostname'
+       proto_config_add_string clientid
+       proto_config_add_string vendorid
+       proto_config_add_boolean 'broadcast:bool'
+       proto_config_add_boolean 'release:bool'
+       proto_config_add_string 'reqopts:list(string)'
+       proto_config_add_string iface6rd
+       proto_config_add_string sendopts
+       proto_config_add_boolean delegate
+       proto_config_add_string zone6rd
+       proto_config_add_string zone
+       proto_config_add_string mtu6rd
+       proto_config_add_string customroutes
 }
 
 proto_dhcp_setup() {
        local config="$1"
        local iface="$2"
 
-       local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts
-       json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts
+       local ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
+       json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
 
        local opt dhcpopts
        for opt in $reqopts; do
@@ -33,18 +40,32 @@ proto_dhcp_setup() {
        done
 
        [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
+       [ "$release" = 1 ] && release="-R" || release=
        [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
        [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
+       [ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
+       [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
+       [ -n "$zone" ] && proto_export "ZONE=$zone"
+       [ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd"
+       [ -n "$customroutes" ] && proto_export "CUSTOMROUTES=$customroutes"
+       [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" udhcpc \
                -p /var/run/udhcpc-$iface.pid \
                -s /lib/netifd/dhcp.script \
-               -f -t 0 -i "$iface" \
+               -f -R -t 0 -i "$iface" \
                ${ipaddr:+-r $ipaddr} \
                ${hostname:+-H $hostname} \
                ${vendorid:+-V $vendorid} \
-               $clientid $broadcast $dhcpopts
+               $clientid $broadcast $release $dhcpopts
+}
+
+proto_dhcp_renew() {
+       local interface="$1"
+       # SIGUSR1 forces udhcpc to renew its lease
+       local sigusr1="$(kill -l SIGUSR1)"
+       [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
 }
 
 proto_dhcp_teardown() {
@@ -53,4 +74,3 @@ proto_dhcp_teardown() {
 }
 
 add_protocol dhcp
-