X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=ae5a34672571bfb46aa161ace361571c301e8ba2;hb=68bb041b6ce4cde28186557262bee7b766c77b2d;hp=dba6cc4831671c88e243b6f2c16e3df25ac1dc72;hpb=91c0d4d5a67e95dc21cdb0fe7229ccb73d6975a7;p=project%2Fnetifd.git

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index dba6cc4..ae5a346 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -58,6 +58,7 @@ proto_init_update() {
 	PROTO_IP6ADDR=
 	PROTO_ROUTE=
 	PROTO_ROUTE6=
+	PROTO_PREFIX6=
 	PROTO_DNS=
 	PROTO_DNS_SEARCH=
 	json_init
@@ -121,8 +122,11 @@ proto_add_ipv4_address() {
 proto_add_ipv6_address() {
 	local address="$1"
 	local mask="$2"
+	local preferred="$3"
+	local valid="$4"
+	local offlink="$5"
 
-	append PROTO_IP6ADDR "$address/$mask"
+	append PROTO_IP6ADDR "$address/$mask/$preferred/$valid/$offlink"
 }
 
 proto_add_ipv4_route() {
@@ -130,15 +134,30 @@ proto_add_ipv4_route() {
 	local mask="$2"
 	local gw="$3"
 
-	append PROTO_ROUTE "$target/$mask/$gw"
+	append PROTO_ROUTE "$target/$mask/$gw//"
 }
 
 proto_add_ipv6_route() {
 	local target="$1"
 	local mask="$2"
 	local gw="$3"
+	local metric="$4"
+	local valid="$5"
 
-	append PROTO_ROUTE6 "$target/$mask/$gw"
+	append PROTO_ROUTE6 "$target/$mask/$gw/$metric/$valid"
+}
+
+proto_add_ipv6_prefix() {
+	local prefix="$1"
+	local valid="$2"
+	local preferred="$3"
+
+	if [ -z "$valid" ]; then
+		append PROTO_PREFIX6 "$prefix"
+	else
+		[ -z "$preferred" ] && preferred="$valid"
+		append PROTO_PREFIX6 "$prefix,$valid,$preferred"
+	fi
 }
 
 _proto_push_ipv4_addr() {
@@ -163,15 +182,24 @@ _proto_push_ipv4_addr() {
 
 _proto_push_ipv6_addr() {
 	local str="$1"
-	local address mask
+	local address mask preferred valid offlink
 
 	address="${str%%/*}"
 	str="${str#*/}"
-	mask="$str"
+	mask="${str%%/*}"
+	str="${str#*/}"
+	preferred="${str%%/*}"
+	str="${str#*/}"
+	valid="${str%%/*}"
+	str="${str#*/}"
+	offlink="${str%%/*}"
 
 	json_add_object ""
 	json_add_string ipaddr "$address"
 	[ -n "$mask" ] && json_add_string mask "$mask"
+	[ -n "$preferred" ] && json_add_int preferred "$preferred"
+	[ -n "$valid" ] && json_add_int valid "$valid"
+	[ -n "$offlink" ] && json_add_boolean offlink "$offlink"
 	json_close_object
 }
 
@@ -184,12 +212,19 @@ _proto_push_route() {
 	local target="${str%%/*}"
 	str="${str#*/}"
 	local mask="${str%%/*}"
-	local gw="${str#*/}"
+	str="${str#*/}"
+	local gw="${str%%/*}"
+	str="${str#*/}"
+	local metric="${str%%/*}"
+	str="${str#*/}"
+	local valid="${str%%/*}"
 
 	json_add_object ""
 	json_add_string target "$target"
 	json_add_string netmask "$mask"
 	[ -n "$gw" ] && json_add_string gateway "$gw"
+	[ -n "$metric" ] && json_add_int metric "$metric"
+	[ -n "$valid" ] && json_add_int valid "$valid"
 	json_close_object
 }
 
@@ -209,7 +244,8 @@ _proto_push_array() {
 _proto_notify() {
 	local interface="$1"
 	local options="$2"
-	ubus $options call network.interface."$interface" notify_proto "$(json_dump)"
+	json_add_string "interface" "$interface"
+	ubus $options call network.interface notify_proto "$(json_dump)"
 }
 
 proto_send_update() {
@@ -221,6 +257,7 @@ proto_send_update() {
 	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ipv6_addr
 	_proto_push_array "routes" "$PROTO_ROUTE" _proto_push_route
 	_proto_push_array "routes6" "$PROTO_ROUTE6" _proto_push_route
+	_proto_push_array "ip6prefix" "$PROTO_PREFIX6" _proto_push_string
 	_proto_push_array "dns" "$PROTO_DNS" _proto_push_string
 	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_string
 	_proto_notify "$interface"