#include <asm/byteorder.h>
#include <talloc/talloc.h>
-#include <log.h>
+#include <log/log.h>
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
#include "pb-protocol/pb-protocol.h"
struct discover_client {
return 0;
}
-struct discover_client* discover_client_init(
- const struct discover_client_ops *ops)
-{
- 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->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);
}
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
{
client->n_devices++;
client->devices = talloc_realloc(client, client->devices,
client->devices[client->n_devices - 1] = device;
talloc_steal(client, device);
- client->ops.add_device(device, client->ops.cb_arg);
+ client->ops.device_add(device, client->ops.cb_arg);
}
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
{
struct device *device = NULL;
int i;
if (!device)
return;
- client->ops.remove_device(device, client->ops.cb_arg);
-
- talloc_free(device);
-
/* remove the device from the client's device array */
client->n_devices--;
memmove(&client->devices[i], &client->devices[i+1],
- client->n_devices - i);
+ (client->n_devices - i) * sizeof(client->devices[0]));
client->devices = talloc_realloc(client, client->devices,
struct device *, client->n_devices);
+ /* notify the UI */
+ client->ops.device_remove(device, client->ops.cb_arg);
+
+ 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;
return 0;
}
- add_device(client, dev);
+ device_add(client, dev);
break;
case PB_PROTOCOL_ACTION_REMOVE:
dev_id = pb_protocol_deserialise_string(client, message);
pb_log("%s: no device id?\n", __func__);
return 0;
}
- remove_device(client, dev_id);
+ device_remove(client, dev_id);
break;
default:
pb_log("%s: unknown action %d\n", __func__, message->action);
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)
{
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;
+}
projects / petitboot / blobdiff