fprintf(stream, "%s\t\tdtb: %s\n", text, opt->dtb_file);
fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file);
+ fprintf(stream, "%s\t\ttype: %s\n", text,
+ opt->type == DISCOVER_BOOT_OPTION ? "boot" : "plugin");
}
}
4 + optional_strlen(opt->dtb_file) +
4 + optional_strlen(opt->boot_args) +
4 + optional_strlen(opt->args_sig_file) +
- sizeof(opt->is_default);
+ sizeof(opt->is_default) +
+ sizeof(opt->type);
}
int pb_protocol_boot_len(const struct boot_command *boot)
4 + optional_strlen(boot->console);
}
-int pb_protocol_boot_status_len(const struct boot_status *status)
+int pb_protocol_boot_status_len(const struct status *status)
{
- return 4 +
+ return 4 + /* type */
4 + optional_strlen(status->message) +
- 4 + optional_strlen(status->detail) +
- 4;
+ 4 + /* backlog */
+ 4; /* boot_active */
}
int pb_protocol_system_info_len(const struct system_info *sysinfo)
struct interface_info *if_info = sysinfo->interfaces[i];
len += 4 + if_info->hwaddr_size +
4 + optional_strlen(if_info->name) +
- sizeof(if_info->link);
+ sizeof(if_info->link) +
+ 4 + optional_strlen(if_info->address) +
+ 4 + optional_strlen(if_info->address_v6);
}
for (i = 0; i < sysinfo->n_blockdevs; i++) {
for (i = 0; i < config->network.n_dns_servers; i++)
len += 4 + optional_strlen(config->network.dns_servers[i]);
+ len += 4 + optional_strlen(config->http_proxy);
+ len += 4 + optional_strlen(config->https_proxy);
+
len += 4;
for (i = 0; i < config->n_autoboot_opts; i++) {
if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
return 4 + optional_strlen(url);
}
+
+int pb_protocol_plugin_option_len(const struct plugin_option *opt)
+{
+ unsigned int i, len = 0;
+
+ len += 4 + optional_strlen(opt->id);
+ len += 4 + optional_strlen(opt->name);
+ len += 4 + optional_strlen(opt->vendor);
+ len += 4 + optional_strlen(opt->vendor_id);
+ len += 4 + optional_strlen(opt->version);
+ len += 4 + optional_strlen(opt->date);
+ len += 4 + optional_strlen(opt->plugin_file);
+
+ len += 4; /* n_executables */
+ for (i = 0; i < opt->n_executables; i++)
+ len += 4 + optional_strlen(opt->executables[i]);
+
+ return len;
+}
+
+int pb_protocol_temp_autoboot_len(const struct autoboot_option *opt)
+{
+ unsigned int len = 0;
+
+ /* boot_type */
+ len += 4;
+
+ if (opt->boot_type == BOOT_DEVICE_TYPE)
+ len += 4;
+ else
+ len += optional_strlen(opt->uuid);
+
+ return len;
+}
+
int pb_protocol_serialise_device(const struct device *dev,
char *buf, int buf_len)
{
*(bool *)pos = opt->is_default;
pos += sizeof(bool);
+ *(uint32_t *)pos = __cpu_to_be32(opt->type);
+ pos += 4;
+
assert(pos <= buf + buf_len);
(void)buf_len;
return 0;
}
-int pb_protocol_serialise_boot_status(const struct boot_status *status,
+int pb_protocol_serialise_boot_status(const struct status *status,
char *buf, int buf_len)
{
char *pos = buf;
pos += sizeof(uint32_t);
pos += pb_protocol_serialise_string(pos, status->message);
- pos += pb_protocol_serialise_string(pos, status->detail);
- *(uint32_t *)pos = __cpu_to_be32(status->type);
- pos += sizeof(uint32_t);
+ *(bool *)pos = __cpu_to_be32(status->backlog);
+ pos += sizeof(bool);
+
+ *(bool *)pos = __cpu_to_be32(status->boot_active);
+ pos += sizeof(bool);
assert(pos <= buf + buf_len);
(void)buf_len;
*(bool *)pos = if_info->link;
pos += sizeof(bool);
+
+ pos += pb_protocol_serialise_string(pos, if_info->address);
+ pos += pb_protocol_serialise_string(pos, if_info->address_v6);
}
*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
config->network.dns_servers[i]);
}
+ pos += pb_protocol_serialise_string(pos, config->http_proxy);
+ pos += pb_protocol_serialise_string(pos, config->https_proxy);
+
*(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
pos += 4;
for (i = 0; i < config->n_autoboot_opts; i++) {
return 0;
}
+int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
+ char *buf, int buf_len)
+{
+ char *pos = buf;
+ unsigned int i;
+
+ pos += pb_protocol_serialise_string(pos, opt->id);
+ pos += pb_protocol_serialise_string(pos, opt->name);
+ pos += pb_protocol_serialise_string(pos, opt->vendor);
+ pos += pb_protocol_serialise_string(pos, opt->vendor_id);
+ pos += pb_protocol_serialise_string(pos, opt->version);
+ pos += pb_protocol_serialise_string(pos, opt->date);
+ pos += pb_protocol_serialise_string(pos, opt->plugin_file);
+
+ *(uint32_t *)pos = __cpu_to_be32(opt->n_executables);
+ pos += 4;
+
+ for (i = 0; i < opt->n_executables; i++)
+ pos += pb_protocol_serialise_string(pos, opt->executables[i]);
+
+ assert(pos <= buf + buf_len);
+ (void)buf_len;
+
+ return 0;
+}
+
+int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt,
+ char *buf, int buf_len)
+{
+ char *pos = buf;
+
+ *(uint32_t *)pos = __cpu_to_be32(opt->boot_type);
+ pos += 4;
+
+ if (opt->boot_type == BOOT_DEVICE_TYPE) {
+ *(uint32_t *)pos = __cpu_to_be32(opt->type);
+ pos += 4;
+ } else {
+ pos += pb_protocol_serialise_string(pos, opt->uuid);
+ }
+
+ (void)buf_len;
+
+ return 0;
+}
+
int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
{
int total_len, rc;
if (!total_len)
return 0;
- pb_log("%s: failed: %s\n", __func__, strerror(errno));
+ pb_log_fn("failed: %s\n", strerror(errno));
return -1;
}
struct pb_protocol_message *message;
if (payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
- pb_log("%s: payload too big %u/%u\n", __func__, payload_len,
+ pb_log_fn("payload too big %u/%u\n", payload_len,
PB_PROTOCOL_MAX_PAYLOAD_SIZE);
return NULL;
}
m.action = __be32_to_cpu(m.action);
if (m.payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
- pb_log("%s: payload too big %u/%u\n", __func__, m.payload_len,
+ pb_log_fn("payload too big %u/%u\n", m.payload_len,
PB_PROTOCOL_MAX_PAYLOAD_SIZE);
return NULL;
}
if (rc <= 0) {
talloc_free(message);
- pb_log("%s: failed (%u): %s\n", __func__, len,
+ pb_log_fn("failed (%u): %s\n", len,
strerror(errno));
return NULL;
}
if (len < sizeof(bool))
goto out;
opt->is_default = *(bool *)(pos);
+ pos += sizeof(bool);
+ len -= sizeof(bool);
+
+ if (read_u32(&pos, &len, &opt->type))
+ return -1;
rc = 0;
return rc;
}
-int pb_protocol_deserialise_boot_status(struct boot_status *status,
+int pb_protocol_deserialise_boot_status(struct status *status,
const struct pb_protocol_message *message)
{
unsigned int len;
status->type = __be32_to_cpu(*(uint32_t *)(pos));
switch (status->type) {
- case BOOT_STATUS_ERROR:
- case BOOT_STATUS_INFO:
+ case STATUS_ERROR:
+ case STATUS_INFO:
break;
default:
goto out;
pos += sizeof(uint32_t);
len -= sizeof(uint32_t);
- /* message and detail strings */
+ /* message string */
if (read_string(status, &pos, &len, &status->message))
goto out;
- if (read_string(status, &pos, &len, &status->detail))
- goto out;
-
- /* and finally, progress */
- if (len < sizeof(uint32_t))
- goto out;
+ /* backlog */
+ status->backlog = *(bool *)pos;
+ pos += sizeof(status->backlog);
- status->progress = __be32_to_cpu(*(uint32_t *)(pos));
-
- /* clamp to 100% */
- if (status->progress > 100)
- status->progress = 100;
+ /* boot_active */
+ status->boot_active = *(bool *)pos;
+ pos += sizeof(status->boot_active);
rc = 0;
if_info->link = *(bool *)pos;
pos += sizeof(if_info->link);
+ if (read_string(if_info, &pos, &len, &if_info->address))
+ goto out;
+ if (read_string(if_info, &pos, &len, &if_info->address_v6))
+ goto out;
+
sysinfo->interfaces[i] = if_info;
}
config->network.dns_servers[i] = str;
}
+ if (read_string(config, &pos, &len, &str))
+ goto out;
+ config->http_proxy = str;
+ if (read_string(config, &pos, &len, &str))
+ goto out;
+ config->https_proxy = str;
+
if (read_u32(&pos, &len, &config->n_autoboot_opts))
goto out;
config->autoboot_opts = talloc_array(config, struct autoboot_option,
out:
return rc;
}
+
+int pb_protocol_deserialise_plugin_option(struct plugin_option *opt,
+ const struct pb_protocol_message *message)
+{
+ unsigned int len, i, tmp;
+ const char *pos;
+ int rc = -1;
+ char *str;
+
+ len = message->payload_len;
+ pos = message->payload;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->id = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->name = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->vendor = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->vendor_id = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->version = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->date = str;
+
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->plugin_file = str;
+
+ if (read_u32(&pos, &len, &tmp))
+ goto out;
+ opt->n_executables = tmp;
+
+ opt->executables = talloc_zero_array(opt, char *, opt->n_executables);
+ if (!opt->executables)
+ goto out;
+
+ for (i = 0; i < opt->n_executables; i++) {
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->executables[i] = talloc_strdup(opt, str);
+ }
+
+ rc = 0;
+out:
+ return rc;
+}
+
+int pb_protocol_deserialise_temp_autoboot(struct autoboot_option *opt,
+ const struct pb_protocol_message *message)
+{
+ unsigned int len, tmp;
+ const char *pos;
+ int rc = -1;
+ char *str;
+
+ len = message->payload_len;
+ pos = message->payload;
+
+ if (read_u32(&pos, &len, &tmp))
+ goto out;
+
+ opt->boot_type = tmp;
+ if (opt->boot_type == BOOT_DEVICE_TYPE) {
+ if (read_u32(&pos, &len, &tmp))
+ goto out;
+ opt->type = tmp;
+
+ } else if (opt->boot_type == BOOT_DEVICE_UUID) {
+ if (read_string(opt, &pos, &len, &str))
+ goto out;
+ opt->uuid = str;
+
+ } else {
+ return -1;
+ }
+
+ rc = 0;
+
+out:
+ return rc;
+}
projects / petitboot / blobdiff