. /usr/share/libubox/jshn.sh
+append() {
+ local var="$1"
+ local value="$2"
+ local sep="${3:- }"
+
+ eval "export -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+}
+
proto_config_add_generic() {
json_add_array ""
json_add_string "" "$1"
PROTO_IP6ADDR=
PROTO_ROUTE=
PROTO_ROUTE6=
+ PROTO_PREFIX6=
PROTO_DNS=
PROTO_DNS_SEARCH=
json_init
proto_add_dns_server() {
local address="$1"
- jshn_append PROTO_DNS "$address"
+ append PROTO_DNS "$address"
}
proto_add_dns_search() {
local address="$1"
- jshn_append PROTO_DNS_SEARCH "$address"
+ append PROTO_DNS_SEARCH "$address"
}
proto_add_ipv4_address() {
local broadcast="$3"
local ptp="$4"
- jshn_append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
+ append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
}
proto_add_ipv6_address() {
local address="$1"
local mask="$2"
- jshn_append PROTO_IP6ADDR "$address/$mask"
+ append PROTO_IP6ADDR "$address/$mask"
}
proto_add_ipv4_route() {
local mask="$2"
local gw="$3"
- jshn_append PROTO_ROUTE "$target/$mask/$gw"
+ append PROTO_ROUTE "$target/$mask/$gw"
}
proto_add_ipv6_route() {
local mask="$2"
local gw="$3"
- jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
+ 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() {
_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() {
_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"
local var="VAR${_EXPORT_VAR}"
_EXPORT_VAR="$(($_EXPORT_VAR + 1))"
export -- "$var=$1"
- jshn_append _EXPORT_VARS "$var"
+ append _EXPORT_VARS "$var"
}
proto_run_command() {