X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=25dbd1476cdd9d6cf2ba817d74716d7944e40542;hb=6d1eff1e8e1db12e7aa179e8dc9c65050c045536;hp=4ba91eeba5526c3ce85bd87e4c181fe542a434af;hpb=57ee6ff66071deb4e03f414ed00433061b8bef93;p=petitboot

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 4ba91ee..25dbd14 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -19,6 +19,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "sysinfo.h"
 
 struct discover_server {
 	int socket;
@@ -167,6 +168,24 @@ static int write_boot_status_message(struct discover_server *server,
 	return client_write_message(server, client, message);
 }
 
+static int write_system_info_message(struct discover_server *server,
+		struct client *client, const struct system_info *sysinfo)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_system_info_len(sysinfo);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_SYSTEM_INFO, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_system_info(sysinfo, message->payload, len);
+
+	return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
 	struct pb_protocol_message *message;
@@ -182,20 +201,30 @@ static int discover_server_process_message(void *arg)
 	}
 
 
-	if (message->action != PB_PROTOCOL_ACTION_BOOT) {
-		pb_log("%s: invalid action %d\n", __func__, message->action);
-		return 0;
-	}
+	switch (message->action) {
+	case PB_PROTOCOL_ACTION_BOOT:
+		boot_command = talloc(client, struct boot_command);
+
+		rc = pb_protocol_deserialise_boot_command(boot_command,
+				message);
+		if (rc) {
+			pb_log("%s: no boot command?", __func__);
+			return 0;
+		}
 
-	boot_command = talloc(client, struct boot_command);
+		device_handler_boot(client->server->device_handler,
+				boot_command);
+		break;
 
-	rc = pb_protocol_deserialise_boot_command(boot_command, message);
-	if (rc) {
-		pb_log("%s: no boot command?", __func__);
+	case PB_PROTOCOL_ACTION_CANCEL_DEFAULT:
+		device_handler_cancel_default(client->server->device_handler);
+		break;
+
+	default:
+		pb_log("%s: invalid action %d\n", __func__, message->action);
 		return 0;
 	}
 
-	device_handler_boot(client->server->device_handler, boot_command);
 
 	return 0;
 }
@@ -222,6 +251,11 @@ static int discover_server_process_connection(void *arg)
 	client->fd = fd;
 	client->server = server;
 
+	/* send sysinfo to client */
+	rc = write_system_info_message(server, client, system_info_get());
+	if (rc)
+		return 0;
+
 	/* send existing devices to client */
 	n_devices = device_handler_get_device_count(server->device_handler);
 	for (i = 0; i < n_devices; i++) {
@@ -241,8 +275,9 @@ static int discover_server_process_connection(void *arg)
 		}
 	}
 
-	client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,
-				discover_server_process_message, client);
+	client->waiter = waiter_register_io(server->waitset, client->fd,
+				WAIT_IN, discover_server_process_message,
+				client);
 
 	return 0;
 }
@@ -285,6 +320,15 @@ void discover_server_notify_boot_status(struct discover_server *server,
 		write_boot_status_message(server, client, status);
 }
 
+void discover_server_notify_system_info(struct discover_server *server,
+		const struct system_info *sysinfo)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_system_info_message(server, client, sysinfo);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
 		struct device_handler *handler)
 {
@@ -327,7 +371,7 @@ struct discover_server *discover_server_init(struct waitset *waitset)
 		goto out_err;
 	}
 
-	server->waiter = waiter_register(server->waitset, server->socket,
+	server->waiter = waiter_register_io(server->waitset, server->socket,
 			WAIT_IN, discover_server_process_connection, server);
 
 	return server;