discover/network: Ignore interfaces with pre-existing MAC address

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 69223b149adacd0c133beb06de88d06300e324a4..8ca4561614f866fc1c45ef77f44ffc03c8c7fd85 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -214,13 +214,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 +241,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;
 
@@ -495,7 +497,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;
@@ -560,7 +562,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 */
@@ -579,6 +592,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);