X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=47ab4945e2df3071b2f35899cdff48b9badd0f50;hp=8358f06a320a9e716e10318740326de52f6fdd94;hb=0967cb518d764990eaebc51cb987cf4444a5afd3;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 8358f06..47ab494 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -11,18 +11,20 @@
 #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 waiter *waiter;
 	struct list clients;
+	struct device_handler *device_handler;
 };
 
 struct client {
@@ -36,7 +38,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 +66,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 +90,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;
@@ -144,11 +128,9 @@ static int write_remove_message(struct discover_server *server,
 static int discover_server_process(void *arg)
 {
 	struct discover_server *server = arg;
+	const struct device *devices;
 	struct client *client;
-	int fd;
-
-
-	len = sizeof(addr);
+	int fd, i, n_devices;
 
 	/* accept the incoming connection */
 	fd = accept(server->socket, NULL, 0);
@@ -166,13 +148,38 @@ 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_current_devices(server->device_handler,
+			&devices);
+	for (i = 0; i < n_devices; i++)
+		write_add_message(server, client, &devices[i]);
 
-	sleep(2);
+	return 0;
+}
 
-	write_remove_message(server, client, "1");
+void discover_server_notify_add(struct discover_server *server,
+		struct device *device)
+{
+	struct client *client;
 
-	return 0;
+	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(void)