X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=bafcb77630ec9379b48eb3c8bb2ddc80c0c50ef1;hb=16ebe978aeced862dd877cfee81ac7604902fd55;hp=f4e96c046927bd1e0709d7ea78a621fd3da4f26c;hpb=1eaa67c4bd124bd9e786c64c95f4fb1f3570482b;p=petitboot

diff --git a/discover/discover-server.c b/discover/discover-server.c
index f4e96c0..bafcb77 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -22,6 +22,7 @@
 
 struct discover_server {
 	int socket;
+	struct waitset *waitset;
 	struct waiter *waiter;
 	struct list clients;
 	struct device_handler *device_handler;
@@ -125,7 +126,26 @@ static int write_remove_message(struct discover_server *server,
 	return client_write_message(server, client, message);
 }
 
-static int discover_server_process(void *arg)
+static int discover_server_process_message(void *arg)
+{
+	struct pb_protocol_message *message;
+	struct client *client = arg;
+
+	message = pb_protocol_read_message(client, client->fd);
+
+	if (!message)
+		return 0;
+
+	if (message->action != PB_PROTOCOL_ACTION_BOOT) {
+		pb_log("%s: invalid action %d\n", __func__, message->action);
+		return 0;
+	}
+
+	/* todo: process boot message */
+	return 0;
+}
+
+static int discover_server_process_connection(void *arg)
 {
 	struct discover_server *server = arg;
 	struct client *client;
@@ -155,6 +175,9 @@ static int discover_server_process(void *arg)
 		write_add_message(server, client, device);
 	}
 
+	waiter_register(server->waitset, client->fd, WAIT_IN,
+			discover_server_process_message, client);
+
 	return 0;
 }
 
@@ -184,7 +207,7 @@ void discover_server_set_device_source(struct discover_server *server,
 	server->device_handler = handler;
 }
 
-struct discover_server *discover_server_init(void)
+struct discover_server *discover_server_init(struct waitset *waitset)
 {
 	struct discover_server *server;
 	struct sockaddr_un addr;
@@ -194,6 +217,7 @@ struct discover_server *discover_server_init(void)
 		return NULL;
 
 	server->waiter = NULL;
+	server->waitset = waitset;
 	list_init(&server->clients);
 
 	unlink(PB_SOCKET_PATH);
@@ -219,8 +243,8 @@ struct discover_server *discover_server_init(void)
 		goto out_err;
 	}
 
-	server->waiter = waiter_register(server->socket, WAIT_IN,
-			discover_server_process, server);
+	server->waiter = waiter_register(server->waitset, server->socket,
+			WAIT_IN, discover_server_process_connection, server);
 
 	return server;