lib/waiter: Add timeout waiters

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

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 42aa9de9a950a3877a7b3dad8c96b96d47305373..107d0314d2de24f563e6c87bbe0d66ec4f733330 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -110,10 +110,19 @@ static void device_remove(struct discover_client *client, const char *id)
        talloc_free(device);
 }
 
+static void update_status(struct discover_client *client,
+               struct boot_status *status)
+{
+       if (client->ops.update_status)
+               client->ops.update_status(status, client->ops.cb_arg);
+       talloc_free(status);
+}
+
 static int discover_client_process(void *arg)
 {
        struct discover_client *client = arg;
        struct pb_protocol_message *message;
+       struct boot_status *status;
        struct boot_option *opt;
        struct device *dev;
        char *dev_id;
@@ -156,6 +165,16 @@ static int discover_client_process(void *arg)
                }
                device_remove(client, dev_id);
                break;
+       case PB_PROTOCOL_ACTION_STATUS:
+               status = talloc_zero(client, struct boot_status);
+
+               rc = pb_protocol_deserialise_boot_status(status, message);
+               if (rc) {
+                       pb_log("%s: invalid status message?\n", __func__);
+                       return 0;
+               }
+               update_status(client, status);
+               break;
        default:
                pb_log("%s: unknown action %d\n", __func__, message->action);
        }
@@ -196,8 +215,8 @@ struct discover_client* discover_client_init(struct waitset *waitset,
                goto out_err;
        }
 
-       waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
-                       client);
+       waiter_register_io(waitset, client->fd, WAIT_IN,
+                       discover_client_process, client);
 
        return client;