char *config_buf;
char *script_name;
bool init_available;
- bool no_proto_task;
struct uci_blob_param_list config;
};
state->sm = S_SETUP;
break;
- case S_SETUP_ABORT:
- case S_TEARDOWN:
- case S_SETUP:
- return 0;
-
default:
return -1;
}
state->sm = S_SETUP_ABORT;
return 0;
}
- /* fall through if no script task is running */
+ /* if no script task is running */
+ fallthrough;
case S_IDLE:
action = "teardown";
state->renew_pending = false;
case S_IDLE:
if (task == &state->proto_task)
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
- /* fall through */
+ fallthrough;
case S_SETUP:
if (task == &state->proto_task)
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN,
if (state->renew_pending)
proto_shell_handler(&state->proto,
PROTO_CMD_RENEW, false);
- else if (!state->handler->no_proto_task &&
+ else if (!(state->handler->proto.flags & PROTO_FLAG_NO_TASK) &&
!state->proto_task.uloop.pending &&
state->sm == S_SETUP)
proto_shell_handler(&state->proto,
}
}
+static void
+proto_shell_parse_neighbor_list(struct interface *iface, struct blob_attr *attr,
+ bool v6)
+{
+ struct blob_attr *cur;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+ DPRINTF("Ignore wrong neighbor type: %d\n", blobmsg_type(cur));
+ continue;
+ }
+
+ interface_ip_add_neighbor(iface, cur, v6);
+ }
+}
+
static void
proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
{
NOTIFY_HOST,
NOTIFY_DNS,
NOTIFY_DNS_SEARCH,
+ NOTIFY_NEIGHBORS,
+ NOTIFY_NEIGHBORS6,
__NOTIFY_LAST
};
[NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING },
[NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+ [NOTIFY_NEIGHBORS]= {.name = "neighbor", .type = BLOBMSG_TYPE_ARRAY},
+ [NOTIFY_NEIGHBORS6]= {.name = "neighbor6", .type = BLOBMSG_TYPE_ARRAY},
};
static int
return UBUS_STATUS_UNKNOWN_ERROR;
device_set_present(dev, true);
-
- interface_update_start(iface);
}
+ interface_update_start(iface, keep);
+
proto_apply_ip_settings(iface, data, addr_ext);
if ((cur = tb[NOTIFY_ROUTES]) != NULL)
if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, true);
+ if ((cur = tb[NOTIFY_NEIGHBORS]) != NULL)
+ proto_shell_parse_neighbor_list(state->proto.iface, cur, false);
+
+ if ((cur = tb[NOTIFY_NEIGHBORS6]) != NULL)
+ proto_shell_parse_neighbor_list(state->proto.iface, cur, true);
+
if ((cur = tb[NOTIFY_DNS]))
interface_add_dns_server_list(&iface->proto_ip, cur);
interface_update_complete(state->proto.iface);
if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
- if (!keep)
- state->proto.proto_event(&state->proto, IFPEV_UP);
+ state->proto.proto_event(&state->proto, IFPEV_UP);
state->sm = S_IDLE;
}
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
return false;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
return false;
argv[argc++] = blobmsg_data(cur);
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
goto error;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
goto error;
data[n_data++] = blobmsg_data(cur);
switch (state->sm) {
case S_IDLE:
state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
- /* fall through */
+ fallthrough;
case S_SETUP:
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
break;
handler->proto.flags |= PROTO_FLAG_NODEV;
tmp = json_get_field(obj, "no-proto-task", json_type_boolean);
- handler->no_proto_task = tmp && json_object_get_boolean(tmp);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_NO_TASK;
tmp = json_get_field(obj, "available", json_type_boolean);
if (tmp && json_object_get_boolean(tmp))