X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Fconfig%2Fnetifd%2Ffiles%2Flib%2Fnetifd%2Fdhcp.script;h=5b77f306f762fe7ff4e8979638f9dafd3d4ec531;hb=4bc459a8452c309ba6eeb5df7e8f441bb52df793;hp=593fb93e1ddfa3589b241e5cd3c2739f291fc007;hpb=4e1e129f0309c1764df94193c156aa1517ff3995;p=openwrt.git

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 593fb93e1d..5b77f306f7 100755
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -6,9 +6,8 @@
 
 set_classless_routes() {
 	local max=128
-	local type
 	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
-		proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2"
+		proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2" "$ip"
 		max=$(($max-1))
 		shift 2
 	done
@@ -20,7 +19,12 @@ setup_interface () {
 	# TODO: apply $broadcast
 
 	for i in $router; do
-		proto_add_ipv4_route 0.0.0.0 0 "$i"
+		proto_add_ipv4_route "$i" 32 "" "$ip"
+		proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
+
+		for r in $CUSTOMROUTES; do
+			proto_add_ipv4_route "${r%%/*}" "${r##*/}" "$i" "$ip"
+		done
 	done
 
 	# CIDR STATIC ROUTES (rfc3442)
@@ -35,7 +39,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"
@@ -51,7 +61,7 @@ setup_interface () {
 		local ip6rdbr="${ip6rd%% *}"
 
 		[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
-		[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd
+		[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6
 
 		json_init
 		json_add_string name "$IFACE6RD"
@@ -65,16 +75,11 @@ setup_interface () {
 		[ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE"
 		[ -n "$ZONE6RD" ] || ZONE6RD=$ZONE
 		[ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD"
+		[ -n "$MTU6RD" ] && json_add_string mtu "$MTU6RD"
 		json_close_object
 
 		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() {