IFACE_ATTR_AUTO,
IFACE_ATTR_DEFAULTROUTE,
IFACE_ATTR_PEERDNS,
+ IFACE_ATTR_DNS,
+ IFACE_ATTR_DNS_SEARCH,
IFACE_ATTR_METRIC,
+ IFACE_ATTR_INTERFACE,
IFACE_ATTR_MAX
};
[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_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+};
+
+static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
+ [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
};
const struct config_param_list interface_attr_list = {
.n_params = IFACE_ATTR_MAX,
.params = iface_attrs,
+ .info = iface_attr_info,
};
static void
interface_event(struct interface *iface, enum interface_event ev)
{
struct interface_user *dep, *tmp;
+ struct device *adev = NULL;
list_for_each_entry_safe(dep, tmp, &iface->users, list)
dep->cb(dep, iface, ev);
list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
dep->cb(dep, iface, ev);
+
+ switch (ev) {
+ case IFEV_UP:
+ adev = iface->main_dev.dev;
+ /* fall through */
+ case IFEV_DOWN:
+ alias_notify_device(iface->name, adev);
+ break;
+ default:
+ break;
+ }
}
static void
interface_flush_state(struct interface *iface)
{
- if (iface->main_dev.dev)
- device_release(&iface->main_dev);
if (iface->l3_dev.dev)
device_release(&iface->l3_dev);
interface_data_flush(iface);
static void
mark_interface_down(struct interface *iface)
{
- if (iface->state == IFS_UP)
+ enum interface_state state = iface->state;
+
+ iface->state = IFS_DOWN;
+ if (state == IFS_UP)
interface_event(iface, IFEV_DOWN);
interface_ip_set_enabled(&iface->config_ip, false);
interface_ip_flush(&iface->proto_ip);
interface_flush_state(iface);
system_flush_routes();
- iface->state = IFS_DOWN;
}
void
}
interface_set_available(iface, new_state);
+ if (!new_state && dep->dev->external)
+ interface_set_main_dev(iface, NULL);
}
void
}
static void
+interface_alias_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
+{
+ struct interface *alias = container_of(dep, struct interface, parent_iface);
+ struct device *dev = iface->l3_dev.dev;
+
+ switch (ev) {
+ case IFEV_UP:
+ if (!dev)
+ return;
+
+ interface_set_main_dev(alias, dev);
+ interface_set_available(alias, true);
+ break;
+ case IFEV_DOWN:
+ interface_set_available(alias, false);
+ interface_set_main_dev(alias, NULL);
+ break;
+ case IFEV_FREE:
+ interface_remove_user(dep);
+ break;
+ case IFEV_RELOAD:
+ break;
+ }
+}
+
+static void
interface_claim_device(struct interface *iface)
{
- struct device *dev;
+ struct interface *parent;
+ struct device *dev = NULL;
+
+ if (iface->parent_iface.iface)
+ interface_remove_user(&iface->parent_iface);
- if (iface->ifname &&
+ if (iface->parent_ifname) {
+ parent = vlist_find(&interfaces, iface->parent_ifname, parent, node);
+ iface->parent_iface.cb = interface_alias_cb;
+ interface_add_user(&iface->parent_iface, parent);
+ } else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
- if (dev)
- interface_set_main_dev(iface, dev);
}
+
+ if (dev)
+ interface_set_main_dev(iface, dev);
+
if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
interface_set_available(iface, true);
}
{
struct interface_user *dep, *tmp;
+ if (iface->parent_iface.iface)
+ interface_remove_user(&iface->parent_iface);
+
list_for_each_entry_safe(dep, tmp, &iface->users, list)
interface_remove_user(dep);
interface_ip_flush(&iface->config_ip);
interface_flush_state(iface);
interface_clear_errors(iface);
- if (iface->main_dev.dev &&
- (!reload || !iface->main_dev.hotplug))
+
+ if (iface->main_dev.dev && !reload)
interface_set_main_dev(iface, NULL);
interface_set_proto_state(iface, NULL);
}
static void
interface_handle_config_change(struct interface *iface)
{
- switch(iface->config_state) {
+ enum interface_config_state state = iface->config_state;
+
+ iface->config_state = IFC_NORMAL;
+ switch(state) {
case IFC_NORMAL:
break;
case IFC_RELOAD:
iface->state = IFS_UP;
iface->start_time = system_get_rtime();
interface_event(iface, IFEV_UP);
- interface_write_resolv_conf();
netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
break;
case IFPEV_DOWN:
netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
mark_interface_down(iface);
+ if (iface->main_dev.dev)
+ device_release(&iface->main_dev);
interface_handle_config_change(iface);
break;
case IFPEV_LINK_LOST:
iface->state = IFS_SETUP;
break;
}
+
+ interface_write_resolv_conf();
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
iface->proto_ip.no_dns =
!blobmsg_get_bool_default(tb[IFACE_ATTR_PEERDNS], true);
+ if ((cur = tb[IFACE_ATTR_DNS]))
+ interface_add_dns_server_list(&iface->config_ip, cur);
+
+ if ((cur = tb[IFACE_ATTR_DNS_SEARCH]))
+ interface_add_dns_search_list(&iface->config_ip, cur);
+
+ if ((cur = tb[IFACE_ATTR_METRIC]))
+ iface->metric = blobmsg_get_u32(cur);
+
iface->config_autostart = iface->autostart;
}
-void
-interface_add(struct interface *iface, struct blob_attr *config)
+static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
{
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
- if ((cur = tb[IFACE_ATTR_IFNAME]))
- iface->ifname = blobmsg_data(cur);
+ if (alias) {
+ if ((cur = tb[IFACE_ATTR_INTERFACE]))
+ iface->parent_ifname = blobmsg_data(cur);
+
+ if (!iface->parent_ifname)
+ return false;
+ } else {
+ if ((cur = tb[IFACE_ATTR_IFNAME]))
+ iface->ifname = blobmsg_data(cur);
+ }
+
iface->config = config;
vlist_add(&interfaces, &iface->node, iface->name);
+ return true;
+}
+
+void
+interface_add(struct interface *iface, struct blob_attr *config)
+{
+ __interface_add(iface, config, false);
+}
+
+bool
+interface_add_alias(struct interface *iface, struct blob_attr *config)
+{
+ if (iface->proto_handler->flags & PROTO_FLAG_NODEV)
+ return false;
+
+ return __interface_add(iface, config, true);
}
void
}
static void
+interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_settings *old)
+{
+ vlist_simple_replace(&new->dns_servers, &old->dns_servers);
+ vlist_simple_replace(&new->dns_search, &old->dns_search);
+}
+
+static void
interface_change_config(struct interface *if_old, struct interface *if_new)
{
struct blob_attr *old_config = if_old->config;
const char *old_ifname = if_old->ifname;
+ const char *old_parent_ifname = if_old->parent_ifname;
const struct proto_handler *proto = if_old->proto_handler;
interface_clear_errors(if_old);
if (!if_old->config_autostart && if_new->config_autostart)
if_old->autostart = true;
+ if_old->device_config = if_new->device_config;
if_old->config_autostart = if_new->config_autostart;
if_old->ifname = if_new->ifname;
+ if_old->parent_ifname = if_new->parent_ifname;
if_old->proto_handler = if_new->proto_handler;
- if ((!!old_ifname != !!if_new->ifname) ||
- (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
- proto != if_new->proto_handler) {
+#define FIELD_CHANGED_STR(field) \
+ ((!!if_old->field != !!old_ ## field) || \
+ (old_ ## field && \
+ strcmp(old_ ## field, if_old->field) != 0))
+
+ if (FIELD_CHANGED_STR(parent_ifname)) {
+ if (if_old->parent_iface.iface)
+ interface_remove_user(&if_old->parent_iface);
+ goto reload;
+ }
+
+ if (FIELD_CHANGED_STR(ifname) || proto != if_new->proto_handler) {
D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
if_old->name);
goto reload;
interface_ip_set_enabled(&if_old->proto_ip, false);
interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
}
- if (UPDATE(proto_ip.no_dns))
- interface_write_resolv_conf();
+
+ UPDATE(proto_ip.no_dns);
+ interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
+ interface_write_resolv_conf();
#undef UPDATE
reload:
set_config_state(if_old, IFC_RELOAD);
out:
+ if_new->config = NULL;
+ interface_cleanup(if_new, false);
free(old_config);
free(if_new);
}
projects / project / netifd.git / blobdiff