proto-shell: use the new network.interface object

[project/netifd.git] / dummy / netifd-proto.sh

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index dba6cc4..17efd59 100755 (executable)
--- 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
@@ -141,6 +142,19 @@ proto_add_ipv6_route() {
        append PROTO_ROUTE6 "$target/$mask/$gw"
 }
 
+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() {
        local str="$1"
        local address mask broadcast ptp
@@ -209,7 +223,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 +236,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"