X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=33bd4e6e3064c5f4d393605f79d24619d42f4275;hp=41707da09ab0d7345c8d0a0a2d2f9d1b48f43517;hb=5f8fa2c151b8f0e568dc4015b7d307250b354a04;hpb=becf2b28d8b0aa561ac7e42db519071f8065d37f diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 41707da..33bd4e6 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -204,6 +204,7 @@ int pb_protocol_boot_option_len(const struct boot_option *opt) 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); } @@ -223,7 +224,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) @@ -323,6 +324,7 @@ int pb_protocol_config_len(const struct config *config) } len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */ + len += 4; /* ipmi_bootdev_mailbox */ len += 4; /* allow_writes */ @@ -379,6 +381,29 @@ int pb_protocol_temp_autoboot_len(const struct autoboot_option *opt) 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) { @@ -415,6 +440,8 @@ 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; @@ -457,6 +484,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; @@ -621,6 +651,8 @@ int pb_protocol_serialise_config(const struct config *config, 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; @@ -700,6 +732,45 @@ int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt, return 0; } +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); + (void)buf_len; + + return 0; +} + int pb_protocol_write_message(int fd, struct pb_protocol_message *message) { int total_len, rc; @@ -725,7 +796,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; } @@ -735,7 +806,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; } @@ -766,7 +837,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; } @@ -779,7 +850,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; } @@ -870,6 +941,9 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt, 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; @@ -952,6 +1026,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: @@ -1212,6 +1290,9 @@ int pb_protocol_deserialise_config(struct config *config, 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; @@ -1339,3 +1420,46 @@ int pb_protocol_deserialise_temp_autoboot(struct autoboot_option *opt, 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; +}