X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=ab5ea8a376e1500895ba047b3e656e8ac114fd59;hp=46f1addb678421de99900e66629c1c37f9ae331b;hb=218b5233de442ce67784f9f5e3cd43b2b3f3306b;hpb=bc4114e2235163bd88456c25cc0a908d86151f93 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 46f1add..ab5ea8a 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -223,17 +223,89 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo) len = 4 + optional_strlen(sysinfo->type) + 4 + optional_strlen(sysinfo->identifier) + - 4; + 4 + 4; 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++) { + struct blockdev_info *bd_info = sysinfo->blockdevs[i]; + len += 4 + optional_strlen(bd_info->name) + + 4 + optional_strlen(bd_info->uuid) + + 4 + optional_strlen(bd_info->mountpoint); + } + + /* BMC MAC */ + len += HWADDR_SIZE; + + return len; +} + +static int pb_protocol_interface_config_len(struct interface_config *conf) +{ + unsigned int len; + + len = sizeof(conf->hwaddr) + + 4 /* conf->ignore */; + + if (conf->ignore) + return len; + + len += 4 /* conf->method */; + + if (conf->method == CONFIG_METHOD_STATIC) { + len += 4 + optional_strlen(conf->static_config.address); + len += 4 + optional_strlen(conf->static_config.gateway); + } + + return len; +} + +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->safe_mode */; + + len += 4; + for (i = 0; i < config->network.n_interfaces; i++) + len += pb_protocol_interface_config_len( + config->network.interfaces[i]); + + len += 4; + for (i = 0; i < config->network.n_dns_servers; i++) + len += 4 + optional_strlen(config->network.dns_servers[i]); + + len += 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) { @@ -335,14 +407,132 @@ 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); + pos += sizeof(uint32_t); + + for (i = 0; i < sysinfo->n_blockdevs; i++) { + struct blockdev_info *bd_info = sysinfo->blockdevs[i]; + + pos += pb_protocol_serialise_string(pos, bd_info->name); + pos += pb_protocol_serialise_string(pos, bd_info->uuid); + pos += pb_protocol_serialise_string(pos, bd_info->mountpoint); + } + + memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE); + pos += HWADDR_SIZE; + + assert(pos <= buf + buf_len); + (void)buf_len; + + return 0; +} + +static int pb_protocol_serialise_config_interface(char *buf, + struct interface_config *conf) +{ + char *pos = buf; + + memcpy(pos, conf->hwaddr, sizeof(conf->hwaddr)); + pos += sizeof(conf->hwaddr); + + *(uint32_t *)pos = conf->ignore; + pos += 4; + + if (conf->ignore) + return pos - buf; + + *(uint32_t *)pos = __cpu_to_be32(conf->method); + pos += 4; + + if (conf->method == CONFIG_METHOD_STATIC) { + pos += pb_protocol_serialise_string(pos, + conf->static_config.address); + pos += pb_protocol_serialise_string(pos, + conf->static_config.gateway); + } + + return pos - buf; +} + +int pb_protocol_serialise_config(const struct config *config, + char *buf, int buf_len) +{ + char *pos = buf; + unsigned int i; + + *(uint32_t *)pos = config->autoboot_enabled; + pos += 4; + + *(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++) { + struct interface_config *iface = + config->network.interfaces[i]; + pos += pb_protocol_serialise_config_interface(pos, iface); + } + + *(uint32_t *)pos = __cpu_to_be32(config->network.n_dns_servers); + pos += 4; + for (i = 0; i < config->network.n_dns_servers; i++) { + pos += pb_protocol_serialise_string(pos, + config->network.dns_servers[i]); + } + + *(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts); + pos += 4; + 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; @@ -638,9 +828,166 @@ 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; } + /* number of interfaces */ + if (read_u32(&pos, &len, &sysinfo->n_blockdevs)) + goto out; + + sysinfo->blockdevs = talloc_array(sysinfo, struct blockdev_info *, + sysinfo->n_blockdevs); + + for (i = 0; i < sysinfo->n_blockdevs; i++) { + struct blockdev_info *bd_info = talloc(sysinfo, + struct blockdev_info); + + if (read_string(bd_info, &pos, &len, &bd_info->name)) + goto out; + + if (read_string(bd_info, &pos, &len, &bd_info->uuid)) + goto out; + + if (read_string(bd_info, &pos, &len, &bd_info->mountpoint)) + goto out; + + sysinfo->blockdevs[i] = bd_info; + } + + 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; +} + +static int pb_protocol_deserialise_config_interface(const char **buf, + unsigned int *len, struct interface_config *iface) +{ + unsigned int tmp; + + if (*len < sizeof(iface->hwaddr)) + return -1; + + memcpy(iface->hwaddr, *buf, sizeof(iface->hwaddr)); + *buf += sizeof(iface->hwaddr); + *len -= sizeof(iface->hwaddr); + + if (read_u32(buf, len, &tmp)) + return -1; + iface->ignore = !!tmp; + + if (iface->ignore) + return 0; + + if (read_u32(buf, len, &iface->method)) + return -1; + + if (iface->method == CONFIG_METHOD_STATIC) { + if (read_string(iface, buf, len, &iface->static_config.address)) + return -1; + + if (read_string(iface, buf, len, &iface->static_config.gateway)) + return -1; + } + + return 0; +} + +int pb_protocol_deserialise_config(struct config *config, + 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_u32(&pos, &len, &tmp)) + goto out; + config->autoboot_enabled = !!tmp; + + 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; + + config->network.interfaces = talloc_array(config, + struct interface_config *, config->network.n_interfaces); + + for (i = 0; i < config->network.n_interfaces; i++) { + struct interface_config *iface = talloc_zero( + config->network.interfaces, + struct interface_config); + if (pb_protocol_deserialise_config_interface(&pos, &len, iface)) + goto out; + config->network.interfaces[i] = iface; + } + + if (read_u32(&pos, &len, &config->network.n_dns_servers)) + goto out; + config->network.dns_servers = talloc_array(config, const char *, + config->network.n_dns_servers); + + for (i = 0; i < config->network.n_dns_servers; i++) { + if (read_string(config->network.dns_servers, &pos, &len, &str)) + goto out; + config->network.dns_servers[i] = str; + } + + if (read_u32(&pos, &len, &config->n_autoboot_opts)) + goto out; + config->autoboot_opts = talloc_array(config, struct autoboot_option, + config->n_autoboot_opts); + + for (i = 0; i < config->n_autoboot_opts; i++) { + if (read_u32(&pos, &len, &tmp)) + goto out; + 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: