ui: pb_kexec_data -> pb_boot_data

[petitboot] / ui / common / discover-client.c

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 7c2e27daa777a4ddbb8cb4e4063b090c70e8cc52..cd9f63a9f68f584bcc5b3f26976fd6d73269ad11 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -10,9 +10,9 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
-#include <log.h>
+#include <log/log.h>
 
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
 #include "pb-protocol/pb-protocol.h"
 
 struct discover_client {
@@ -33,7 +33,7 @@ static int discover_client_destructor(void *arg)
 }
 
 struct discover_client* discover_client_init(
-       const struct discover_client_ops *ops)
+       const struct discover_client_ops *ops, void *cb_arg)
 {
        struct discover_client *client;
        struct sockaddr_un addr;
@@ -43,9 +43,10 @@ struct discover_client* discover_client_init(
                return NULL;
 
        memcpy(&client->ops, ops, sizeof(client->ops));
+       client->ops.cb_arg = cb_arg;
 
        client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
-       if (!client->fd < 0) {
+       if (client->fd < 0) {
                pb_log("%s: socket: %s\n", __func__, strerror(errno));
                goto out_err;
        }
@@ -80,7 +81,7 @@ void discover_client_destroy(struct discover_client *client)
        talloc_free(client);
 }
 
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
 {
        client->n_devices++;
        client->devices = talloc_realloc(client, client->devices,
@@ -89,10 +90,10 @@ static void add_device(struct discover_client *client, struct device *device)
        client->devices[client->n_devices - 1] = device;
        talloc_steal(client, device);
 
-       client->ops.add_device(device, client->ops.cb_arg);
+       client->ops.device_add(device, client->ops.cb_arg);
 }
 
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
 {
        struct device *device = NULL;
        int i;
@@ -107,17 +108,17 @@ static void remove_device(struct discover_client *client, const char *id)
        if (!device)
                return;
 
-       client->ops.remove_device(device, client->ops.cb_arg);
-
-       talloc_free(device);
-
        /* remove the device from the client's device array */
        client->n_devices--;
        memmove(&client->devices[i], &client->devices[i+1],
-                       client->n_devices - i);
+                       (client->n_devices - i) * sizeof(client->devices[0]));
        client->devices = talloc_realloc(client, client->devices,
                        struct device *, client->n_devices);
 
+       /* notify the UI */
+       client->ops.device_remove(device, client->ops.cb_arg);
+
+       talloc_free(device);
 }
 
 int discover_client_process(struct discover_client *client)
@@ -139,7 +140,7 @@ int discover_client_process(struct discover_client *client)
                        return 0;
                }
 
-               add_device(client, dev);
+               device_add(client, dev);
                break;
        case PB_PROTOCOL_ACTION_REMOVE:
                dev_id = pb_protocol_deserialise_string(client, message);
@@ -147,7 +148,7 @@ int discover_client_process(struct discover_client *client)
                        pb_log("%s: no device id?\n", __func__);
                        return 0;
                }
-               remove_device(client, dev_id);
+               device_remove(client, dev_id);
                break;
        default:
                pb_log("%s: unknown action %d\n", __func__, message->action);