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);
}
return len;
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++)
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)
{
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);
}
assert(pos <= buf + buf_len);
*(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++) {
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;
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;
+ }
rc = 0;
out:
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, &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.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: