netifd: Add renew handler for proto dhcp

[openwrt/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 0481d05132133287928e3aeb8d6135c470782c46..2e58c19c44ec1af7b0270d459564d5f7d05046d3 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,24 +5,26 @@
 init_proto "$@"
 
 proto_dhcp_init_config() {
+       renew_handler=1
+
        proto_config_add_string 'ipaddr:ipaddr'
-       proto_config_add_string 'netmask:ipaddr'
        proto_config_add_string 'hostname:hostname'
        proto_config_add_string clientid
        proto_config_add_string vendorid
-       proto_config_add_boolean 'broadcast:ipaddr'
+       proto_config_add_boolean 'broadcast: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_dhcp_setup() {
        local config="$1"
        local iface="$2"
 
-       local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate
-       json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate
+       local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd
+       json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd
 
        local opt dhcpopts
        for opt in $reqopts; do
@@ -36,6 +38,8 @@ proto_dhcp_setup() {
        [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
        [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
        [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
+       [ -n "$iface6rd" ] && append dhcpopts "-O 212"
+       [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
        [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
 
        proto_export "INTERFACE=$config"
@@ -49,6 +53,13 @@ proto_dhcp_setup() {
                $clientid $broadcast $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() {
        local interface="$1"
        proto_kill_command "$interface"