X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=e99ce86292c90baf111efd84865e7b8aa48a5197;hp=091fab722f102e9d9c186e8bec6900146737bcce;hb=d974c3c39237c8e94bb3a51d3511d18dea01043e;hpb=263968fb67cdaa58e1ff8d9a35a72921ffbac7ef diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 091fab7..e99ce86 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -225,10 +225,18 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo) 4 + optional_strlen(sysinfo->identifier) + 4 + 4; + len += 4; + for (i = 0; i < sysinfo->n_current; i++) + len += 4 + optional_strlen(sysinfo->platform_current[i]); + len += 4; + for (i = 0; i < sysinfo->n_other; i++) + len += 4 + optional_strlen(sysinfo->platform_other[i]); + for (i = 0; i < sysinfo->n_interfaces; i++) { struct interface_info *if_info = sysinfo->interfaces[i]; len += 4 + if_info->hwaddr_size + - 4 + optional_strlen(if_info->name); + 4 + optional_strlen(if_info->name) + + sizeof(if_info->link); } for (i = 0; i < sysinfo->n_blockdevs; i++) { @@ -238,6 +246,9 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo) 4 + optional_strlen(bd_info->mountpoint); } + /* BMC MAC */ + len += HWADDR_SIZE; + return len; } @@ -256,6 +267,7 @@ static int pb_protocol_interface_config_len(struct interface_config *conf) if (conf->method == CONFIG_METHOD_STATIC) { len += 4 + optional_strlen(conf->static_config.address); len += 4 + optional_strlen(conf->static_config.gateway); + len += 4 + optional_strlen(conf->static_config.url); } return len; @@ -266,7 +278,8 @@ int pb_protocol_config_len(const struct config *config) unsigned int i, len; len = 4 /* config->autoboot_enabled */ + - 4 /* config->autoboot_timeout_sec */; + 4 /* config->autoboot_timeout_sec */ + + 4 /* config->safe_mode */; len += 4; for (i = 0; i < config->network.n_interfaces; i++) @@ -278,11 +291,29 @@ int pb_protocol_config_len(const struct config *config) len += 4 + optional_strlen(config->network.dns_servers[i]); len += 4; - len += config->n_boot_priorities * 4; + for (i = 0; i < config->n_autoboot_opts; i++) { + if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) + len += 4 + 4; + else + len += 4 + 4 + + optional_strlen(config->autoboot_opts[i].uuid); + } + + len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */ + + len += 4; /* allow_writes */ + + len += 4 + optional_strlen(config->lang); return len; } +int pb_protocol_url_len(const char *url) +{ + /* url + length field */ + return 4 + optional_strlen(url); +} + int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len) { @@ -371,6 +402,16 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo, pos += pb_protocol_serialise_string(pos, sysinfo->type); pos += pb_protocol_serialise_string(pos, sysinfo->identifier); + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_current); + pos += sizeof(uint32_t); + for (i = 0; i < sysinfo->n_current; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->platform_current[i]); + + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other); + pos += sizeof(uint32_t); + for (i = 0; i < sysinfo->n_other; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->platform_other[i]); + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces); pos += sizeof(uint32_t); @@ -384,6 +425,9 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo, pos += if_info->hwaddr_size; pos += pb_protocol_serialise_string(pos, if_info->name); + + *(bool *)pos = if_info->link; + pos += sizeof(bool); } *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs); @@ -397,6 +441,12 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo, pos += pb_protocol_serialise_string(pos, bd_info->mountpoint); } + if (sysinfo->bmc_mac) + memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE); + else + memset(pos, 0, HWADDR_SIZE); + pos += HWADDR_SIZE; + assert(pos <= buf + buf_len); (void)buf_len; @@ -425,6 +475,8 @@ static int pb_protocol_serialise_config_interface(char *buf, conf->static_config.address); pos += pb_protocol_serialise_string(pos, conf->static_config.gateway); + pos += pb_protocol_serialise_string(pos, + conf->static_config.url); } return pos - buf; @@ -442,6 +494,9 @@ int pb_protocol_serialise_config(const struct config *config, *(uint32_t *)pos = __cpu_to_be32(config->autoboot_timeout_sec); pos += 4; + *(uint32_t *)pos = config->safe_mode; + pos += 4; + *(uint32_t *)pos = __cpu_to_be32(config->network.n_interfaces); pos += 4; for (i = 0; i < config->network.n_interfaces; i++) { @@ -457,19 +512,50 @@ int pb_protocol_serialise_config(const struct config *config, config->network.dns_servers[i]); } - *(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities); + *(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts); pos += 4; - for (i = 0; i < config->n_boot_priorities; i++) { - *(uint32_t *)pos = __cpu_to_be32(config->boot_priorities[i].type); + for (i = 0; i < config->n_autoboot_opts; i++) { + *(uint32_t *)pos = + __cpu_to_be32(config->autoboot_opts[i].boot_type); pos += 4; + if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) { + *(uint32_t *)pos = + __cpu_to_be32(config->autoboot_opts[i].type); + pos += 4; + } else { + pos += pb_protocol_serialise_string(pos, + config->autoboot_opts[i].uuid); + } } + *(uint32_t *)pos = __cpu_to_be32(config->ipmi_bootdev); + pos += 4; + *(uint32_t *)pos = config->ipmi_bootdev_persistent; + pos += 4; + + *(uint32_t *)pos = config->allow_writes; + pos += 4; + + pos += pb_protocol_serialise_string(pos, config->lang); + assert(pos <= buf + buf_len); (void)buf_len; return 0; } +int pb_protocol_serialise_url(const char *url, char *buf, int buf_len) +{ + char *pos = buf; + + pos += pb_protocol_serialise_string(pos, url); + + assert(pos <=buf+buf_len); + (void)buf_len; + + return 0; +} + int pb_protocol_write_message(int fd, struct pb_protocol_message *message) { int total_len, rc; @@ -729,6 +815,7 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, unsigned int len, i; const char *pos; int rc = -1; + char *tmp; len = message->payload_len; pos = message->payload; @@ -740,6 +827,27 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, if (read_string(sysinfo, &pos, &len, &sysinfo->identifier)) goto out; + /* versions strings for openpower platforms */ + if (read_u32(&pos, &len, &sysinfo->n_current)) + goto out; + sysinfo->platform_current = talloc_array(sysinfo, char *, + sysinfo->n_current); + for (i = 0; i < sysinfo->n_current; i++) { + if (read_string(sysinfo, &pos, &len, &tmp)) + goto out; + sysinfo->platform_current[i] = talloc_strdup(sysinfo, tmp); + } + + if (read_u32(&pos, &len, &sysinfo->n_other)) + goto out; + sysinfo->platform_other = talloc_array(sysinfo, char *, + sysinfo->n_other); + for (i = 0; i < sysinfo->n_other; i++) { + if (read_string(sysinfo, &pos, &len, &tmp)) + goto out; + sysinfo->platform_other[i] = talloc_strdup(sysinfo, tmp); + } + /* number of interfaces */ if (read_u32(&pos, &len, &sysinfo->n_interfaces)) goto out; @@ -765,6 +873,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, if (read_string(if_info, &pos, &len, &if_info->name)) goto out; + if_info->link = *(bool *)pos; + pos += sizeof(if_info->link); + sysinfo->interfaces[i] = if_info; } @@ -790,8 +901,18 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, sysinfo->blockdevs[i] = bd_info; } - rc = 0; + for (i = 0; i < HWADDR_SIZE; i++) { + if (pos[i] != 0) { + sysinfo->bmc_mac = talloc_memdup(sysinfo, pos, HWADDR_SIZE); + break; + } + } + + pos += HWADDR_SIZE; + len -= HWADDR_SIZE; + + rc = 0; out: return rc; } @@ -824,6 +945,9 @@ static int pb_protocol_deserialise_config_interface(const char **buf, if (read_string(iface, buf, len, &iface->static_config.gateway)) return -1; + + if (read_string(iface, buf, len, &iface->static_config.url)) + return -1; } return 0; @@ -835,6 +959,7 @@ int pb_protocol_deserialise_config(struct config *config, unsigned int len, i, tmp; const char *pos; int rc = -1; + char *str; len = message->payload_len; pos = message->payload; @@ -846,6 +971,10 @@ int pb_protocol_deserialise_config(struct config *config, if (read_u32(&pos, &len, &config->autoboot_timeout_sec)) goto out; + if (read_u32(&pos, &len, &tmp)) + goto out; + config->safe_mode = !!tmp; + if (read_u32(&pos, &len, &config->network.n_interfaces)) goto out; @@ -867,23 +996,46 @@ int pb_protocol_deserialise_config(struct config *config, config->network.n_dns_servers); for (i = 0; i < config->network.n_dns_servers; i++) { - char *tmp; - if (read_string(config->network.dns_servers, &pos, &len, &tmp)) + if (read_string(config->network.dns_servers, &pos, &len, &str)) goto out; - config->network.dns_servers[i] = tmp; + config->network.dns_servers[i] = str; } - if (read_u32(&pos, &len, &config->n_boot_priorities)) + if (read_u32(&pos, &len, &config->n_autoboot_opts)) goto out; - config->boot_priorities = talloc_array(config, struct boot_priority, - config->n_boot_priorities); + config->autoboot_opts = talloc_array(config, struct autoboot_option, + config->n_autoboot_opts); - for (i = 0; i < config->n_boot_priorities; i++) { + for (i = 0; i < config->n_autoboot_opts; i++) { if (read_u32(&pos, &len, &tmp)) goto out; - config->boot_priorities[i].type = tmp; + config->autoboot_opts[i].boot_type = (int)tmp; + if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) { + if (read_u32(&pos, &len, &tmp)) + goto out; + config->autoboot_opts[i].type = tmp; + } else { + if (read_string(config, &pos, &len, &str)) + goto out; + config->autoboot_opts[i].uuid = str; + } } + if (read_u32(&pos, &len, &config->ipmi_bootdev)) + goto out; + if (read_u32(&pos, &len, &tmp)) + goto out; + config->ipmi_bootdev_persistent = !!tmp; + + if (read_u32(&pos, &len, &tmp)) + goto out; + config->allow_writes = !!tmp; + + if (read_string(config, &pos, &len, &str)) + goto out; + + config->lang = str; + rc = 0; out: