X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=c0cfea0fe19a8ddae06d5b0546a2f6f504d6c369;hp=e8ce4dd91bda53c88230441d32815eb20ad44e0f;hb=b838cf777ed3d21b166f8daddd4b11fc75e07307;hpb=e058e90117300125af7b6e93eb0e5aeb23543af9

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index e8ce4dd..c0cfea0 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -12,7 +12,7 @@
 #include <talloc/talloc.h>
 #include <log/log.h>
 
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
 #include "pb-protocol/pb-protocol.h"
 
 struct discover_client {
@@ -32,50 +32,6 @@ static int discover_client_destructor(void *arg)
 	return 0;
 }
 
-struct discover_client* discover_client_init(
-	const struct discover_client_ops *ops, void *cb_arg)
-{
-	struct discover_client *client;
-	struct sockaddr_un addr;
-
-	client = talloc(NULL, struct discover_client);
-	if (!client)
-		return NULL;
-
-	memcpy(&client->ops, ops, sizeof(client->ops));
-	client->ops.cb_arg = cb_arg;
-
-	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (!client->fd < 0) {
-		pb_log("%s: socket: %s\n", __func__, strerror(errno));
-		goto out_err;
-	}
-
-	talloc_set_destructor(client, discover_client_destructor);
-
-	client->n_devices = 0;
-	client->devices = NULL;
-
-	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, PB_SOCKET_PATH);
-
-	if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
-		pb_log("%s: connect: %s\n", __func__, strerror(errno));
-		goto out_err;
-	}
-
-	return client;
-
-out_err:
-	talloc_free(client);
-	return NULL;
-}
-
-int discover_client_get_fd(const struct discover_client *client)
-{
-	return client->fd;
-}
-
 void discover_client_destroy(struct discover_client *client)
 {
 	talloc_free(client);
@@ -121,11 +77,13 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
-int discover_client_process(struct discover_client *client)
+static int discover_client_process(void *arg)
 {
+	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
 	struct device *dev;
 	char *dev_id;
+	int rc;
 
 	message = pb_protocol_read_message(client, client->fd);
 
@@ -134,8 +92,10 @@ int discover_client_process(struct discover_client *client)
 
 	switch (message->action) {
 	case PB_PROTOCOL_ACTION_ADD:
-		dev = pb_protocol_deserialise_device(client, message);
-		if (!dev) {
+		dev = talloc(client, struct device);
+
+		rc = pb_protocol_deserialise_device(dev, message);
+		if (rc) {
 			pb_log("%s: no device?\n", __func__);
 			return 0;
 		}
@@ -158,6 +118,48 @@ int discover_client_process(struct discover_client *client)
 	return 0;
 }
 
+struct discover_client* discover_client_init(struct waitset *waitset,
+	const struct discover_client_ops *ops, void *cb_arg)
+{
+	struct discover_client *client;
+	struct sockaddr_un addr;
+
+	client = talloc(NULL, struct discover_client);
+	if (!client)
+		return NULL;
+
+	memcpy(&client->ops, ops, sizeof(client->ops));
+	client->ops.cb_arg = cb_arg;
+
+	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (client->fd < 0) {
+		pb_log("%s: socket: %s\n", __func__, strerror(errno));
+		goto out_err;
+	}
+
+	talloc_set_destructor(client, discover_client_destructor);
+
+	client->n_devices = 0;
+	client->devices = NULL;
+
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, PB_SOCKET_PATH);
+
+	if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
+		pb_log("%s: connect: %s\n", __func__, strerror(errno));
+		goto out_err;
+	}
+
+	waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
+			client);
+
+	return client;
+
+out_err:
+	talloc_free(client);
+	return NULL;
+}
+
 /* accessors for discovered devices */
 int discover_client_device_count(struct discover_client *client)
 {
@@ -172,3 +174,42 @@ struct device *discover_client_get_device(struct discover_client *client,
 
 	return client->devices[index];
 }
+
+static void create_boot_command(struct boot_command *command,
+		const struct device *device __attribute__((unused)),
+		const struct boot_option *boot_option,
+		const struct pb_boot_data *data)
+{
+
+	command->option_id = boot_option->id;
+	command->boot_image_file = data->image;
+	command->initrd_file = data->initrd;
+	command->boot_args = data->args;
+}
+
+int discover_client_boot(struct discover_client *client,
+		const struct device *device,
+		const struct boot_option *boot_option,
+		const struct pb_boot_data *data)
+{
+	struct pb_protocol_message *message;
+	struct boot_command boot_command;
+	int len, rc;
+
+	create_boot_command(&boot_command, device, boot_option, data);
+
+	len = pb_protocol_boot_len(&boot_command);
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_BOOT, len);
+
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_boot_command(&boot_command,
+			message->payload, len);
+
+	rc = pb_protocol_write_message(client->fd, message);
+
+	return rc;
+}