discover/device-handler: Allow process_url request to be pending

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 51a846af8a0c6ae8e75582f1eea619a75e8c1eb7..5035b7ce0895cfe0f2a3c12992ca0d1d57c06f24 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -23,6 +23,7 @@
 #include "sysinfo.h"
 #include "platform.h"
 #include "device-handler.h"
+#include "paths.h"
 
 #define HWADDR_SIZE    6
 #define PIDFILE_BASE   (LOCAL_STATE_DIR "/petitboot/")
@@ -214,13 +215,12 @@ static int network_send_link_query(struct network *network)
        return 0;
 }
 
-static void add_interface(struct network *network,
+static void create_interface_dev(struct network *network,
                struct interface *interface)
 {
        char *uuid = mac_bytes_to_string(interface, interface->hwaddr,
                                                sizeof(interface->hwaddr));
 
-       list_add(&network->interfaces, &interface->list);
        interface->dev = discover_device_create(network->handler, uuid,
                                                interface->name);
        interface->dev->device->type = DEVICE_TYPE_NETWORK;
@@ -242,7 +242,10 @@ void network_register_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_uuid(network, dev->uuid);
+       if (dev->uuid)
+               iface = find_interface_by_uuid(network, dev->uuid);
+       else
+               iface = find_interface_by_name(network, dev->label);
        if (!iface)
                return;
 
@@ -384,6 +387,10 @@ static void configure_interface_static(struct network *network,
                return;
        }
 
+       system_info_set_interface_address(sizeof(interface->hwaddr),
+                               interface->hwaddr,
+                               config->static_config.address);
+
        /* we need the interface up before we can route through it */
        rc = interface_up(interface);
        if (rc)
@@ -483,6 +490,8 @@ static void configure_interface(struct network *network,
 
        } else if (config->method == CONFIG_METHOD_STATIC) {
                configure_interface_static(network, interface, config);
+               /* Nothing left to do for static interfaces */
+               pending_network_jobs_start();
        }
 
        interface->state = IFSTATE_CONFIGURED;
@@ -491,7 +500,7 @@ static void configure_interface(struct network *network,
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 {
        bool have_ifaddr, have_ifname;
-       struct interface *interface;
+       struct interface *interface, *tmp;
        struct ifinfomsg *info;
        struct rtattr *attr;
        unsigned int mtu;
@@ -556,7 +565,18 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
                interface->state = IFSTATE_NEW;
                memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
                strncpy(interface->name, ifname, sizeof(interface->name) - 1);
-               add_interface(network, interface);
+
+               list_for_each_entry(&network->interfaces, tmp, list)
+                       if (memcmp(interface->hwaddr, tmp->hwaddr,
+                                  sizeof(interface->hwaddr)) == 0) {
+                               pb_log("%s: %s has duplicate MAC address, ignoring\n",
+                                      __func__, interface->name);
+                               talloc_free(interface);
+                               return -1;
+                       }
+
+               list_add(&network->interfaces, &interface->list);
+               create_interface_dev(network, interface);
        }
 
        /* A repeated RTM_NEWLINK can represent an interface name change */
@@ -575,6 +595,9 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
                                interface->hwaddr, interface->name,
                                info->ifi_flags & IFF_LOWER_UP);
 
+       if (!interface->dev)
+               create_interface_dev(network, interface);
+
        configure_interface(network, interface,
                        info->ifi_flags & IFF_UP,
                        info->ifi_flags & IFF_LOWER_UP);