#include <stdint.h>
#include <errno.h>
#include <assert.h>
+#include <string.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <asm/byteorder.h>
+#include <pb-config/pb-config.h>
#include <talloc/talloc.h>
#include <waiter/waiter.h>
#include <log/log.h>
#include "device-handler.h"
#include "discover-server.h"
+#include "platform.h"
+#include "sysinfo.h"
struct discover_server {
int socket;
struct waitset *waitset;
struct waiter *waiter;
struct list clients;
+ struct list status;
struct device_handler *device_handler;
};
struct client {
struct discover_server *server;
struct list_item list;
+ struct waiter *waiter;
int fd;
+ bool remote_closed;
};
if (client->fd >= 0)
close(client->fd);
+ if (client->waiter)
+ waiter_remove(client->waiter);
+
list_remove(&client->list);
return 0;
{
struct client *client;
- pb_log("current clients [%p,%p,%p]:\n",
+ pb_debug("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)
- pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
+ pb_debug("\t[%p,%p,%p] client: %d\n", &client->list,
client->list.prev, client->list.next,
client->fd);
}
{
int rc;
+ if (client->remote_closed)
+ return -1;
+
rc = pb_protocol_write_message(client->fd, message);
if (rc)
- talloc_free(client);
+ client->remote_closed = true;
return rc;
}
-static int write_add_message(struct discover_server *server,
+static int write_device_add_message(struct discover_server *server,
struct client *client, const struct device *dev)
{
struct pb_protocol_message *message;
len = pb_protocol_device_len(dev);
message = pb_protocol_create_message(client,
- PB_PROTOCOL_ACTION_ADD, len);
+ PB_PROTOCOL_ACTION_DEVICE_ADD, len);
if (!message)
return -1;
return client_write_message(server, client, message);
}
-static int write_remove_message(struct discover_server *server,
+static int write_boot_option_add_message(struct discover_server *server,
+ struct client *client, const struct boot_option *opt)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_boot_option_len(opt);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_BOOT_OPTION_ADD, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_boot_option(opt, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
+static int write_plugin_option_add_message(struct discover_server *server,
+ struct client *client, const struct plugin_option *opt)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_plugin_option_len(opt);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_PLUGIN_OPTION_ADD, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_plugin_option(opt, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
+static int write_plugins_remove_message(struct discover_server *server,
+ struct client *client)
+{
+ struct pb_protocol_message *message;
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_PLUGINS_REMOVE, 0);
+ if (!message)
+ return -1;
+
+ /* No payload so nothing to serialise */
+
+ return client_write_message(server, client, message);
+}
+
+static int write_device_remove_message(struct discover_server *server,
struct client *client, char *dev_id)
{
struct pb_protocol_message *message;
len = strlen(dev_id) + sizeof(uint32_t);
message = pb_protocol_create_message(client,
- PB_PROTOCOL_ACTION_REMOVE, len);
+ PB_PROTOCOL_ACTION_DEVICE_REMOVE, len);
if (!message)
return -1;
return client_write_message(server, client, message);
}
+static int write_boot_status_message(struct discover_server *server,
+ struct client *client, const struct status *status)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_boot_status_len(status);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_STATUS, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_boot_status(status, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
+static int write_system_info_message(struct discover_server *server,
+ struct client *client, const struct system_info *sysinfo)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_system_info_len(sysinfo);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_SYSTEM_INFO, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_system_info(sysinfo, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
+static int write_config_message(struct discover_server *server,
+ struct client *client, const struct config *config)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_config_len(config);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_CONFIG, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_config(config, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
static int discover_server_process_message(void *arg)
{
+ struct autoboot_option *autoboot_opt;
struct pb_protocol_message *message;
+ struct boot_command *boot_command;
struct client *client = arg;
+ struct config *config;
+ char *url;
+ int rc;
message = pb_protocol_read_message(client, client->fd);
- if (!message)
+ if (!message) {
+ talloc_free(client);
return 0;
+ }
+
+
+ switch (message->action) {
+ case PB_PROTOCOL_ACTION_BOOT:
+ boot_command = talloc(client, struct boot_command);
+
+ rc = pb_protocol_deserialise_boot_command(boot_command,
+ message);
+ if (rc) {
+ pb_log("%s: no boot command?", __func__);
+ return 0;
+ }
+
+ device_handler_boot(client->server->device_handler,
+ boot_command);
+ break;
+
+ case PB_PROTOCOL_ACTION_CANCEL_DEFAULT:
+ device_handler_cancel_default(client->server->device_handler);
+ break;
+
+ case PB_PROTOCOL_ACTION_REINIT:
+ device_handler_reinit(client->server->device_handler);
+ break;
+
+ case PB_PROTOCOL_ACTION_CONFIG:
+ config = talloc_zero(client, struct config);
+
+ rc = pb_protocol_deserialise_config(config, message);
+ if (rc) {
+ pb_log("%s: no config?", __func__);
+ return 0;
+ }
- if (message->action != PB_PROTOCOL_ACTION_BOOT) {
+ device_handler_update_config(client->server->device_handler,
+ config);
+ break;
+
+ case PB_PROTOCOL_ACTION_ADD_URL:
+ url = pb_protocol_deserialise_string((void *) client, message);
+
+ device_handler_process_url(client->server->device_handler,
+ url, NULL, NULL);
+ break;
+
+ case PB_PROTOCOL_ACTION_PLUGIN_INSTALL:
+ url = pb_protocol_deserialise_string((void *) client, message);
+
+ device_handler_install_plugin(client->server->device_handler,
+ url);
+ break;
+
+ case PB_PROTOCOL_ACTION_TEMP_AUTOBOOT:
+ autoboot_opt = talloc_zero(client, struct autoboot_option);
+ rc = pb_protocol_deserialise_temp_autoboot(autoboot_opt,
+ message);
+ if (rc) {
+ pb_log("can't parse temporary autoboot message\n");
+ return 0;
+ }
+
+ device_handler_apply_temp_autoboot(
+ client->server->device_handler,
+ autoboot_opt);
+ break;
+
+ default:
pb_log("%s: invalid action %d\n", __func__, message->action);
return 0;
}
- /* todo: process boot message */
+
return 0;
}
static int discover_server_process_connection(void *arg)
{
struct discover_server *server = arg;
+ struct statuslog_entry *entry;
+ int fd, rc, i, n_devices, n_plugins;
struct client *client;
- int fd, i, n_devices;
/* accept the incoming connection */
- fd = accept(server->socket, NULL, 0);
- if (!fd) {
+ fd = accept(server->socket, NULL, NULL);
+ if (fd < 0) {
pb_log("accept: %s\n", strerror(errno));
return 0;
}
/* add to our list of clients */
- client = talloc(server, struct client);
+ client = talloc_zero(server, struct client);
list_add(&server->clients, &client->list);
talloc_set_destructor(client, client_destructor);
client->fd = fd;
client->server = server;
+ client->waiter = waiter_register_io(server->waitset, client->fd,
+ WAIT_IN, discover_server_process_message,
+ client);
+
+ /* send sysinfo to client */
+ rc = write_system_info_message(server, client, system_info_get());
+ if (rc)
+ return 0;
+
+ /* send config to client */
+ rc = write_config_message(server, client, config_get());
+ if (rc)
+ return 0;
/* send existing devices to client */
n_devices = device_handler_get_device_count(server->device_handler);
for (i = 0; i < n_devices; i++) {
- const struct device *device;
+ const struct discover_boot_option *opt;
+ const struct discover_device *device;
device = device_handler_get_device(server->device_handler, i);
- write_add_message(server, client, device);
+ rc = write_device_add_message(server, client, device->device);
+ if (rc)
+ return 0;
+
+ list_for_each_entry(&device->boot_options, opt, list) {
+ rc = write_boot_option_add_message(server, client,
+ opt->option);
+ if (rc)
+ return 0;
+ }
}
- waiter_register(server->waitset, client->fd, WAIT_IN,
- discover_server_process_message, client);
+ /* send status backlog to client */
+ list_for_each_entry(&server->status, entry, list)
+ write_boot_status_message(server, client, entry->status);
+
+ /* send installed plugins to client */
+ n_plugins = device_handler_get_plugin_count(server->device_handler);
+ for (i = 0; i < n_plugins; i++) {
+ const struct plugin_option *plugin;
+
+ plugin = device_handler_get_plugin(server->device_handler, i);
+ write_plugin_option_add_message(server, client, plugin);
+ }
return 0;
}
-void discover_server_notify_add(struct discover_server *server,
+void discover_server_notify_device_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);
+ write_device_add_message(server, client, device);
+
+}
+void discover_server_notify_boot_option_add(struct discover_server *server,
+ struct boot_option *boot_option)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_boot_option_add_message(server, client, boot_option);
}
-void discover_server_notify_remove(struct discover_server *server,
+void discover_server_notify_device_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);
+ write_device_remove_message(server, client, device->id);
+
+}
+
+void discover_server_notify_boot_status(struct discover_server *server,
+ struct status *status)
+{
+ struct statuslog_entry *entry;
+ struct client *client;
+ /* Duplicate the status struct to add to the backlog */
+ entry = talloc(server, struct statuslog_entry);
+ if (!entry) {
+ pb_log("Failed to allocated saved status!\n");
+ } else {
+ entry->status = talloc(entry, struct status);
+ if (entry->status) {
+ entry->status->type = status->type;
+ entry->status->message = talloc_strdup(entry->status,
+ status->message);
+ entry->status->backlog = true;
+ list_add_tail(&server->status, &entry->list);
+ } else {
+ talloc_free(entry);
+ }
+ }
+
+ list_for_each_entry(&server->clients, client, list)
+ write_boot_status_message(server, client, status);
+}
+
+void discover_server_notify_system_info(struct discover_server *server,
+ const struct system_info *sysinfo)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_system_info_message(server, client, sysinfo);
+}
+
+void discover_server_notify_config(struct discover_server *server,
+ const struct config *config)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_config_message(server, client, config);
+}
+
+void discover_server_notify_plugin_option_add(struct discover_server *server,
+ struct plugin_option *opt)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_plugin_option_add_message(server, client, opt);
+}
+
+void discover_server_notify_plugins_remove(struct discover_server *server)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_plugins_remove_message(server, client);
}
void discover_server_set_device_source(struct discover_server *server,
server->waiter = NULL;
server->waitset = waitset;
list_init(&server->clients);
+ list_init(&server->status);
unlink(PB_SOCKET_PATH);
goto out_err;
}
- server->waiter = waiter_register(server->waitset, server->socket,
+ server->waiter = waiter_register_io(server->waitset, server->socket,
WAIT_IN, discover_server_process_connection, server);
return server;
projects / petitboot / blobdiff