X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=80919fdf3da68088f20f7bca696efa1a5c39e6aa;hp=25dbd1476cdd9d6cf2ba817d74716d7944e40542;hb=37bff93c8b0a71432613f41f2319dc073ca64619;hpb=bc4114e2235163bd88456c25cc0a908d86151f93

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 25dbd14..80919fd 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -10,6 +10,7 @@
 #include <sys/un.h>
 #include <asm/byteorder.h>
 
+#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
 #include <log/log.h>
@@ -19,6 +20,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "platform.h"
 #include "sysinfo.h"
 
 struct discover_server {
@@ -34,6 +36,7 @@ struct client {
 	struct list_item list;
 	struct waiter *waiter;
 	int fd;
+	bool remote_closed;
 };
 
 
@@ -73,12 +76,12 @@ static void print_clients(struct discover_server *server)
 {
 	struct client *client;
 
-	pb_log("current clients [%p,%p,%p]:\n",
+	pb_debug("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)
-		pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
+		pb_debug("\t[%p,%p,%p] client: %d\n", &client->list,
 				client->list.prev, client->list.next,
 				client->fd);
 }
@@ -89,9 +92,12 @@ static int client_write_message(
 {
 	int rc;
 
+	if (client->remote_closed)
+		return -1;
+
 	rc = pb_protocol_write_message(client->fd, message);
 	if (rc)
-		talloc_free(client);
+		client->remote_closed = true;
 
 	return rc;
 }
@@ -186,11 +192,30 @@ static int write_system_info_message(struct discover_server *server,
 	return client_write_message(server, client, message);
 }
 
+static int write_config_message(struct discover_server *server,
+		struct client *client, const struct config *config)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_config_len(config);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_CONFIG, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_config(config, message->payload, len);
+
+	return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
 	struct pb_protocol_message *message;
 	struct boot_command *boot_command;
 	struct client *client = arg;
+	struct config *config;
 	int rc;
 
 	message = pb_protocol_read_message(client, client->fd);
@@ -220,6 +245,23 @@ static int discover_server_process_message(void *arg)
 		device_handler_cancel_default(client->server->device_handler);
 		break;
 
+	case PB_PROTOCOL_ACTION_REINIT:
+		device_handler_reinit(client->server->device_handler);
+		break;
+
+	case PB_PROTOCOL_ACTION_CONFIG:
+		config = talloc_zero(client, struct config);
+
+		rc = pb_protocol_deserialise_config(config, message);
+		if (rc) {
+			pb_log("%s: no config?", __func__);
+			return 0;
+		}
+
+		device_handler_update_config(client->server->device_handler,
+				config);
+		break;
+
 	default:
 		pb_log("%s: invalid action %d\n", __func__, message->action);
 		return 0;
@@ -250,12 +292,20 @@ static int discover_server_process_connection(void *arg)
 
 	client->fd = fd;
 	client->server = server;
+	client->waiter = waiter_register_io(server->waitset, client->fd,
+				WAIT_IN, discover_server_process_message,
+				client);
 
 	/* send sysinfo to client */
 	rc = write_system_info_message(server, client, system_info_get());
 	if (rc)
 		return 0;
 
+	/* send config to client */
+	rc = write_config_message(server, client, config_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++) {
@@ -275,10 +325,6 @@ static int discover_server_process_connection(void *arg)
 		}
 	}
 
-	client->waiter = waiter_register_io(server->waitset, client->fd,
-				WAIT_IN, discover_server_process_message,
-				client);
-
 	return 0;
 }
 
@@ -329,6 +375,15 @@ void discover_server_notify_system_info(struct discover_server *server,
 		write_system_info_message(server, client, sysinfo);
 }
 
+void discover_server_notify_config(struct discover_server *server,
+		const struct config *config)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_config_message(server, client, config);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
 		struct device_handler *handler)
 {