diff options
| -rwxr-xr-x | dummy/netifd-proto.sh | 29 | ||||
| -rwxr-xr-x | dummy/proto/ppp.sh | 3 | ||||
| -rw-r--r-- | proto-shell.c | 15 |
3 files changed, 39 insertions, 8 deletions
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 diff --git a/dummy/proto/ppp.sh b/dummy/proto/ppp.sh index bc7fd3c..4ca2650 100755 --- a/dummy/proto/ppp.sh +++ b/dummy/proto/ppp.sh @@ -39,6 +39,9 @@ proto_pppoe_setup() { proto_init_update ppp0 1 proto_add_ipv4_address "192.168.2.1" 32 proto_add_dns_server "192.168.2.2" + proto_add_data + json_add_string "ppp-type" "pppoe" + proto_close_data proto_send_update "$interface" proto_run_command "$interface" sleep 30 } diff --git a/proto-shell.c b/proto-shell.c index b5d436a..aba7298 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -222,6 +222,16 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr, } } +static void +proto_shell_parse_data(struct interface *iface, struct blob_attr *attr) +{ + struct blob_attr *cur; + int rem; + + blobmsg_for_each_attr(cur, attr, rem) + interface_add_data(iface, cur); +} + static struct device * proto_shell_create_tunnel(const char *name, struct blob_attr *attr) { @@ -250,6 +260,7 @@ enum { NOTIFY_ROUTES, NOTIFY_ROUTES6, NOTIFY_TUNNEL, + NOTIFY_DATA, __NOTIFY_LAST }; @@ -266,6 +277,7 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = { [NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY }, [NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY }, [NOTIFY_TUNNEL] = { .name = "tunnel", .type = BLOBMSG_TYPE_TABLE }, + [NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE }, }; static int @@ -327,6 +339,9 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, state->proto.proto_event(&state->proto, IFPEV_UP); + if ((cur = tb[NOTIFY_DATA])) + proto_shell_parse_data(state->proto.iface, cur); + return 0; } |