From 52bec18801b226b57f53d9f075addd2c07caa3db Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 24 Oct 2013 14:43:05 +0800 Subject: [PATCH 1/1] discover: Handle incoming configuration messages When the client sends us a PB_PROTOCOL_ACTION_CONFIG message, we want to update the current config. Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 8 +++++++- discover/device-handler.h | 3 +++ discover/discover-server.c | 14 ++++++++++++++ lib/pb-config/pb-config.c | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 6fa14f9..725e491 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1,4 +1,3 @@ - #include #include #include @@ -717,6 +716,13 @@ void device_handler_cancel_default(struct device_handler *handler) discover_server_notify_boot_status(handler->server, &status); } +void device_handler_update_config(struct device_handler *handler, + struct config *config) +{ + config_set(config); + discover_server_notify_config(handler->server, config); +} + #ifndef PETITBOOT_TEST static bool check_existing_mount(struct discover_device *dev) { diff --git a/discover/device-handler.h b/discover/device-handler.h index 56d585a..bad7447 100644 --- a/discover/device-handler.h +++ b/discover/device-handler.h @@ -13,6 +13,7 @@ struct boot_command; struct event; struct device; struct waitset; +struct config; struct discover_device { struct device *device; @@ -114,6 +115,8 @@ const char *discover_device_get_param(struct discover_device *device, void device_handler_boot(struct device_handler *handler, struct boot_command *cmd); void device_handler_cancel_default(struct device_handler *handler); +void device_handler_update_config(struct device_handler *handler, + struct config *config); int device_request_write(struct discover_device *dev, bool *release); void device_release_write(struct discover_device *dev, bool release); diff --git a/discover/discover-server.c b/discover/discover-server.c index bd631f6..3cf9fac 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -214,6 +214,7 @@ 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; int rc; message = pb_protocol_read_message(client, client->fd); @@ -243,6 +244,19 @@ static int discover_server_process_message(void *arg) device_handler_cancel_default(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; + default: pb_log("%s: invalid action %d\n", __func__, message->action); return 0; diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 40bc39f..915a01d 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -100,9 +100,9 @@ int config_set(struct config *newconfig) return 0; pb_log("new configuration data received\n"); - dump_config(config); + dump_config(newconfig); - rc = storage->save(storage, config); + rc = storage->save(storage, newconfig); if (!rc) config = talloc_steal(config_ctx, newconfig); -- 2.39.2