#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "netifd.h"
#include "device.h"
IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
+ IFACE_ATTR_JAIL,
+ IFACE_ATTR_JAIL_IFNAME,
IFACE_ATTR_DEFAULTROUTE,
IFACE_ATTR_PEERDNS,
IFACE_ATTR_DNS,
IFACE_ATTR_DNS_SEARCH,
+ IFACE_ATTR_DNS_METRIC,
IFACE_ATTR_METRIC,
IFACE_ATTR_INTERFACE,
IFACE_ATTR_IP6ASSIGN,
IFACE_ATTR_IP6TABLE,
IFACE_ATTR_IP6CLASS,
IFACE_ATTR_DELEGATE,
+ IFACE_ATTR_IP6IFACEID,
+ IFACE_ATTR_FORCE_LINK,
+ IFACE_ATTR_IP6WEIGHT,
IFACE_ATTR_MAX
};
[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+ [IFACE_ATTR_JAIL] = { .name = "jail", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_JAIL_IFNAME] = { .name = "jail_ifname", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_PEERDNS] = { .name = "peerdns", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+ [IFACE_ATTR_DNS_METRIC] = { .name = "dns_metric", .type = BLOBMSG_TYPE_INT32 },
[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 },
[IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
-};
-
-static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
- [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
- [IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
+ [IFACE_ATTR_IP6WEIGHT] = { .name = "ip6weight", .type = BLOBMSG_TYPE_INT32 },
};
const struct uci_blob_param_list interface_attr_list = {
.n_params = IFACE_ATTR_MAX,
.params = iface_attrs,
- .info = iface_attr_info,
};
static void
-interface_clear_errors(struct interface *iface)
+interface_set_main_dev(struct interface *iface, struct device *dev);
+static void
+interface_event(struct interface *iface, enum interface_event ev);
+
+static void
+interface_error_flush(struct interface *iface)
{
struct interface_error *error, *tmp;
}
}
+static void
+interface_clear_errors(struct interface *iface)
+{
+ /* don't flush the errors in case the configured protocol handler matches the
+ running protocol handler and is having the last error capability */
+ if (!(iface->proto &&
+ (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+ (iface->proto->handler->name == iface->proto_handler->name)))
+ interface_error_flush(iface);
+}
+
void interface_add_error(struct interface *iface, const char *subsystem,
const char *code, const char **data, int n_data)
{
int *datalen = NULL;
char *dest, *d_subsys, *d_code;
+ /* if the configured protocol handler has the last error support capability,
+ errors should only be added if the running protocol handler matches the
+ configured one */
+ if (iface->proto &&
+ (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+ (iface->proto->handler->name != iface->proto_handler->name))
+ return;
+
if (n_data) {
len = n_data * sizeof(char *);
datalen = alloca(len);
if (!error)
return;
+ /* Only keep the last flagged error, prevent this list grows unlimitted in case the
+ protocol can't be established (e.g auth failure) */
+ if (iface->proto_handler->flags & PROTO_FLAG_LASTERROR)
+ interface_error_flush(iface);
+
list_add_tail(&error->list, &iface->errors);
dest = (char *) &error->data[n_data + 1];
memcpy(dest, data[i], datalen[i]);
dest += datalen[i];
}
- error->data[n_data++] = NULL;
+ error->data[n_data] = NULL;
if (subsystem)
error->subsystem = strcpy(d_subsys, subsystem);
}
n = calloc(1, sizeof(*n) + len);
+ if (!n)
+ return UBUS_STATUS_UNKNOWN_ERROR;
+
memcpy(n->data, data, len);
n->node.key = blobmsg_name(n->data);
avl_insert(&iface->data, &n->node);
return 0;
}
+int interface_parse_data(struct interface *iface, const struct blob_attr *attr)
+{
+ struct blob_attr *cur;
+ int rem, ret;
+
+ iface->updated = 0;
+
+ blob_for_each_attr(cur, attr, rem) {
+ ret = interface_add_data(iface, cur);
+ if (ret)
+ return ret;
+ }
+
+ if (iface->updated && iface->state == IFS_UP)
+ interface_event(iface, IFEV_UPDATE);
+
+ return 0;
+}
+
static void
interface_event(struct interface *iface, enum interface_event ev)
{
switch (ev) {
case IFEV_UP:
+ interface_error_flush(iface);
adev = iface->l3_dev.dev;
- /* fall through */
+ fallthrough;
case IFEV_DOWN:
+ case IFEV_UP_FAILED:
alias_notify_device(iface->name, adev);
break;
default:
if (state == IFS_DOWN)
return;
+ iface->link_up_event = false;
iface->state = IFS_DOWN;
- if (state == IFS_UP)
+ switch (state) {
+ case IFS_UP:
+ case IFS_TEARDOWN:
interface_event(iface, IFEV_DOWN);
+ break;
+ case IFS_SETUP:
+ interface_event(iface, IFEV_UP_FAILED);
+ break;
+ default:
+ break;
+ }
interface_ip_set_enabled(&iface->config_ip, false);
+ interface_ip_set_enabled(&iface->proto_ip, false);
interface_ip_flush(&iface->proto_ip);
interface_flush_state(iface);
system_flush_routes();
}
-void
+static inline void
+__set_config_state(struct interface *iface, enum interface_config_state s)
+{
+ iface->config_state = s;
+}
+
+static void
__interface_set_down(struct interface *iface, bool force)
{
enum interface_state state = iface->state;
case IFS_UP:
case IFS_SETUP:
iface->state = IFS_TEARDOWN;
+ if (iface->dynamic)
+ __set_config_state(iface, IFC_REMOVE);
+
if (state == IFS_UP)
interface_event(iface, IFEV_DOWN);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
if (force)
interface_flush_state(iface);
-
- if (iface->dynamic)
- vlist_delete(&interfaces, &iface->node);
break;
case IFS_DOWN:
if (iface->main_dev.dev)
device_release(&iface->main_dev);
+ break;
case IFS_TEARDOWN:
default:
break;
static void
interface_check_state(struct interface *iface)
{
+ bool link_state = iface->link_state || iface->force_link;
+
switch (iface->state) {
case IFS_UP:
- if (!iface->enabled || !iface->link_state) {
- mark_interface_down(iface);
+ case IFS_SETUP:
+ if (!iface->enabled || !link_state) {
+ iface->state = IFS_TEARDOWN;
+ if (iface->dynamic)
+ __set_config_state(iface, IFC_REMOVE);
+
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
}
break;
case IFS_DOWN:
- if (iface->autostart && iface->enabled && iface->link_state && !config_init)
+ if (!iface->available)
+ return;
+
+ if (iface->autostart && iface->enabled && link_state && !config_init)
__interface_set_up(iface);
break;
default:
netifd_log_message(L_NOTICE, "Interface '%s' has link connectivity %s\n", iface->name, new_state ? "" : "loss");
iface->link_state = new_state;
interface_check_state(iface);
+
+ if (new_state && iface->force_link && iface->state == IFS_UP && !iface->link_up_event) {
+ interface_event(iface, IFEV_LINK_UP);
+ iface->link_up_event = true;
+ }
+}
+
+static void
+interface_ext_dev_cb(struct device_user *dep, enum device_event ev)
+{
+ if (ev == DEV_EVENT_REMOVE)
+ device_remove_user(dep);
}
static void
-interface_cb(struct device_user *dep, enum device_event ev)
+interface_main_dev_cb(struct device_user *dep, enum device_event ev)
{
struct interface *iface;
- bool new_state = false;
iface = container_of(dep, struct interface, main_dev);
switch (ev) {
case DEV_EVENT_ADD:
- new_state = true;
+ interface_set_available(iface, true);
+ break;
case DEV_EVENT_REMOVE:
- interface_set_available(iface, new_state);
- if (!new_state && dep->dev->external)
+ interface_set_available(iface, false);
+ if (dep->dev && dep->dev->external)
interface_set_main_dev(iface, NULL);
break;
case DEV_EVENT_UP:
- new_state = true;
+ interface_set_enabled(iface, true);
+ break;
case DEV_EVENT_DOWN:
- interface_set_enabled(iface, new_state);
+ interface_set_enabled(iface, false);
break;
case DEV_EVENT_LINK_UP:
- new_state = true;
- case DEV_EVENT_LINK_DOWN:
- interface_set_link_state(iface, new_state);
+ interface_set_link_state(iface, true);
+ break;
+ case DEV_EVENT_LINK_DOWN:
+ interface_set_link_state(iface, false);
break;
case DEV_EVENT_TOPO_CHANGE:
interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
}
}
+static void
+interface_l3_dev_cb(struct device_user *dep, enum device_event ev)
+{
+ struct interface *iface;
+
+ iface = container_of(dep, struct interface, l3_dev);
+ if (iface->l3_dev.dev == iface->main_dev.dev)
+ return;
+
+ switch (ev) {
+ case DEV_EVENT_LINK_DOWN:
+ if (iface->proto_handler->flags & PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN)
+ interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+ break;
+ default:
+ break;
+ }
+}
+
void
interface_set_available(struct interface *iface, bool new_state)
{
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
continue;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
continue;
struct interface_assignment_class *c = malloc(sizeof(*c) + blobmsg_data_len(cur));
{
bool changed = (old->assignment_hint != new->assignment_hint ||
old->assignment_length != new->assignment_length ||
+ old->assignment_iface_id_selection != new->assignment_iface_id_selection ||
+ old->assignment_weight != new->assignment_weight ||
+ (old->assignment_iface_id_selection == IFID_FIXED &&
+ memcmp(&old->assignment_fixed_iface_id, &new->assignment_fixed_iface_id,
+ sizeof(old->assignment_fixed_iface_id))) ||
list_empty(&old->assignment_classes) != list_empty(&new->assignment_classes));
struct interface_assignment_class *c;
list_for_each_entry(c, &new->assignment_classes, head) {
- // Compare list entries one-by-one to see if there was a change
- if (list_empty(&old->assignment_classes)) // The new list is longer
+ /* Compare list entries one-by-one to see if there was a change */
+ if (list_empty(&old->assignment_classes)) /* The new list is longer */
changed = true;
if (changed)
struct interface_assignment_class *c_old = list_first_entry(&old->assignment_classes,
struct interface_assignment_class, head);
- if (strcmp(c_old->name, c->name)) // An entry didn't match
+ if (strcmp(c_old->name, c->name)) /* An entry didn't match */
break;
list_del(&c_old->head);
free(c_old);
}
- // The old list was longer than the new one or the last entry didn't match
+ /* The old list was longer than the new one or the last entry didn't match */
if (!list_empty(&old->assignment_classes)) {
interface_clear_assignment_classes(old);
changed = true;
if (changed) {
old->assignment_hint = new->assignment_hint;
old->assignment_length = new->assignment_length;
+ old->assignment_iface_id_selection = new->assignment_iface_id_selection;
+ old->assignment_fixed_iface_id = new->assignment_fixed_iface_id;
+ old->assignment_weight = new->assignment_weight;
interface_refresh_assignments(true);
}
}
interface_set_available(alias, true);
break;
case IFEV_DOWN:
+ case IFEV_UP_FAILED:
interface_set_available(alias, false);
interface_set_main_dev(alias, NULL);
break;
case IFEV_FREE:
interface_remove_user(dep);
break;
- case IFEV_RELOAD:
- case IFEV_UPDATE:
+ default:
break;
}
}
+static void
+interface_set_device_config(struct interface *iface, struct device *dev)
+{
+ if (!dev || !dev->default_config)
+ return;
+
+ if (!iface->device_config &&
+ (!dev->iface_config || dev->config_iface != iface))
+ return;
+
+ dev->config_iface = iface;
+ dev->iface_config = iface->device_config;
+ device_apply_config(dev, dev->type, iface->config);
+}
+
static void
interface_claim_device(struct interface *iface)
{
if (iface->parent_iface.iface)
interface_remove_user(&iface->parent_iface);
+ device_lock();
+
if (iface->parent_ifname) {
parent = vlist_find(&interfaces, iface->parent_ifname, parent, node);
iface->parent_iface.cb = interface_alias_cb;
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
+ interface_set_device_config(iface, dev);
+ } else {
+ dev = iface->ext_dev.dev;
}
if (dev)
interface_set_main_dev(iface, dev);
+ device_unlock();
+
if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
interface_set_available(iface, true);
}
interface_clear_errors(iface);
interface_set_proto_state(iface, NULL);
- if (iface->main_dev.dev)
- interface_set_main_dev(iface, NULL);
+ interface_set_main_dev(iface, NULL);
+ interface_set_l3_dev(iface, NULL);
}
static void
{
struct interface_user *dep, *tmp;
+ uloop_timeout_cancel(&iface->remove_timer);
+ device_remove_user(&iface->ext_dev);
+
if (iface->parent_iface.iface)
interface_remove_user(&iface->parent_iface);
free(iface->config);
netifd_ubus_remove_interface(iface);
avl_delete(&interfaces.avl, &iface->node.avl);
+ if (iface->jail)
+ free(iface->jail);
+ if (iface->jail_ifname)
+ free(iface->jail_ifname);
+
free(iface);
}
interface_do_free(iface);
return;
}
- if (iface->autostart && iface->available)
+ if (iface->autostart)
interface_set_up(iface);
}
static void
-interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev)
+interface_proto_event_cb(struct interface_proto_state *state, enum interface_proto_event ev)
{
struct interface *iface = state->iface;
switch (ev) {
case IFPEV_UP:
if (iface->state != IFS_SETUP) {
- interface_event(iface, IFEV_UPDATE);
+ if (iface->state == IFS_UP && iface->updated)
+ interface_event(iface, IFEV_UPDATE);
return;
}
+ if (!iface->l3_dev.dev)
+ interface_set_l3_dev(iface, iface->main_dev.dev);
+
interface_ip_set_enabled(&iface->config_ip, true);
+ interface_ip_set_enabled(&iface->proto_ip, true);
system_flush_routes();
iface->state = IFS_UP;
iface->start_time = system_get_rtime();
mark_interface_down(iface);
if (iface->main_dev.dev)
device_release(&iface->main_dev);
+ if (iface->l3_dev.dev)
+ device_remove_user(&iface->l3_dev);
interface_handle_config_change(iface);
break;
case IFPEV_LINK_LOST:
return;
}
- interface_write_resolv_conf();
+ interface_write_resolv_conf(iface->jail);
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
if (!state)
return;
- state->proto_event = interface_proto_cb;
+ state->proto_event = interface_proto_event_cb;
state->iface = iface;
}
struct interface *
-interface_alloc(const char *name, struct blob_attr *config)
+interface_alloc(const char *name, struct blob_attr *config, bool dynamic)
{
struct interface *iface;
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
const char *proto_name = NULL;
char *iface_name;
+ bool force_link = false;
iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1);
iface->name = strcpy(iface_name, name);
avl_init(&iface->data, avl_strcmp, false, NULL);
iface->config_ip.enabled = false;
- iface->main_dev.cb = interface_cb;
+ iface->main_dev.cb = interface_main_dev_cb;
+ iface->l3_dev.cb = interface_l3_dev_cb;
+ iface->ext_dev.cb = interface_ext_dev_cb;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
proto_name = blobmsg_data(cur);
proto_attach_interface(iface, proto_name);
+ if (iface->proto_handler->flags & PROTO_FLAG_FORCE_LINK_DEFAULT)
+ force_link = true;
iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+ iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], force_link);
+ iface->dynamic = dynamic;
iface->proto_ip.no_defaultroute =
!blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
iface->proto_ip.no_dns =
if ((cur = tb[IFACE_ATTR_DNS_SEARCH]))
interface_add_dns_search_list(&iface->config_ip, cur);
+ if ((cur = tb[IFACE_ATTR_DNS_METRIC]))
+ iface->dns_metric = blobmsg_get_u32(cur);
+
if ((cur = tb[IFACE_ATTR_METRIC]))
iface->metric = blobmsg_get_u32(cur);
if ((cur = tb[IFACE_ATTR_IP6ASSIGN]))
iface->assignment_length = blobmsg_get_u32(cur);
+ /* defaults */
+ iface->assignment_iface_id_selection = IFID_FIXED;
+ iface->assignment_fixed_iface_id = in6addr_any;
+ iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+
+ if ((cur = tb[IFACE_ATTR_IP6IFACEID])) {
+ const char *ifaceid = blobmsg_data(cur);
+ if (!strcmp(ifaceid, "random")) {
+ iface->assignment_iface_id_selection = IFID_RANDOM;
+ }
+ else if (!strcmp(ifaceid, "eui64")) {
+ iface->assignment_iface_id_selection = IFID_EUI64;
+ }
+ else {
+ /* we expect an IPv6 address with network id zero here -> fixed iface id
+ if we cannot parse -> revert to iface id 1 */
+ if (inet_pton(AF_INET6,ifaceid,&iface->assignment_fixed_iface_id) != 1 ||
+ iface->assignment_fixed_iface_id.s6_addr32[0] != 0 ||
+ iface->assignment_fixed_iface_id.s6_addr32[1] != 0) {
+ iface->assignment_fixed_iface_id = in6addr_any;
+ iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+ netifd_log_message(L_WARNING, "Failed to parse ip6ifaceid for interface '%s', \
+ falling back to iface id 1.\n", iface->name);
+ }
+ }
+ }
+
iface->assignment_hint = -1;
if ((cur = tb[IFACE_ATTR_IP6HINT]))
iface->assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
if ((cur = tb[IFACE_ATTR_IP6CLASS]))
interface_add_assignment_classes(iface, cur);
+ if ((cur = tb[IFACE_ATTR_IP6WEIGHT]))
+ iface->assignment_weight = blobmsg_get_u32(cur);
if ((cur = tb[IFACE_ATTR_IP4TABLE])) {
if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip4table))
iface->proto_ip.no_delegation = !blobmsg_get_bool_default(tb[IFACE_ATTR_DELEGATE], true);
iface->config_autostart = iface->autostart;
- return iface;
-}
+ iface->jail = NULL;
-void interface_set_dynamic(struct interface *iface)
-{
- iface->dynamic = true;
- iface->node.version = -1; // Don't delete on reload
+ if ((cur = tb[IFACE_ATTR_JAIL])) {
+ iface->jail = strdup(blobmsg_get_string(cur));
+ iface->autostart = false;
+ }
+
+ iface->jail_ifname = NULL;
+ if ((cur = tb[IFACE_ATTR_JAIL_IFNAME]))
+ iface->jail_ifname = strdup(blobmsg_get_string(cur));
+
+ return iface;
}
static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
{
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
+ char *name = NULL;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
iface->ifname = blobmsg_data(cur);
}
+ if (iface->dynamic) {
+ name = strdup(iface->name);
+
+ if (!name)
+ return false;
+ }
iface->config = config;
vlist_add(&interfaces, &iface->node, iface->name);
+
+ if (name) {
+ iface = vlist_find(&interfaces, name, iface, node);
+ free(name);
+
+ /* Don't delete dynamic interface on reload */
+ if (iface)
+ iface->node.version = -1;
+ }
+
return true;
}
-void
+bool
interface_add(struct interface *iface, struct blob_attr *config)
{
- __interface_add(iface, config, false);
+ return __interface_add(iface, config, false);
}
bool
return;
interface_ip_set_enabled(&iface->config_ip, false);
+ interface_ip_set_enabled(&iface->proto_ip, false);
interface_ip_flush(&iface->proto_ip);
device_add_user(&iface->l3_dev, dev);
if (dev) {
- if (claimed)
- device_claim(&iface->l3_dev);
+ if (claimed) {
+ if (device_claim(&iface->l3_dev) < 0)
+ return;
+ }
interface_ip_set_enabled(&iface->config_ip, enabled);
+ interface_ip_set_enabled(&iface->proto_ip, enabled);
}
}
-void
+static void
interface_set_main_dev(struct interface *iface, struct device *dev)
{
- bool set_l3 = (!dev || iface->main_dev.dev == iface->l3_dev.dev);
bool claimed = iface->l3_dev.claimed;
if (iface->main_dev.dev == dev)
return;
- if (set_l3)
- interface_set_l3_dev(iface, dev);
-
+ interface_set_available(iface, false);
device_add_user(&iface->main_dev, dev);
if (!dev) {
interface_set_link_state(iface, false);
return;
}
- if (claimed)
- device_claim(&iface->l3_dev);
+ if (claimed) {
+ if (device_claim(&iface->l3_dev) < 0)
+ return;
+ }
if (!iface->l3_dev.dev)
interface_set_l3_dev(iface, dev);
}
-int
+static int
interface_remove_link(struct interface *iface, struct device *dev)
{
struct device *mdev = iface->main_dev.dev;
if (mdev && mdev->hotplug_ops)
return mdev->hotplug_ops->del(mdev, dev);
+ if (dev == iface->ext_dev.dev)
+ device_remove_user(&iface->ext_dev);
+
if (!iface->main_dev.hotplug)
return UBUS_STATUS_INVALID_ARGUMENT;
if (dev != iface->main_dev.dev)
return UBUS_STATUS_INVALID_ARGUMENT;
- device_remove_user(&iface->main_dev);
+ interface_set_main_dev(iface, NULL);
return 0;
}
-int
-interface_add_link(struct interface *iface, struct device *dev)
+static int
+interface_add_link(struct interface *iface, struct device *dev,
+ struct blob_attr *vlan, bool link_ext)
{
struct device *mdev = iface->main_dev.dev;
if (mdev) {
if (mdev->hotplug_ops)
- return mdev->hotplug_ops->add(mdev, dev);
+ return mdev->hotplug_ops->add(mdev, dev, vlan);
else
return UBUS_STATUS_NOT_SUPPORTED;
}
+ if (link_ext)
+ device_add_user(&iface->ext_dev, dev);
+
interface_set_main_dev(iface, dev);
iface->main_dev.hotplug = true;
return 0;
}
int
-interface_handle_link(struct interface *iface, const char *name, bool add)
+interface_handle_link(struct interface *iface, const char *name,
+ struct blob_attr *vlan, bool add, bool link_ext)
{
struct device *dev;
int ret;
device_lock();
- dev = device_get(name, add ? 2 : 0);
+ dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
if (!dev) {
ret = UBUS_STATUS_NOT_FOUND;
goto out;
}
if (add) {
- device_set_present(dev, true);
- if (iface->device_config)
- device_set_config(dev, &simple_device_type, iface->config);
+ interface_set_device_config(iface, dev);
+ if (!link_ext)
+ device_set_present(dev, true);
- system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
- ret = interface_add_link(iface, dev);
+ ret = interface_add_link(iface, dev, vlan, link_ext);
} else {
ret = interface_remove_link(iface, dev);
}
return ret;
}
-int
+void
interface_set_up(struct interface *iface)
{
int ret;
+ const char *error = NULL;
iface->autostart = true;
if (iface->state != IFS_DOWN)
- return 0;
+ return;
interface_clear_errors(iface);
- if (!iface->available) {
- interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
- return -1;
- }
-
- if (iface->main_dev.dev) {
- ret = device_claim(&iface->main_dev);
- if (!ret)
- interface_check_state(iface);
- }
- else
- ret = __interface_set_up(iface);
+ if (iface->available) {
+ if (iface->main_dev.dev) {
+ ret = device_claim(&iface->main_dev);
+ if (!ret)
+ interface_check_state(iface);
+ else
+ error = "DEVICE_CLAIM_FAILED";
+ } else {
+ ret = __interface_set_up(iface);
+ if (ret)
+ error = "SETUP_FAILED";
+ }
+ } else
+ error = "NO_DEVICE";
- return ret;
+ if (error)
+ interface_add_error(iface, "interface", error, NULL, 0);
}
-int
+void
interface_set_down(struct interface *iface)
{
if (!iface) {
iface->autostart = false;
__interface_set_down(iface, false);
}
+}
- return 0;
+int
+interface_renew(struct interface *iface)
+{
+ if (iface->state == IFS_TEARDOWN || iface->state == IFS_DOWN)
+ return -1;
+
+ return interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
}
void
struct interface *iface;
vlist_for_each_element(&interfaces, iface, node) {
- if (iface->available && iface->autostart)
+ if (iface->autostart)
interface_set_up(iface);
}
}
+void
+interface_start_jail(const char *jail, const pid_t netns_pid)
+{
+ struct interface *iface;
+ int netns_fd;
+ int wstatus;
+ pid_t pr = 0;
+
+ netns_fd = system_netns_open(netns_pid);
+ if (netns_fd < 0)
+ return;
+
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (!iface->jail || strcmp(iface->jail, jail))
+ continue;
+
+ system_link_netns_move(iface->main_dev.dev, netns_fd, iface->jail_ifname);
+ }
+
+ close(netns_fd);
+
+ pr = fork();
+ if (pr) {
+ waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
+ return;
+ }
+
+ /* child process */
+ netns_fd = system_netns_open(netns_pid);
+ if (netns_fd < 0)
+ return;
+
+ system_netns_set(netns_fd);
+ system_init();
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (!iface->jail || strcmp(iface->jail, jail))
+ continue;
+
+ /*
+ * The interface has already been renamed and is inside target
+ * namespace, hence overwrite ifname with jail_ifname for
+ * interface_set_up().
+ * We are inside a fork which got it's own copy of the interfaces
+ * list, so we can mess with it :)
+ */
+ if (iface->jail_ifname)
+ iface->ifname = iface->jail_ifname;
+
+ interface_do_reload(iface);
+ interface_set_up(iface);
+ }
+
+ close(netns_fd);
+ _exit(0);
+}
+
+void
+interface_stop_jail(const char *jail, const pid_t netns_pid)
+{
+ struct interface *iface;
+ int netns_fd, root_netns;
+ int wstatus;
+ pid_t parent_pid = getpid();
+ pid_t pr = 0;
+ const char *orig_ifname;
+
+ pr = fork();
+ if (pr) {
+ waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
+ return;
+ }
+
+ /* child process */
+ root_netns = system_netns_open(parent_pid);
+ if (root_netns < 0)
+ return;
+
+ netns_fd = system_netns_open(netns_pid);
+ if (netns_fd < 0)
+ return;
+
+ system_netns_set(netns_fd);
+ system_init();
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (!iface->jail || strcmp(iface->jail, jail))
+ continue;
+
+ orig_ifname = iface->ifname;
+ if (iface->jail_ifname)
+ iface->ifname = iface->jail_ifname;
+
+ interface_do_reload(iface);
+ interface_set_down(iface);
+ system_link_netns_move(iface->main_dev.dev, root_netns, orig_ifname);
+ }
+
+ close(root_netns);
+ close(netns_fd);
+ _exit(0);
+}
+
static void
set_config_state(struct interface *iface, enum interface_config_state s)
{
- iface->config_state = s;
+ __set_config_state(iface, s);
if (iface->state == IFS_DOWN)
interface_handle_config_change(iface);
else
}
void
-interface_update_start(struct interface *iface)
+interface_update_start(struct interface *iface, const bool keep_old)
{
iface->updated = 0;
- interface_ip_update_start(&iface->proto_ip);
+
+ if (!keep_old)
+ interface_ip_update_start(&iface->proto_ip);
}
void
vlist_simple_replace(&new->dns_search, &old->dns_search);
}
+static bool
+interface_device_config_changed(struct interface *if_old, struct interface *if_new)
+{
+ struct blob_attr *ntb[__DEV_ATTR_MAX];
+ struct blob_attr *otb[__DEV_ATTR_MAX];
+ struct device *dev = if_old->main_dev.dev;
+ unsigned long diff = 0;
+
+ BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+ if (!dev)
+ return false;
+
+ if (if_old->device_config != if_new->device_config)
+ return true;
+
+ if (!if_new->device_config)
+ return false;
+
+ blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb,
+ blob_data(if_old->config), blob_len(if_old->config));
+
+ blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb,
+ blob_data(if_new->config), blob_len(if_new->config));
+
+ uci_blob_diff(ntb, otb, &device_attr_list, &diff);
+ return diff;
+}
+
static void
interface_change_config(struct interface *if_old, struct interface *if_new)
{
struct blob_attr *old_config = if_old->config;
- bool reload = false, reload_ip = false;
+ bool reload = false, reload_ip = false, update_prefix_delegation = false;
#define FIELD_CHANGED_STR(field) \
((!!if_old->field != !!if_new->field) || \
reload = true;
}
+ if (!reload && interface_device_config_changed(if_old, if_new))
+ reload = true;
+
if (FIELD_CHANGED_STR(ifname) ||
if_old->proto_handler != if_new->proto_handler)
reload = true;
})
if_old->config = if_new->config;
- if (!if_old->config_autostart && if_new->config_autostart)
- if_old->autostart = true;
+ if (if_old->config_autostart != if_new->config_autostart) {
+ if (if_old->config_autostart)
+ reload = true;
+
+ if_old->autostart = if_new->config_autostart;
+ }
if_old->device_config = if_new->device_config;
if_old->config_autostart = if_new->config_autostart;
+ if (if_old->jail)
+ free(if_old->jail);
+
+ if_old->jail = if_new->jail;
+ if (if_old->jail)
+ if_old->autostart = false;
+
+ if (if_old->jail_ifname)
+ free(if_old->jail_ifname);
+
+ if_old->jail_ifname = if_new->jail_ifname;
+
if_old->ifname = if_new->ifname;
if_old->parent_ifname = if_new->parent_ifname;
+ if_old->dynamic = if_new->dynamic;
if_old->proto_handler = if_new->proto_handler;
+ if_old->force_link = if_new->force_link;
+ if_old->dns_metric = if_new->dns_metric;
+
+ if (if_old->proto_ip.no_delegation != if_new->proto_ip.no_delegation) {
+ if_old->proto_ip.no_delegation = if_new->proto_ip.no_delegation;
+ update_prefix_delegation = true;
+ }
if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
}
if (reload_ip) {
+ bool config_ip_enabled = if_old->config_ip.enabled;
+ bool proto_ip_enabled = if_old->proto_ip.enabled;
+
interface_ip_set_enabled(&if_old->config_ip, false);
interface_ip_set_enabled(&if_old->proto_ip, false);
- interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
- interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+ interface_ip_set_enabled(&if_old->proto_ip, proto_ip_enabled);
+ interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled);
}
- interface_write_resolv_conf();
+ if (update_prefix_delegation)
+ interface_update_prefix_delegation(&if_old->proto_ip);
+
+ interface_write_resolv_conf(if_old->jail);
+ if (if_old->main_dev.dev)
+ interface_check_state(if_old);
out:
if_new->config = NULL;
set_config_state(if_old, IFC_REMOVE);
} else if (node_new) {
D(INTERFACE, "Create interface '%s'\n", if_new->name);
+ interface_event(if_new, IFEV_CREATE);
proto_init_interface(if_new, if_new->config);
interface_claim_device(if_new);
netifd_ubus_add_interface(if_new);
projects / project / netifd.git / blobdiff