X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=6c803728511cb5ea523ee52f33668a7f6982c166;hp=e03a44a6ba8b564e306ff519169f2c74c7f22ea9;hb=b8122dc9340e2f208220f0c88b4d71f91b78774f;hpb=58821e4d5e593e4a828a1d79215e9480e9a6ca4f

diff --git a/discover/discover-server.c b/discover/discover-server.c
index e03a44a..6c80372 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -22,12 +22,14 @@
 
 struct discover_server {
 	int socket;
+	struct waitset *waitset;
 	struct waiter *waiter;
 	struct list clients;
 	struct device_handler *device_handler;
 };
 
 struct client {
+	struct discover_server *server;
 	struct list_item list;
 	int fd;
 };
@@ -66,12 +68,12 @@ static void print_clients(struct discover_server *server)
 {
 	struct client *client;
 
-	printf("current clients [%p,%p,%p]:\n",
+	pb_log("current clients [%p,%p,%p]:\n",
 			&server->clients.head,
 			server->clients.head.prev,
 			server->clients.head.next);
 	list_for_each_entry(&server->clients, client, list)
-		printf("\t[%p,%p,%p] client: %d\n", &client->list,
+		pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
 				client->list.prev, client->list.next,
 				client->fd);
 }
@@ -125,10 +127,36 @@ 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 boot_command *boot_command;
+	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;
+	}
+
+	boot_command = pb_protocol_deserialise_boot_command(client, message);
+	if (!boot_command) {
+		pb_log("%s: no boot command?", __func__);
+		return 0;
+	}
+
+	device_handler_boot(client->server->device_handler, boot_command);
+
+	return 0;
+}
+
+static int discover_server_process_connection(void *arg)
 {
 	struct discover_server *server = arg;
-	const struct device *devices;
 	struct client *client;
 	int fd, i, n_devices;
 
@@ -146,12 +174,19 @@ static int discover_server_process(void *arg)
 	talloc_set_destructor(client, client_destructor);
 
 	client->fd = fd;
+	client->server = server;
 
 	/* send existing devices to client */
-	n_devices = device_handler_get_current_devices(server->device_handler,
-			&devices);
-	for (i = 0; i < n_devices; i++)
-		write_add_message(server, client, &devices[i]);
+	n_devices = device_handler_get_device_count(server->device_handler);
+	for (i = 0; i < n_devices; i++) {
+		const struct device *device;
+
+		device = device_handler_get_device(server->device_handler, i);
+		write_add_message(server, client, device);
+	}
+
+	waiter_register(server->waitset, client->fd, WAIT_IN,
+			discover_server_process_message, client);
 
 	return 0;
 }
@@ -182,7 +217,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;
@@ -192,6 +227,7 @@ struct discover_server *discover_server_init(void)
 		return NULL;
 
 	server->waiter = NULL;
+	server->waitset = waitset;
 	list_init(&server->clients);
 
 	unlink(PB_SOCKET_PATH);
@@ -217,8 +253,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;