discover: Add helpers for status reporting

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 0dad087bb4199a3d2ed15510bad1f0b43cc1f1ab..1851fedc616fdb5da9119d23947a74e31a93b6ea 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -65,6 +65,25 @@ struct network {
        bool                    dry_run;
 };
 
+static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
+{
+       const int l = strlen("xx:");
+       char *buf;
+       int i;
+
+       if (len <= 0)
+               return talloc_strdup(ctx, "");
+
+       buf = talloc_array(ctx, char, (len * l) + 1);
+
+       for (i = 0; i < len; i++)
+               sprintf(buf + (l * i), "%02x:", addr[i]);
+
+       *(buf + (l * len) - 1) = '\0';
+
+       return buf;
+}
+
 static const struct interface_config *find_config_by_hwaddr(
                uint8_t *hwaddr)
 {
@@ -109,6 +128,25 @@ static struct interface *find_interface_by_name(struct network *network,
        return NULL;
 }
 
+static struct interface *find_interface_by_uuid(struct network *network,
+               const char *uuid)
+{
+       struct interface *interface;
+       char *mac;
+
+       list_for_each_entry(&network->interfaces, interface, list) {
+               mac = mac_bytes_to_string(interface, interface->hwaddr,
+                                       sizeof(interface->hwaddr));
+               if (!strcmp(mac, uuid)) {
+                       talloc_free(mac);
+                       return interface;
+               }
+               talloc_free(mac);
+       }
+
+       return NULL;
+}
+
 uint8_t *find_mac_by_name(void *ctx, struct network *network,
                const char *name)
 {
@@ -175,35 +213,18 @@ static int network_send_link_query(struct network *network)
        return 0;
 }
 
-static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
-{
-       const int l = strlen("xx:");
-       char *buf;
-       int i;
-
-       if (len <= 0)
-               return talloc_strdup(ctx, "");
-
-       buf = talloc_array(ctx, char, (len * l) + 1);
-
-       for (i = 0; i < len; i++)
-               sprintf(buf + (l * i), "%02x:", addr[i]);
-
-       *(buf + (l * len) - 1) = '\0';
-
-       return buf;
-}
-
 static void add_interface(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,
-                                       interface->name);
+       interface->dev = discover_device_create(network->handler, uuid,
+                                               interface->name);
        interface->dev->device->type = DEVICE_TYPE_NETWORK;
-       interface->dev->uuid = mac_bytes_to_string(interface->dev,
-                       interface->hwaddr, sizeof(interface->hwaddr));
        device_handler_add_device(network->handler, interface->dev);
+       talloc_free(uuid);
 }
 
 static void remove_interface(struct network *network,
@@ -220,7 +241,7 @@ void network_register_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_name(network, dev->device->id);
+       iface = find_interface_by_uuid(network, dev->uuid);
        if (!iface)
                return;
 
@@ -234,7 +255,7 @@ void network_unregister_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_name(network, dev->device->id);
+       iface = find_interface_by_uuid(network, dev->uuid);
        if (!iface)
                return;
 
@@ -336,7 +357,8 @@ static void configure_interface_dhcp(struct interface *interface)
        return;
 }
 
-static void configure_interface_static(struct interface *interface,
+static void configure_interface_static(struct network *network,
+               struct interface *interface,
                const struct interface_config *config)
 {
        int rc;
@@ -370,6 +392,16 @@ static void configure_interface_static(struct interface *interface,
                                interface->name);
        }
 
+       if (config->static_config.url) {
+               pb_log("config URL %s\n", config->static_config.url);
+               device_handler_process_url(network->handler,
+                               config->static_config.url,
+                               mac_bytes_to_string(interface->dev,
+                                               interface->hwaddr,
+                                               sizeof(interface->hwaddr)),
+                               config->static_config.address);
+       }
+
        return;
 }
 
@@ -387,8 +419,11 @@ static void configure_interface(struct network *network,
                        interface->state = IFSTATE_NEW;
                else if (!link)
                        interface->state = IFSTATE_UP_WAITING_LINK;
-               else
+               else {
+                       pb_debug("network: skipping configured interface %s\n",
+                                       interface->name);
                        return;
+               }
        }
 
        /* always up the lookback, no other handling required */
@@ -438,8 +473,10 @@ static void configure_interface(struct network *network,
                configure_interface_dhcp(interface);
 
        } else if (config->method == CONFIG_METHOD_STATIC) {
-               configure_interface_static(interface, config);
+               configure_interface_static(network, interface, config);
        }
+
+       interface->state = IFSTATE_CONFIGURED;
 }
 
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
@@ -499,6 +536,9 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
                return 0;
        }
 
+       /* ignore the default tun device in some environments */
+       if (strncmp(ifname, "tun", strlen("tun")) == 0)
+               return 0;
 
        interface = find_interface_by_ifindex(network, info->ifi_index);
        if (!interface) {