configure: Rename ENABLE_PS3 to PLATFORM_PS3

[petitboot] / ui / common / discover-client.c

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 6247dd0471b6b5fa6f8247adb68f872297eb6c52..d94149765dc95a3130c33035ef0bff27cfbfcb65 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -112,6 +113,21 @@ static void device_remove(struct discover_client *client, const char *id)
        talloc_free(device);
 }
 
+static void plugin_option_add(struct discover_client *client,
+               struct plugin_option *opt)
+{
+       talloc_steal(client, opt);
+
+       if (client->ops.plugin_option_add)
+               client->ops.plugin_option_add(opt, client->ops.cb_arg);
+}
+
+static void plugins_remove(struct discover_client *client)
+{
+       if (client->ops.plugins_remove)
+               client->ops.plugins_remove(client->ops.cb_arg);
+}
+
 void discover_client_enumerate(struct discover_client *client)
 {
        struct boot_option *opt;
@@ -131,7 +147,7 @@ void discover_client_enumerate(struct discover_client *client)
 }
 
 static void update_status(struct discover_client *client,
-               struct boot_status *status)
+               struct status *status)
 {
        if (client->ops.update_status)
                client->ops.update_status(status, client->ops.cb_arg);
@@ -155,9 +171,10 @@ static int discover_client_process(void *arg)
 {
        struct discover_client *client = arg;
        struct pb_protocol_message *message;
+       struct plugin_option *p_opt;
        struct system_info *sysinfo;
-       struct boot_status *status;
        struct boot_option *opt;
+       struct status *status;
        struct config *config;
        struct device *dev;
        char *dev_id;
@@ -180,7 +197,7 @@ static int discover_client_process(void *arg)
 
                rc = pb_protocol_deserialise_device(dev, message);
                if (rc) {
-                       pb_log("%s: no device?\n", __func__);
+                       pb_log_fn("no device?\n");
                        goto out;
                }
 
@@ -191,7 +208,7 @@ static int discover_client_process(void *arg)
 
                rc = pb_protocol_deserialise_boot_option(opt, message);
                if (rc) {
-                       pb_log("%s: no boot_option?\n", __func__);
+                       pb_log_fn("no boot_option?\n");
                        goto out;
                }
 
@@ -200,17 +217,17 @@ static int discover_client_process(void *arg)
        case PB_PROTOCOL_ACTION_DEVICE_REMOVE:
                dev_id = pb_protocol_deserialise_string(ctx, message);
                if (!dev_id) {
-                       pb_log("%s: no device id?\n", __func__);
+                       pb_log_fn("no device id?\n");
                        goto out;
                }
                device_remove(client, dev_id);
                break;
        case PB_PROTOCOL_ACTION_STATUS:
-               status = talloc_zero(ctx, struct boot_status);
+               status = talloc_zero(ctx, struct status);
 
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
-                       pb_log("%s: invalid status message?\n", __func__);
+                       pb_log_fn("invalid status message?\n");
                        goto out;
                }
                update_status(client, status);
@@ -220,7 +237,7 @@ static int discover_client_process(void *arg)
 
                rc = pb_protocol_deserialise_system_info(sysinfo, message);
                if (rc) {
-                       pb_log("%s: invalid sysinfo message?\n", __func__);
+                       pb_log_fn("invalid sysinfo message?\n");
                        goto out;
                }
                update_sysinfo(client, sysinfo);
@@ -230,13 +247,27 @@ static int discover_client_process(void *arg)
 
                rc = pb_protocol_deserialise_config(config, message);
                if (rc) {
-                       pb_log("%s: invalid config message?\n", __func__);
+                       pb_log_fn("invalid config message?\n");
                        goto out;
                }
                update_config(client, config);
                break;
+       case PB_PROTOCOL_ACTION_PLUGIN_OPTION_ADD:
+               p_opt = talloc_zero(ctx, struct plugin_option);
+
+               rc = pb_protocol_deserialise_plugin_option(p_opt, message);
+               if (rc) {
+                       pb_log_fn("no plugin_option?\n");
+                       goto out;
+               }
+
+               plugin_option_add(client, p_opt);
+               break;
+       case PB_PROTOCOL_ACTION_PLUGINS_REMOVE:
+               plugins_remove(client);
+               break;
        default:
-               pb_log("%s: unknown action %d\n", __func__, message->action);
+               pb_log_fn("unknown action %d\n", message->action);
        }
 
 out:
@@ -260,7 +291,7 @@ struct discover_client* discover_client_init(struct waitset *waitset,
 
        client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (client->fd < 0) {
-               pb_log("%s: socket: %s\n", __func__, strerror(errno));
+               pb_log_fn("socket: %s\n", strerror(errno));
                goto out_err;
        }
 
@@ -273,7 +304,7 @@ struct discover_client* discover_client_init(struct waitset *waitset,
        strcpy(addr.sun_path, PB_SOCKET_PATH);
 
        if (connect(client->fd, (struct sockaddr *)&addr, sizeof(addr))) {
-               pb_log("%s: connect: %s\n", __func__, strerror(errno));
+               pb_log_fn("connect: %s\n", strerror(errno));
                goto out_err;
        }
 
@@ -312,7 +343,8 @@ static void create_boot_command(struct boot_command *command,
        command->initrd_file = data->initrd;
        command->dtb_file = data->dtb;
        command->boot_args = data->args;
-       command->tty = ttyname(STDIN_FILENO);
+       command->args_sig_file = data->args_sig_file;
+       command->console = ttyname(STDIN_FILENO);
 }
 
 int discover_client_boot(struct discover_client *client,
@@ -403,3 +435,39 @@ int discover_client_send_url(struct discover_client *client,
 
        return pb_protocol_write_message(client->fd, message);
 }
+
+int discover_client_send_plugin_install(struct discover_client *client,
+               char *file)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_url_len(file);
+
+       message = pb_protocol_create_message(client,
+                               PB_PROTOCOL_ACTION_PLUGIN_INSTALL, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_url(file, message->payload, len);
+
+       return pb_protocol_write_message(client->fd, message);
+}
+
+int discover_client_send_temp_autoboot(struct discover_client *client,
+               const struct autoboot_option *opt)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_temp_autoboot_len(opt);
+
+       message = pb_protocol_create_message(client,
+                       PB_PROTOCOL_ACTION_TEMP_AUTOBOOT, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_temp_autoboot(opt, message->payload, len);
+
+       return pb_protocol_write_message(client->fd, message);
+}