projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix passing routes to netifd
[project/netifd.git]
/
dummy
/
netifd-proto.sh
diff --git
a/dummy/netifd-proto.sh
b/dummy/netifd-proto.sh
index
6182ce1
..
2a6a393
100755
(executable)
--- a/
dummy/netifd-proto.sh
+++ b/
dummy/netifd-proto.sh
@@
-33,6
+33,8
@@
_proto_do_teardown() {
_proto_do_setup() {
json_load "$data"
_proto_do_setup() {
json_load "$data"
+ _EXPORT_VAR=0
+ _EXPORT_VARS=
eval "$1_setup \"$interface\" \"$ifname\""
}
eval "$1_setup \"$interface\" \"$ifname\""
}
@@
-48,7
+50,7
@@
proto_init_update() {
PROTO_ROUTE6=
json_init
json_add_int action 0
PROTO_ROUTE6=
json_init
json_add_int action 0
- json_add_string "ifname" "$ifname"
+
[ -n "$ifname" -a "*" != "$ifname" ] &&
json_add_string "ifname" "$ifname"
json_add_boolean "link-up" "$up"
[ -n "$3" ] && json_add_boolean "address-external" "$external"
}
json_add_boolean "link-up" "$up"
[ -n "$3" ] && json_add_boolean "address-external" "$external"
}
@@
-59,6
+61,12
@@
proto_add_dns_server() {
jshn_append PROTO_DNS "$address"
}
jshn_append PROTO_DNS "$address"
}
+proto_add_dns_search() {
+ local address="$1"
+
+ jshn_append PROTO_DNS_SEARCH "$address"
+}
+
proto_add_ipv4_address() {
local address="$1"
local mask="$2"
proto_add_ipv4_address() {
local address="$1"
local mask="$2"
@@
-100,11
+108,11
@@
_proto_push_route() {
local mask="${str%%/*}"
local gw="${str#*/}"
local mask="${str%%/*}"
local gw="${str#*/}"
- json_add_
table
""
+ json_add_
object
""
json_add_string target "$target"
json_add_string target "$target"
- json_add_
integer
mask "$mask"
+ json_add_
string
mask "$mask"
json_add_string gateway "$gw"
json_add_string gateway "$gw"
- json_close_
table
+ json_close_
object
}
_proto_push_array() {
}
_proto_push_array() {
@@
-130,12
+138,20
@@
proto_send_update() {
_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
- _proto_push_array "route" "$PROTO_ROUTE" _proto_push_route
- _proto_push_array "route6" "$PROTO_ROUTE6" _proto_push_route
+ _proto_push_array "route
s
" "$PROTO_ROUTE" _proto_push_route
+ _proto_push_array "route
s
6" "$PROTO_ROUTE6" _proto_push_route
_proto_push_array "dns" "$PROTO_DNS" _proto_push_ip
_proto_push_array "dns" "$PROTO_DNS" _proto_push_ip
+ _proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_ip
_proto_notify "$interface"
}
_proto_notify "$interface"
}
+proto_export() {
+ local var="VAR${_EXPORT_VAR}"
+ _EXPORT_VAR="$(($_EXPORT_VAR + 1))"
+ export -- "$var=$1"
+ jshn_append _EXPORT_VARS "$var"
+}
+
proto_run_command() {
local interface="$1"; shift
proto_run_command() {
local interface="$1"; shift
@@
-146,6
+162,14
@@
proto_run_command() {
json_add_string "" "$1"
shift
done
json_add_string "" "$1"
shift
done
+ json_close_array
+ [ -n "$_EXPORT_VARS" ] && {
+ json_add_array env
+ for var in $_EXPORT_VARS; do
+ eval "json_add_string \"\" \"\${$var}\""
+ done
+ json_close_array
+ }
_proto_notify "$interface"
}
_proto_notify "$interface"
}