discover-client: interact directly with waitset

Currently, clients need to mess with the discover client fd directly,
and manually register the waiter.

Instead, this change adds a waitset parameter to
discover_client_register, so that the discover client can register
itself, and call discover_client_process directly. This means no proxy
handlers, and no casts to waiter callbacks.

We can also get rid of discover_client_get_fd.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 2 insertions, 12 deletions

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 6e768d9..6d5d1c4 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -2,6 +2,7 @@
 #define _DISCOVER_CLIENT_H
 
 #include <types/types.h>
+#include <waiter/waiter.h>
 
 struct discover_client;
 
@@ -24,23 +25,12 @@ struct discover_client_ops {
 	void *cb_arg;
 };
 
-struct discover_client *discover_client_init(
+struct discover_client *discover_client_init(struct waitset *waitset,
 	const struct discover_client_ops *ops, void *cb_arg);
 
-int discover_client_get_fd(const struct discover_client *client);
-
 void discover_client_destroy(struct discover_client *client);
 
 /**
- * Process data from the server.
- *
- * Will read from the client socket, and call device_add on any discovered
- * devices.
- * 
- */
-int discover_client_process(struct discover_client *client);
-
-/**
  * Get the number of devices that the discover client has stored. This
  * is the set of devices that have been added and not removed
  *