X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=4ba91eeba5526c3ce85bd87e4c181fe542a434af;hp=76d03d1c10159924a3a73cf096d57827dd9ca31b;hb=1435814a67d3c1a0199f84b91246b37eb8fa8b99;hpb=ceefe00bf8c1498dfc2118d2b3666f67f91bb956 diff --git a/discover/discover-server.c b/discover/discover-server.c index 76d03d1..4ba91ee 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -31,6 +31,7 @@ struct discover_server { struct client { struct discover_server *server; struct list_item list; + struct waiter *waiter; int fd; }; @@ -55,6 +56,9 @@ static int client_destructor(void *arg) if (client->fd >= 0) close(client->fd); + if (client->waiter) + waiter_remove(client->waiter); + list_remove(&client->list); return 0; @@ -91,7 +95,7 @@ static int client_write_message( 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; @@ -100,7 +104,7 @@ static int write_add_message(struct discover_server *server, 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; @@ -109,7 +113,25 @@ static int write_add_message(struct discover_server *server, 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_device_remove_message(struct discover_server *server, struct client *client, char *dev_id) { struct pb_protocol_message *message; @@ -118,7 +140,7 @@ static int write_remove_message(struct discover_server *server, 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; @@ -127,29 +149,53 @@ static int write_remove_message(struct discover_server *server, return client_write_message(server, client, message); } +static int write_boot_status_message(struct discover_server *server, + struct client *client, const struct boot_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 discover_server_process_message(void *arg) { struct pb_protocol_message *message; struct boot_command *boot_command; struct client *client = arg; + int rc; message = pb_protocol_read_message(client, client->fd); - if (!message) + if (!message) { + talloc_free(client); return 0; + } + if (message->action != PB_PROTOCOL_ACTION_BOOT) { pb_log("%s: invalid action %d\n", __func__, message->action); return 0; } - boot_command = pb_protocol_deserialise_boot_command(client, message); - if (!boot_command) { + 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; } - /* todo: pass boot_command to client->server->device_handler */ + device_handler_boot(client->server->device_handler, boot_command); return 0; } @@ -157,18 +203,18 @@ static int discover_server_process_message(void *arg) static int discover_server_process_connection(void *arg) { struct discover_server *server = arg; + int fd, rc, i, n_devices; struct client *client; - int fd, i, n_devices; /* accept the incoming connection */ fd = accept(server->socket, NULL, 0); - if (!fd) { + 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); @@ -179,38 +225,66 @@ static int discover_server_process_connection(void *arg) /* 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); + client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN, + discover_server_process_message, client); 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_remove(struct discover_server *server, +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_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 boot_status *status) +{ + struct client *client; + + list_for_each_entry(&server->clients, client, list) + write_boot_status_message(server, client, status); +} + void discover_server_set_device_source(struct discover_server *server, struct device_handler *handler) {