include route/address flags in vlist comparison

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

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index b04bc89..f1ddd1a 100755 (executable)
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -44,6 +44,7 @@ proto_init_update() {
        local external="$3"
 
        PROTO_INIT=1
+       PROTO_TUNNEL_OPEN=
        PROTO_IPADDR=
        PROTO_IP6ADDR=
        PROTO_ROUTE=
@@ -57,6 +58,32 @@ proto_init_update() {
        [ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
+proto_close_nested() {
+       [ -n "$PROTO_NESTED_OPEN" ] && json_close_object
+       PROTO_NESTED_OPEN=
+}
+
+proto_add_nested() {
+       PROTO_NESTED_OPEN=1
+       json_add_object "$1"
+}
+
+proto_add_tunnel() {
+       proto_add_nested "tunnel"
+}
+
+proto_close_tunnel() {
+       proto_close_nested
+}
+
+proto_add_data() {
+       proto_add_nested "data"
+}
+
+proto_close_data() {
+       proto_close_nested
+}
+
 proto_add_dns_server() {
        local address="$1"
 
@@ -113,7 +140,7 @@ _proto_push_route() {
        json_add_object ""
        json_add_string target "$target"
        json_add_string netmask "$mask"
-       json_add_string gateway "$gw"
+       [ -n "$gw" ] && json_add_string gateway "$gw"
        json_close_object
 }
 
@@ -138,6 +165,7 @@ _proto_notify() {
 proto_send_update() {
        local interface="$1"
 
+       proto_close_nested
        _proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
        _proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
        _proto_push_array "routes" "$PROTO_ROUTE" _proto_push_route