X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=bafcb77630ec9379b48eb3c8bb2ddc80c0c50ef1;hp=8358f06a320a9e716e10318740326de52f6fdd94;hb=01ed80939b8ed440390729c524ad875047dbd406;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 8358f06..bafcb77 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -11,18 +11,21 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
+#include <log/log.h>
 
-#include "ui/common/device.h"
 #include "pb-protocol/pb-protocol.h"
 #include "list/list.h"
 
-#include "log.h"
-#include "waiter.h"
+#include "device-handler.h"
+#include "discover-server.h"
 
 struct discover_server {
 	int socket;
+	struct waitset *waitset;
 	struct waiter *waiter;
 	struct list clients;
+	struct device_handler *device_handler;
 };
 
 struct client {
@@ -36,7 +39,7 @@ static int server_destructor(void *arg)
 	struct discover_server *server = arg;
 
 	if (server->waiter)
-		waiter_unregister(server->waiter);
+		waiter_remove(server->waiter);
 
 	if (server->socket >= 0)
 		close(server->socket);
@@ -64,36 +67,18 @@ 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);
 }
 
-static struct boot_option options[] = {
-	{
-		.id = "1.1",
-		.name = "meep one",
-		.description = "meep description one",
-		.icon_file = "meep.one.png",
-		.boot_args = "root=/dev/sda1",
-	},
-};
-
-static struct device device = {
-	.id = "1",
-	.name = "meep",
-	.description = "meep description",
-	.icon_file = "meep.png",
-	.n_options = 1,
-	.options = options,
-};
-
-static int client_write_message(struct discover_server *server,
+static int client_write_message(
+		struct discover_server *server __attribute__((unused)),
 		struct client *client, struct pb_protocol_message *message)
 {
 	int rc;
@@ -106,7 +91,7 @@ static int client_write_message(struct discover_server *server,
 }
 
 static int write_add_message(struct discover_server *server,
-		struct client *client, struct device *dev)
+		struct client *client, const struct device *dev)
 {
 	struct pb_protocol_message *message;
 	int len;
@@ -141,14 +126,30 @@ 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 discover_server *server = arg;
-	struct client *client;
-	int fd;
+	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;
+	}
 
-	len = sizeof(addr);
+	/* todo: process boot message */
+	return 0;
+}
+
+static int discover_server_process_connection(void *arg)
+{
+	struct discover_server *server = arg;
+	struct client *client;
+	int fd, i, n_devices;
 
 	/* accept the incoming connection */
 	fd = accept(server->socket, NULL, 0);
@@ -166,16 +167,47 @@ static int discover_server_process(void *arg)
 	client->fd = fd;
 
 	/* send existing devices to client */
-	write_add_message(server, client, &device);
+	n_devices = device_handler_get_device_count(server->device_handler);
+	for (i = 0; i < n_devices; i++) {
+		const struct device *device;
 
-	sleep(2);
+		device = device_handler_get_device(server->device_handler, i);
+		write_add_message(server, client, device);
+	}
 
-	write_remove_message(server, client, "1");
+	waiter_register(server->waitset, client->fd, WAIT_IN,
+			discover_server_process_message, client);
 
 	return 0;
 }
 
-struct discover_server *discover_server_init(void)
+void discover_server_notify_add(struct discover_server *server,
+		struct device *device)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_add_message(server, client, device);
+
+}
+
+void discover_server_notify_remove(struct discover_server *server,
+		struct device *device)
+{
+	struct client *client;
+
+	list_for_each_entry(&server->clients, client, list)
+		write_remove_message(server, client, device->id);
+
+}
+
+void discover_server_set_device_source(struct discover_server *server,
+		struct device_handler *handler)
+{
+	server->device_handler = handler;
+}
+
+struct discover_server *discover_server_init(struct waitset *waitset)
 {
 	struct discover_server *server;
 	struct sockaddr_un addr;
@@ -185,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);
@@ -210,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;