IFACE_ATTR_DNS_SEARCH,
IFACE_ATTR_METRIC,
IFACE_ATTR_INTERFACE,
+ IFACE_ATTR_IP6ASSIGN,
+ IFACE_ATTR_IP6HINT,
IFACE_ATTR_MAX
};
[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 },
+ [IFACE_ATTR_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 },
+ [IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING },
};
static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
struct interface_error *error;
int i, len = 0;
int *datalen = NULL;
- char *dest;
+ char *dest, *d_subsys, *d_code;
if (n_data) {
len = n_data * sizeof(char *);
}
}
- error = calloc(1, sizeof(*error) + sizeof(char *) + len);
+ error = calloc_a(sizeof(*error) + sizeof(char *) + len,
+ &d_subsys, subsystem ? strlen(subsystem) + 1 : 0,
+ &d_code, code ? strlen(code) + 1 : 0);
if (!error)
return;
list_add_tail(&error->list, &iface->errors);
- error->subsystem = subsystem;
- error->code = code;
dest = (char *) &error->data[n_data + 1];
for (i = 0; i < n_data; i++) {
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);
+
+ if (code)
+ error->code = strcpy(d_code, code);
}
static void
switch (ev) {
case IFEV_UP:
- adev = iface->main_dev.dev;
+ adev = iface->l3_dev.dev;
/* fall through */
case IFEV_DOWN:
alias_notify_device(iface->name, adev);
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);
void
__interface_set_down(struct interface *iface, bool force)
{
- interface_clear_errors(iface);
-
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
return;
interface_set_available(iface, true);
}
+static void
+interface_cleanup_state(struct interface *iface)
+{
+ interface_flush_state(iface);
+ interface_clear_errors(iface);
+ interface_set_proto_state(iface, NULL);
+}
static void
-interface_cleanup(struct interface *iface, bool reload)
+interface_cleanup(struct interface *iface)
{
struct interface_user *dep, *tmp;
interface_remove_user(dep);
interface_ip_flush(&iface->config_ip);
- interface_flush_state(iface);
- interface_clear_errors(iface);
-
- if (iface->main_dev.dev && !reload)
+ if (iface->main_dev.dev)
interface_set_main_dev(iface, NULL);
- interface_set_proto_state(iface, NULL);
+
+ interface_cleanup_state(iface);
}
static void
interface_do_free(struct interface *iface)
{
interface_event(iface, IFEV_FREE);
- interface_cleanup(iface, false);
+ interface_cleanup(iface);
free(iface->config);
netifd_ubus_remove_interface(iface);
avl_delete(&interfaces.avl, &iface->node.avl);
interface_do_reload(struct interface *iface)
{
interface_event(iface, IFEV_RELOAD);
- interface_cleanup(iface, true);
+ interface_cleanup_state(iface);
proto_init_interface(iface, iface->config);
interface_claim_device(iface);
}
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)
if ((cur = tb[IFACE_ATTR_METRIC]))
iface->metric = blobmsg_get_u32(cur);
+ if ((cur = tb[IFACE_ATTR_IP6ASSIGN]))
+ iface->config_ip.assignment_length = blobmsg_get_u32(cur);
+
+ iface->config_ip.assignment_hint = -1;
+ if ((cur = tb[IFACE_ATTR_IP6HINT]))
+ iface->config_ip.assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
+ ~((1 << (64 - iface->config_ip.assignment_length)) - 1);
+
iface->config_autostart = iface->autostart;
}
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->proto_ip.no_dns = if_new->proto_ip.no_dns;
+ interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
+
#define FIELD_CHANGED_STR(field) \
((!!if_old->field != !!old_ ## field) || \
(old_ ## field && \
interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
}
- UPDATE(proto_ip.no_dns);
- interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
+ if (UPDATE(config_ip.assignment_length) || UPDATE(config_ip.assignment_hint))
+ interface_refresh_assignments(true);
+
interface_write_resolv_conf();
#undef UPDATE
set_config_state(if_old, IFC_RELOAD);
out:
if_new->config = NULL;
- interface_cleanup(if_new, false);
+ interface_cleanup(if_new);
free(old_config);
free(if_new);
}