X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=7c563c8e0ad17de54e8dd1ad86ae786949a11422;hp=dbbda406fe5a022c518c656c4b44e11b692010da;hb=2bc0df4aa35a89c5af7e54f459e2bbde20ca6a7e;hpb=9f191cc3c194ed51534c22e2dae15b2c08c8abc2 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index dbbda40..7c563c8 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -223,7 +223,7 @@ int pb_protocol_boot_status_len(const struct status *status) return 4 + /* type */ 4 + optional_strlen(status->message) + 4 + /* backlog */ - 4; + 4; /* boot_active */ } int pb_protocol_system_info_len(const struct system_info *sysinfo) @@ -253,7 +253,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo) len += 4 + if_info->hwaddr_size + 4 + optional_strlen(if_info->name) + sizeof(if_info->link) + - 4 + optional_strlen(if_info->address); + 4 + optional_strlen(if_info->address) + + 4 + optional_strlen(if_info->address_v6); } for (i = 0; i < sysinfo->n_blockdevs; i++) { @@ -363,6 +364,21 @@ int pb_protocol_plugin_option_len(const struct plugin_option *opt) 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) { @@ -441,6 +457,9 @@ int pb_protocol_serialise_boot_status(const struct status *status, *(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; @@ -494,6 +513,7 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo, 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); @@ -663,6 +683,26 @@ int pb_protocol_serialise_plugin_option(const struct plugin_option *opt, 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; @@ -688,7 +728,7 @@ int pb_protocol_write_message(int fd, struct pb_protocol_message *message) if (!total_len) return 0; - pb_log("%s: failed: %s\n", __func__, strerror(errno)); + pb_log_fn("failed: %s\n", strerror(errno)); return -1; } @@ -698,7 +738,7 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx, 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; } @@ -729,7 +769,7 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) 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; } @@ -742,7 +782,7 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) 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; } @@ -915,6 +955,10 @@ int pb_protocol_deserialise_boot_status(struct status *status, status->backlog = *(bool *)pos; pos += sizeof(status->backlog); + /* boot_active */ + status->boot_active = *(bool *)pos; + pos += sizeof(status->boot_active); + rc = 0; out: @@ -1011,6 +1055,8 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, 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; } @@ -1265,3 +1311,38 @@ int pb_protocol_deserialise_plugin_option(struct plugin_option *opt, 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; +}