X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=f1ddd1a57d158887487c306f50b493ccc616d680;hp=7482a83b6552cdd30b0b736276885b7e59b584a5;hb=0f738b8f6c5d89ad5130c74a8dcb9a1df9a190bc;hpb=15bf3d441fd429f2b6ff18cc0c351ac8d3dd655f

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 7482a83..f1ddd1a 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -58,17 +58,30 @@ proto_init_update() {
 	[ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
-proto_add_tunnel() {
-	proto_close_tunnel
+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_TUNNEL_OPEN=1
-	json_add_object "tunnel"
+proto_add_tunnel() {
+	proto_add_nested "tunnel"
 }
 
 proto_close_tunnel() {
-	[ -n "$PROTO_TUNNEL_OPEN" ] || return
-	json_close_object
-	PROTO_TUNNEL_OPEN=
+	proto_close_nested
+}
+
+proto_add_data() {
+	proto_add_nested "data"
+}
+
+proto_close_data() {
+	proto_close_nested
 }
 
 proto_add_dns_server() {
@@ -152,7 +165,7 @@ _proto_notify() {
 proto_send_update() {
 	local interface="$1"
 
-	proto_close_tunnel
+	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