#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 {
struct waitset *waitset;
struct waiter *waiter;
struct list clients;
+ struct list status;
struct device_handler *device_handler;
};
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)
{
}
static int write_boot_status_message(struct discover_server *server,
- struct client *client, const struct boot_status *status)
+ struct client *client, const struct status *status)
{
struct pb_protocol_message *message;
int 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 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);
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;
+ }
+
+ 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;
default:
pb_log("%s: invalid action %d\n", __func__, message->action);
return 0;
static int discover_server_process_connection(void *arg)
{
struct discover_server *server = arg;
- int fd, rc, i, n_devices;
+ struct statuslog_entry *entry;
+ int fd, rc, i, n_devices, n_plugins;
struct client *client;
/* accept the incoming connection */
- fd = accept(server->socket, NULL, 0);
+ fd = accept(server->socket, NULL, NULL);
if (fd < 0) {
pb_log("accept: %s\n", strerror(errno));
return 0;
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++) {
}
}
+ /* 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_boot_status(struct discover_server *server,
- struct boot_status *status)
+ 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);
}
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,
struct device_handler *handler)
{
server->waiter = NULL;
server->waitset = waitset;
list_init(&server->clients);
+ list_init(&server->status);
unlink(PB_SOCKET_PATH);
projects / petitboot / blobdiff