* action = 0x1: device add message
* payload:
* 4-byte len, id
+ * 1-byte type
* 4-byte len, name
* 4-byte len, description
* 4-byte len, icon_file
* 4-byte len, icon_file
* 4-byte len, boot_image_file
* 4-byte len, initrd_file
+ * 4-byte len, dtb_file
* 4-byte len, boot_args
*
* action = 0x2: device remove message
* 4-byte len, boot option id
* 4-byte len, boot_image_file
* 4-byte len, initrd_file
+ * 4-byte len, dtb_file
* 4-byte len, boot_args
*
*/
fprintf(stream, "%s\t\ticon: %s\n", text, opt->icon_file);
fprintf(stream, "%s\t\tboot: %s\n", text, opt->boot_image_file);
fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file);
+ fprintf(stream, "%s\t\tdtb: %s\n", text, opt->dtb_file);
fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
}
}
return 0;
}
+static int read_u32(const char **pos, unsigned int *len, unsigned int *p)
+{
+ if (*len < sizeof(uint32_t))
+ return -1;
+
+ *p = (unsigned int)__be32_to_cpu(*(uint32_t *)(*pos));
+ *pos += sizeof(uint32_t);
+ *len -= sizeof(uint32_t);
+
+ return 0;
+}
+
char *pb_protocol_deserialise_string(void *ctx,
const struct pb_protocol_message *message)
{
int pb_protocol_device_len(const struct device *dev)
{
return 4 + optional_strlen(dev->id) +
+ sizeof(dev->type) +
4 + optional_strlen(dev->name) +
4 + optional_strlen(dev->description) +
4 + optional_strlen(dev->icon_file);
4 + optional_strlen(opt->icon_file) +
4 + optional_strlen(opt->boot_image_file) +
4 + optional_strlen(opt->initrd_file) +
+ 4 + optional_strlen(opt->dtb_file) +
4 + optional_strlen(opt->boot_args) +
sizeof(opt->is_default);
}
return 4 + optional_strlen(boot->option_id) +
4 + optional_strlen(boot->boot_image_file) +
4 + optional_strlen(boot->initrd_file) +
+ 4 + optional_strlen(boot->dtb_file) +
4 + optional_strlen(boot->boot_args);
}
4;
}
+int pb_protocol_system_info_len(const struct system_info *sysinfo)
+{
+ unsigned int len, i;
+
+ len = 4 + optional_strlen(sysinfo->type) +
+ 4 + optional_strlen(sysinfo->identifier) +
+ 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);
+ }
+
+ return len;
+}
+
int pb_protocol_serialise_device(const struct device *dev,
char *buf, int buf_len)
{
char *pos = buf;
pos += pb_protocol_serialise_string(pos, dev->id);
+ *(enum device_type *)pos = dev->type;
+ pos += sizeof(enum device_type);
pos += pb_protocol_serialise_string(pos, dev->name);
pos += pb_protocol_serialise_string(pos, dev->description);
pos += pb_protocol_serialise_string(pos, dev->icon_file);
pos += pb_protocol_serialise_string(pos, opt->icon_file);
pos += pb_protocol_serialise_string(pos, opt->boot_image_file);
pos += pb_protocol_serialise_string(pos, opt->initrd_file);
+ pos += pb_protocol_serialise_string(pos, opt->dtb_file);
pos += pb_protocol_serialise_string(pos, opt->boot_args);
*(bool *)pos = opt->is_default;
pos += pb_protocol_serialise_string(pos, boot->option_id);
pos += pb_protocol_serialise_string(pos, boot->boot_image_file);
pos += pb_protocol_serialise_string(pos, boot->initrd_file);
+ pos += pb_protocol_serialise_string(pos, boot->dtb_file);
pos += pb_protocol_serialise_string(pos, boot->boot_args);
assert(pos <= buf + buf_len);
return 0;
}
+int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
+ char *buf, int buf_len)
+{
+ char *pos = buf;
+ unsigned int i;
+
+ pos += pb_protocol_serialise_string(pos, sysinfo->type);
+ pos += pb_protocol_serialise_string(pos, sysinfo->identifier);
+
+ *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces);
+ pos += sizeof(uint32_t);
+
+ for (i = 0; i < sysinfo->n_interfaces; i++) {
+ struct interface_info *if_info = sysinfo->interfaces[i];
+
+ *(uint32_t *)pos = __cpu_to_be32(if_info->hwaddr_size);
+ pos += sizeof(uint32_t);
+
+ memcpy(pos, if_info->hwaddr, if_info->hwaddr_size);
+ pos += if_info->hwaddr_size;
+
+ pos += pb_protocol_serialise_string(pos, if_info->name);
+ }
+
+ 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(dev, &pos, &len, &dev->id))
goto out;
+ if (len < sizeof(enum device_type))
+ goto out;
+ dev->type = *(enum device_type *)(pos);
+ pos += sizeof(enum device_type);
+ len -= sizeof(enum device_type);
+
if (read_string(dev, &pos, &len, &dev->name))
goto out;
if (read_string(opt, &pos, &len, &opt->initrd_file))
goto out;
+ if (read_string(opt, &pos, &len, &opt->dtb_file))
+ goto out;
+
if (read_string(opt, &pos, &len, &opt->boot_args))
goto out;
if (read_string(cmd, &pos, &len, &cmd->initrd_file))
goto out;
+ if (read_string(cmd, &pos, &len, &cmd->dtb_file))
+ goto out;
+
if (read_string(cmd, &pos, &len, &cmd->boot_args))
goto out;
out:
return rc;
}
+
+int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
+ const struct pb_protocol_message *message)
+{
+ unsigned int len, i;
+ const char *pos;
+ int rc = -1;
+
+ len = message->payload_len;
+ pos = message->payload;
+
+ /* type and identifier strings */
+ if (read_string(sysinfo, &pos, &len, &sysinfo->type))
+ goto out;
+
+ if (read_string(sysinfo, &pos, &len, &sysinfo->identifier))
+ goto out;
+
+ /* number of interfaces */
+ if (read_u32(&pos, &len, &sysinfo->n_interfaces))
+ goto out;
+
+ sysinfo->interfaces = talloc_array(sysinfo, struct interface_info *,
+ sysinfo->n_interfaces);
+
+ for (i = 0; i < sysinfo->n_interfaces; i++) {
+ struct interface_info *if_info = talloc(sysinfo,
+ struct interface_info);
+
+ if (read_u32(&pos, &len, &if_info->hwaddr_size))
+ goto out;
+
+ if (len < if_info->hwaddr_size)
+ goto out;
+
+ if_info->hwaddr = talloc_memdup(if_info, pos,
+ if_info->hwaddr_size);
+ pos += if_info->hwaddr_size;
+ len -= if_info->hwaddr_size;
+
+ if (read_string(if_info, &pos, &len, &if_info->name))
+ goto out;
+
+ sysinfo->interfaces[i] = if_info;
+ }
+
+ rc = 0;
+
+out:
+ return rc;
+}