X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=a3087b3335d423fa1e01fc25ab6bfe705a23933f;hp=2467e33dc97ac5b9cfc45c44576f18d6f969c79a;hb=03fe06fa71f065e918c46a65e6a45e76063a07eb;hpb=eb2e788746da67787e1a43d7fccfa11ca26efae5 diff --git a/discover/discover-server.c b/discover/discover-server.c index 2467e33..a3087b3 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include "device-handler.h" #include "discover-server.h" +#include "platform.h" #include "sysinfo.h" struct discover_server { @@ -26,6 +28,7 @@ struct discover_server { struct waitset *waitset; struct waiter *waiter; struct list clients; + struct list status; struct device_handler *device_handler; }; @@ -74,12 +77,12 @@ static void print_clients(struct discover_server *server) { 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); } @@ -155,7 +158,7 @@ static int write_device_remove_message(struct discover_server *server, } 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; @@ -190,11 +193,31 @@ static int write_system_info_message(struct discover_server *server, 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); @@ -224,6 +247,30 @@ static int discover_server_process_message(void *arg) 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; + default: pb_log("%s: invalid action %d\n", __func__, message->action); return 0; @@ -236,11 +283,12 @@ static int discover_server_process_message(void *arg) static int discover_server_process_connection(void *arg) { struct discover_server *server = arg; + struct statuslog_entry *entry; int fd, rc, i, n_devices; 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; @@ -263,6 +311,11 @@ static int discover_server_process_connection(void *arg) 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++) { @@ -282,6 +335,10 @@ static int discover_server_process_connection(void *arg) } } + /* send status backlog to client */ + list_for_each_entry(&server->status, entry, list) + write_boot_status_message(server, client, entry->status); + return 0; } @@ -315,10 +372,28 @@ void discover_server_notify_device_remove(struct discover_server *server, } 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); } @@ -332,6 +407,15 @@ void discover_server_notify_system_info(struct discover_server *server, 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_set_device_source(struct discover_server *server, struct device_handler *handler) { @@ -350,6 +434,7 @@ struct discover_server *discover_server_init(struct waitset *waitset) server->waiter = NULL; server->waitset = waitset; list_init(&server->clients); + list_init(&server->status); unlink(PB_SOCKET_PATH);