[discover client] Remove device from discover array before notifying UI

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

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 112fa65782e88e910e2ba3c11a03e1bb637b6ed2..ff0ab4031928155ce8ed35038b435ca022feb6a8 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -18,6 +18,8 @@
 struct discover_client {
        int fd;
        struct discover_client_ops ops;
 struct discover_client {
        int fd;
        struct discover_client_ops ops;

+       int n_devices;
+       struct device **devices;

 };
 
 static int discover_client_destructor(void *arg)
 };
 
 static int discover_client_destructor(void *arg)


@@ -30,7 +32,8 @@ static int discover_client_destructor(void *arg)
        return 0;
 }
 
        return 0;
 }
 

-struct discover_client* discover_client_init(struct discover_client_ops *ops)
+struct discover_client* discover_client_init(
+       const struct discover_client_ops *ops)

 {
        struct discover_client *client;
        struct sockaddr_un addr;
 {
        struct discover_client *client;
        struct sockaddr_un addr;


@@ -49,6 +52,9 @@ struct discover_client* discover_client_init(struct discover_client_ops *ops)
 
        talloc_set_destructor(client, discover_client_destructor);
 
 
        talloc_set_destructor(client, discover_client_destructor);
 

+       client->n_devices = 0;
+       client->devices = NULL;
+

        addr.sun_family = AF_UNIX;
        strcpy(addr.sun_path, PB_SOCKET_PATH);
 
        addr.sun_family = AF_UNIX;
        strcpy(addr.sun_path, PB_SOCKET_PATH);
 


@@ -64,7 +70,7 @@ out_err:
        return NULL;
 }
 
        return NULL;
 }
 

-int discover_client_get_fd(struct discover_client *client)
+int discover_client_get_fd(const struct discover_client *client)

 {
        return client->fd;
 }
 {
        return client->fd;
 }


@@ -74,6 +80,46 @@ void discover_client_destroy(struct discover_client *client)
        talloc_free(client);
 }
 
        talloc_free(client);
 }
 

+static void add_device(struct discover_client *client, struct device *device)
+{
+       client->n_devices++;
+       client->devices = talloc_realloc(client, client->devices,
+                       struct device *, client->n_devices);
+
+       client->devices[client->n_devices - 1] = device;
+       talloc_steal(client, device);
+
+       client->ops.add_device(device, client->ops.cb_arg);
+}
+
+static void remove_device(struct discover_client *client, const char *id)
+{
+       struct device *device = NULL;
+       int i;
+
+       for (i = 0; i < client->n_devices; i++) {
+               if (!strcmp(client->devices[i]->id, id)) {
+                       device = client->devices[i];
+                       break;
+               }
+       }
+
+       if (!device)
+               return;
+
+       /* 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->devices = talloc_realloc(client, client->devices,
+                       struct device *, client->n_devices);
+
+       /* notify the UI */
+       client->ops.remove_device(device, client->ops.cb_arg);
+
+       talloc_free(device);
+}
+

 int discover_client_process(struct discover_client *client)
 {
        struct pb_protocol_message *message;
 int discover_client_process(struct discover_client *client)
 {
        struct pb_protocol_message *message;


@@ -92,8 +138,8 @@ int discover_client_process(struct discover_client *client)
                        pb_log("%s: no device?\n", __func__);
                        return 0;
                }
                        pb_log("%s: no device?\n", __func__);
                        return 0;
                }

-               client->ops.add_device(dev, client->ops.cb_arg);
-               talloc_free(dev);
+
+               add_device(client, dev);

                break;
        case PB_PROTOCOL_ACTION_REMOVE:
                dev_id = pb_protocol_deserialise_string(client, message);
                break;
        case PB_PROTOCOL_ACTION_REMOVE:
                dev_id = pb_protocol_deserialise_string(client, message);


@@ -101,7 +147,7 @@ int discover_client_process(struct discover_client *client)
                        pb_log("%s: no device id?\n", __func__);
                        return 0;
                }
                        pb_log("%s: no device id?\n", __func__);
                        return 0;
                }

-               client->ops.remove_device(dev_id, client->ops.cb_arg);
+               remove_device(client, dev_id);

                break;
        default:
                pb_log("%s: unknown action %d\n", __func__, message->action);
                break;
        default:
                pb_log("%s: unknown action %d\n", __func__, message->action);


@@ -110,3 +156,18 @@ int discover_client_process(struct discover_client *client)
 
        return 0;
 }
 
        return 0;
 }

+
+/* accessors for discovered devices */
+int discover_client_device_count(struct discover_client *client)
+{
+       return client->n_devices;
+}
+
+struct device *discover_client_get_device(struct discover_client *client,
+               int index)
+{
+       if (index < 0 || index >= client->n_devices)
+               return NULL;
+
+       return client->devices[index];
+}