X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=7482a83b6552cdd30b0b736276885b7e59b584a5;hb=f4c907480f85faa88dbf19270bb8f02d7b15d6f1;hp=e7f0d9ece73fb8a454622ffabc446e07eb0e4793;hpb=3c1a5bf324c8f2476239c4e49687ca252d3bf4c8;p=project%2Fnetifd.git

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index e7f0d9e..7482a83 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -28,14 +28,14 @@ add_default_handler() {
 
 _proto_do_teardown() {
 	json_load "$data"
-	eval "$1_teardown \"$interface\" \"$ifname\""
+	eval "proto_$1_teardown \"$interface\" \"$ifname\""
 }
 
 _proto_do_setup() {
 	json_load "$data"
 	_EXPORT_VAR=0
 	_EXPORT_VARS=
-	eval "$1_setup \"$interface\" \"$ifname\""
+	eval "proto_$1_setup \"$interface\" \"$ifname\""
 }
 
 proto_init_update() {
@@ -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,19 @@ proto_init_update() {
 	[ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
+proto_add_tunnel() {
+	proto_close_tunnel
+
+	PROTO_TUNNEL_OPEN=1
+	json_add_object "tunnel"
+}
+
+proto_close_tunnel() {
+	[ -n "$PROTO_TUNNEL_OPEN" ] || return
+	json_close_object
+	PROTO_TUNNEL_OPEN=
+}
+
 proto_add_dns_server() {
 	local address="$1"
 
@@ -113,7 +127,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 +152,7 @@ _proto_notify() {
 proto_send_update() {
 	local interface="$1"
 
+	proto_close_tunnel
 	_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
@@ -225,12 +240,12 @@ init_proto() {
 				no_device=0
 				available=0
 
-				add_default_handler "$1_init_config"
+				add_default_handler "proto_$1_init_config"
 
 				json_init
 				json_add_string "name" "$1"
 				json_add_array "config"
-				eval "$1_init_config"
+				eval "proto_$1_init_config"
 				json_close_array
 				json_add_boolean no-device "$no_device"
 				json_add_boolean available "$available"