projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: protect device event broadcast against simultaneous deletions of multiple...
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
2456227
..
b304e00
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-79,7
+79,7
@@
void interface_add_error(struct interface *iface, const char *subsystem,
struct interface_error *error;
int i, len = 0;
int *datalen = NULL;
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 *);
if (n_data) {
len = n_data * sizeof(char *);
@@
-90,13
+90,13
@@
void interface_add_error(struct interface *iface, const char *subsystem,
}
}
}
}
- 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);
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++) {
dest = (char *) &error->data[n_data + 1];
for (i = 0; i < n_data; i++) {
@@
-104,7
+104,13
@@
void interface_add_error(struct interface *iface, const char *subsystem,
memcpy(dest, data[i], datalen[i]);
dest += datalen[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
}
static void
@@
-157,7
+163,7
@@
interface_event(struct interface *iface, enum interface_event ev)
switch (ev) {
case IFEV_UP:
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);
/* fall through */
case IFEV_DOWN:
alias_notify_device(iface->name, adev);
@@
-192,8
+198,6
@@
mark_interface_down(struct interface *iface)
void
__interface_set_down(struct interface *iface, bool force)
{
void
__interface_set_down(struct interface *iface, bool force)
{
- interface_clear_errors(iface);
-
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
return;
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
return;
@@
-317,9
+321,16
@@
interface_claim_device(struct interface *iface)
interface_set_available(iface, true);
}
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
static void
-interface_cleanup(struct interface *iface
, bool reload
)
+interface_cleanup(struct interface *iface)
{
struct interface_user *dep, *tmp;
{
struct interface_user *dep, *tmp;
@@
-330,19
+341,17
@@
interface_cleanup(struct interface *iface, bool reload)
interface_remove_user(dep);
interface_ip_flush(&iface->config_ip);
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_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);
}
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);
free(iface->config);
netifd_ubus_remove_interface(iface);
avl_delete(&interfaces.avl, &iface->node.avl);
@@
-353,7
+362,7
@@
static void
interface_do_reload(struct interface *iface)
{
interface_event(iface, IFEV_RELOAD);
interface_do_reload(struct interface *iface)
{
interface_event(iface, IFEV_RELOAD);
- interface_cleanup
(iface, tru
e);
+ interface_cleanup
_state(ifac
e);
proto_init_interface(iface, iface->config);
interface_claim_device(iface);
}
proto_init_interface(iface, iface->config);
interface_claim_device(iface);
}
@@
-393,7
+402,6
@@
interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
iface->state = IFS_UP;
iface->start_time = system_get_rtime();
interface_event(iface, IFEV_UP);
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 up\n", iface->name);
break;
case IFPEV_DOWN:
@@
-415,6
+423,8
@@
interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
iface->state = IFS_SETUP;
break;
}
iface->state = IFS_SETUP;
break;
}
+
+ interface_write_resolv_conf();
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
@@
-702,6
+712,9
@@
interface_change_config(struct interface *if_old, struct interface *if_new)
if_old->parent_ifname = if_new->parent_ifname;
if_old->proto_handler = if_new->proto_handler;
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 && \
#define FIELD_CHANGED_STR(field) \
((!!if_old->field != !!old_ ## field) || \
(old_ ## field && \
@@
-742,8
+755,6
@@
interface_change_config(struct interface *if_old, struct interface *if_new)
interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
}
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);
interface_write_resolv_conf();
#undef UPDATE
interface_write_resolv_conf();
#undef UPDATE
@@
-754,7
+765,7
@@
reload:
set_config_state(if_old, IFC_RELOAD);
out:
if_new->config = NULL;
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);
}
free(old_config);
free(if_new);
}