local up="$2"
local external="$3"
+ PROTO_KEEP=0
PROTO_INIT=1
PROTO_TUNNEL_OPEN=
PROTO_IPADDR=
[ -n "$3" ] && json_add_boolean "address-external" "$external"
}
-proto_add_tunnel() {
- proto_close_tunnel
+proto_set_keep() {
+ PROTO_KEEP="$1"
+}
- PROTO_TUNNEL_OPEN=1
- json_add_object "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_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() {
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
}
_proto_notify() {
local interface="$1"
- ubus call network.interface."$interface" notify_proto "$(json_dump)"
+ local options="$2"
+ ubus $options call network.interface."$interface" notify_proto "$(json_dump)"
}
proto_send_update() {
local interface="$1"
- proto_close_tunnel
+ proto_close_nested
+ json_add_boolean keep "$PROTO_KEEP"
_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
_proto_notify "$interface"
}
+proto_add_host_dependency() {
+ local interface="$1"
+ local host="$2"
+
+ json_init
+ json_add_int action 6
+ json_add_string host "$host"
+ _proto_notify "$interface" -S
+}
+
init_proto() {
proto="$1"; shift
cmd="$1"; shift