{
int len = 0;
+ if (!pos)
+ return 0;
+
if (str)
len = strlen(str);
*(uint32_t *)pos = __cpu_to_be32(len);
pos += sizeof(uint32_t);
- memcpy(pos, str, len);
+ if (str)
+ memcpy(pos, str, len);
return len + sizeof(uint32_t);
}
4 + optional_strlen(opt->boot_args) +
4 + optional_strlen(opt->args_sig_file) +
sizeof(opt->is_default) +
+ sizeof(opt->is_autoboot_default) +
sizeof(opt->type);
}
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)
}
len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
+ len += 4; /* ipmi_bootdev_mailbox */
len += 4; /* allow_writes */
return len;
}
+int pb_protocol_authenticate_len(struct auth_message *msg)
+{
+ switch (msg->op) {
+ case AUTH_MSG_REQUEST:
+ /* enum + password + length */
+ return 4 + 4 + optional_strlen(msg->password);
+ case AUTH_MSG_RESPONSE:
+ /* enum + bool */
+ return 4 + 4;
+ case AUTH_MSG_SET:
+ /* enum + password + password */
+ return 4 + 4 + optional_strlen(msg->set_password.password) +
+ 4 + optional_strlen(msg->set_password.new_password);
+ case AUTH_MSG_DECRYPT:
+ /* enum + password + device id */
+ return 4 + 4 + optional_strlen(msg->decrypt_dev.password) +
+ 4 + optional_strlen(msg->decrypt_dev.device_id);
+ default:
+ pb_log("%s: invalid input\n", __func__);
+ return 0;
+ }
+}
+
int pb_protocol_serialise_device(const struct device *dev,
char *buf, int buf_len)
{
pos += pb_protocol_serialise_string(pos, dev->icon_file);
assert(pos <= buf + buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_boot_option(const struct boot_option *opt,
*(bool *)pos = opt->is_default;
pos += sizeof(bool);
+ *(bool *)pos = opt->is_autoboot_default;
+ pos += sizeof(bool);
*(uint32_t *)pos = __cpu_to_be32(opt->type);
pos += 4;
assert(pos <= buf + buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_boot_command(const struct boot_command *boot,
pos += pb_protocol_serialise_string(pos, boot->console);
assert(pos <= buf + buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
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;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
pos += HWADDR_SIZE;
assert(pos <= buf + buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
static int pb_protocol_serialise_config_interface(char *buf,
pos += 4;
*(uint32_t *)pos = config->ipmi_bootdev_persistent;
pos += 4;
+ *(uint32_t *)pos = config->ipmi_bootdev_mailbox;
+ 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;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
pos += pb_protocol_serialise_string(pos, url);
assert(pos <=buf+buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
pos += pb_protocol_serialise_string(pos, opt->executables[i]);
assert(pos <= buf + buf_len);
- (void)buf_len;
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt,
pos += pb_protocol_serialise_string(pos, opt->uuid);
}
- (void)buf_len;
+ assert(pos <= buf + buf_len);
- return 0;
+ return (pos <= buf + buf_len) ? 0 : -1;
+}
+
+int pb_protocol_serialise_authenticate(struct auth_message *msg,
+ char *buf, int buf_len)
+{
+ char *pos = buf;
+
+ *(enum auth_msg_type *)pos = msg->op;
+ pos += sizeof(enum auth_msg_type);
+
+ switch(msg->op) {
+ case AUTH_MSG_REQUEST:
+ pos += pb_protocol_serialise_string(pos, msg->password);
+ break;
+ case AUTH_MSG_RESPONSE:
+ *(bool *)pos = msg->authenticated;
+ pos += sizeof(bool);
+ break;
+ case AUTH_MSG_SET:
+ pos += pb_protocol_serialise_string(pos,
+ msg->set_password.password);
+ pos += pb_protocol_serialise_string(pos,
+ msg->set_password.new_password);
+ break;
+ case AUTH_MSG_DECRYPT:
+ pos += pb_protocol_serialise_string(pos,
+ msg->decrypt_dev.password);
+ pos += pb_protocol_serialise_string(pos,
+ msg->decrypt_dev.device_id);
+ break;
+ default:
+ pb_log("%s: invalid msg\n", __func__);
+ return -1;
+ };
+
+ assert(pos <= buf + buf_len);
+
+ return (pos <= buf + buf_len) ? 0 : -1;
}
int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
opt->is_default = *(bool *)(pos);
pos += sizeof(bool);
len -= sizeof(bool);
+ opt->is_autoboot_default = *(bool *)(pos);
+ pos += sizeof(bool);
+ len -= sizeof(bool);
if (read_u32(&pos, &len, &opt->type))
return -1;
- rc = 0;
+ rc = (pos <= message->payload + message->payload_len) ? 0 : -1;
out:
return rc;
status->backlog = *(bool *)pos;
pos += sizeof(status->backlog);
+ /* boot_active */
+ status->boot_active = *(bool *)pos;
+ pos += sizeof(status->boot_active);
+
rc = 0;
out:
if (read_u32(&pos, &len, &tmp))
goto out;
config->ipmi_bootdev_persistent = !!tmp;
+ if (read_u32(&pos, &len, &tmp))
+ goto out;
+ config->ipmi_bootdev_mailbox = !!tmp;
if (read_u32(&pos, &len, &tmp))
goto out;
out:
return rc;
}
+
+int pb_protocol_deserialise_authenticate(struct auth_message *msg,
+ const struct pb_protocol_message *message)
+{
+ unsigned int len;
+ const char *pos;
+
+ len = message->payload_len;
+ pos = message->payload;
+
+ msg->op = *(enum auth_msg_type *)pos;
+ pos += sizeof(enum auth_msg_type);
+
+ switch (msg->op) {
+ case AUTH_MSG_REQUEST:
+ if (read_string(msg, &pos, &len, &msg->password))
+ return -1;
+ break;
+ case AUTH_MSG_RESPONSE:
+ msg->authenticated = *(bool *)pos;
+ pos += sizeof(bool);
+ break;
+ case AUTH_MSG_SET:
+ if (read_string(msg, &pos, &len, &msg->set_password.password))
+ return -1;
+ if (read_string(msg, &pos, &len,
+ &msg->set_password.new_password))
+ return -1;
+ break;
+ case AUTH_MSG_DECRYPT:
+ if (read_string(msg, &pos, &len, &msg->decrypt_dev.password))
+ return -1;
+ if (read_string(msg, &pos, &len,
+ &msg->decrypt_dev.device_id))
+ return -1;
+ break;
+ default:
+ pb_log("%s: unable to parse\n", __func__);
+ return -1;
+ }
+
+ return 0;
+}
projects / petitboot / blobdiff