We want the network code's network interfaces to (potentially) persist
remove events. For example, discover devices may be removed by a user
event (this happens during a udhcpc deconfig). In this case, we want the
boot options to be removed, but the struct interface needs to stay
present.
This change adds network_(un)_register_device functions, to allow the
device handler to detach from and attach to interfaces.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
+ /* if this is a network device, we have to unregister it from the
+ * network code */
+ if (device->device->type == DEVICE_TYPE_NETWORK)
+ network_unregister_device(handler->network, device);
+
handler->n_devices--;
memmove(&handler->devices[i], &handler->devices[i + 1],
(handler->n_devices - i) * sizeof(handler->devices[0]));
handler->n_devices--;
memmove(&handler->devices[i], &handler->devices[i + 1],
(handler->n_devices - i) * sizeof(handler->devices[0]));
struct discover_device *, handler->n_devices);
handler->devices[handler->n_devices - 1] = device;
struct discover_device *, handler->n_devices);
handler->devices[handler->n_devices - 1] = device;
+ if (device->device->type == DEVICE_TYPE_NETWORK)
+ network_register_device(handler->network, device);
}
/* Start discovery on a hotplugged device. The device will be in our devices
}
/* Start discovery on a hotplugged device. The device will be in our devices
+static struct interface *find_interface_by_name(struct network *network,
+ const char *name)
+{
+ struct interface *interface;
+
+ list_for_each_entry(&network->interfaces, interface, list)
+ if (!strcmp(interface->name, name))
+ return interface;
+
+ return NULL;
+}
+
static int network_init_netlink(struct network *network)
{
struct sockaddr_nl addr;
static int network_init_netlink(struct network *network)
{
struct sockaddr_nl addr;
static void remove_interface(struct network *network,
struct interface *interface)
{
static void remove_interface(struct network *network,
struct interface *interface)
{
- device_handler_remove(network->handler, interface->dev);
+ if (interface->dev)
+ device_handler_remove(network->handler, interface->dev);
list_remove(&interface->list);
talloc_free(interface);
}
list_remove(&interface->list);
talloc_free(interface);
}
+void network_register_device(struct network *network,
+ struct discover_device *dev)
+{
+ struct interface *iface;
+
+ iface = find_interface_by_name(network, dev->device->id);
+ if (!iface)
+ return;
+
+ iface->dev = dev;
+ dev->uuid = mac_bytes_to_string(iface->dev, iface->hwaddr,
+ sizeof(iface->hwaddr));
+}
+
+void network_unregister_device(struct network *network,
+ struct discover_device *dev)
+{
+ struct interface *iface;
+
+ iface = find_interface_by_name(network, dev->device->id);
+ if (!iface)
+ return;
+
+ iface->dev = NULL;
+}
+
static int interface_change(struct interface *interface, bool up)
{
const char *statestr = up ? "up" : "down";
static int interface_change(struct interface *interface, bool up)
{
const char *statestr = up ? "up" : "down";
struct network;
struct device_handler;
struct network;
struct device_handler;
struct waitset;
struct network *network_init(struct device_handler *handler,
struct waitset *waitset, bool dry_run);
int network_shutdown(struct network *network);
struct waitset;
struct network *network_init(struct device_handler *handler,
struct waitset *waitset, bool dry_run);
int network_shutdown(struct network *network);
+void network_register_device(struct network *network,
+ struct discover_device *dev);
+void network_unregister_device(struct network *network,
+ struct discover_device *dev);
+