X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=21e15da4c84e64219134274996ec9d09106cf2ba;hp=8d7283811eb0af721404f85c90a7891cb522a157;hb=e3ebf4d2ebe3464257655f059ea020565a536643;hpb=9793f862467407e83aa5b5a2cc35c25de9bae17b

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 8d72838..21e15da 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -11,17 +11,18 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
+#include <log/log.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;
@@ -66,17 +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 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;
@@ -89,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;
@@ -127,7 +129,6 @@ static int write_remove_message(struct discover_server *server,
 static int discover_server_process(void *arg)
 {
 	struct discover_server *server = arg;
-	struct device *devices;
 	struct client *client;
 	int fd, i, n_devices;
 
@@ -147,10 +148,13 @@ static int discover_server_process(void *arg)
 	client->fd = fd;
 
 	/* 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);
+	}
 
 	return 0;
 }
@@ -181,7 +185,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;
@@ -191,6 +195,7 @@ struct discover_server *discover_server_init(void)
 		return NULL;
 
 	server->waiter = NULL;
+	server->waitset = waitset;
 	list_init(&server->clients);
 
 	unlink(PB_SOCKET_PATH);
@@ -216,8 +221,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, server);
 
 	return server;