netifd: store additional DHCP lease information

Extend the DHCPv4 handler script to store additional information from the
DHCP lease in the per-interface data object.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 44092

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 54d3aa10720ce45d488da4639be9ef215784bea1..288ab18d0070bc721c5399b1200da096d122191e 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -34,7 +34,13 @@ setup_interface () {
        done
 
        proto_add_data
-       [ -n "$ZONE" ] && json_add_string zone "$ZONE"
+       [ -n "$ZONE" ]     && json_add_string zone "$ZONE"
+       [ -n "$ntpsrv" ]   && json_add_string ntpserver "$ntpsrv"
+       [ -n "$timesvr" ]  && json_add_string timeserver "$timesvr"
+       [ -n "$hostname" ] && json_add_string hostname "$hostname"
+       [ -n "$message" ]  && json_add_string message "$message"
+       [ -n "$timezone" ] && json_add_int timezone "$timezone"
+       [ -n "$lease" ]    && json_add_int leasetime "$lease"
        proto_close_data
 
        proto_send_update "$INTERFACE"
@@ -69,12 +75,6 @@ setup_interface () {
 
                ubus call network add_dynamic "$(json_dump)"
        fi
-
-       # TODO
-       # [ -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"
 }
 
 deconfig_interface() {