Add dp field to JSON output

Add "dp" field to every entry with the device path information available
in the -v flag as structure json fields.

WIP

Signed-off-by: Alejandro Sirgo Rica <asirgo@soleta.eu>

Author: Alejandro Sirgo Rica

src/Makefile

@@ -12,7 +12,7 @@ all : deps $(TARGETS)
 
 EFIBOOTMGR_SOURCES = efibootmgr.c efi.c parse_loader_data.c
 ifdef JSON
-EFIBOOTMGR_SOURCES += json.c
+EFIBOOTMGR_SOURCES += json.c jsondp.c jsondp_message.c json_utils.c
 endif
 EFICONMAN_SOURCES = eficonman.c
 EFIBOOTDUMP_SOURCES = efibootdump.c parse_loader_data.c

src/efibootmgr.c

@@ -926,7 +926,7 @@ set_order(const char *order_name, const char *prefix, int keep_old_entries)
 #define ev_bits(val, mask, shift) \
 	(((val) & ((mask) << (shift))) >> (shift))
 
-static inline char *
+char *
 ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
 {
 	ssize_t i, j;

src/efibootmgr.h

@@ -114,3 +114,4 @@ extern efibootmgr_opt_t opts;
 
 int read_u16(const char *name);
 int read_order(const char *name, var_entry_t **order);
+char *ucs2_to_utf8(const uint16_t * const chars, ssize_t limit);

src/efivar_endian.h

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * Copyright 2009-2015 Red Hat, Inc.
+ *
+ * Author:  Peter Jones <pjones@redhat.com>
+ */
+#pragma once
+
+#include <endian.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define cpu_to_le16(x) (x)
+#define cpu_to_le32(x) (x)
+#define cpu_to_le64(x) ((uint64_t)x)
+#define le16_to_cpu(x) (x)
+#define le32_to_cpu(x) (x)
+#define le64_to_cpu(x) ((uint64_t)x)
+#define cpu_to_be16(x) __builtin_bswap16(x)
+#define cpu_to_be32(x) __builtin_bswap32(x)
+#define cpu_to_be64(x) ((uint64_t)__builtin_bswap64(x))
+#define be16_to_cpu(x) __builtin_bswap16(x)
+#define be32_to_cpu(x) __builtin_bswap32(x)
+#define be64_to_cpu(x) ((uint64_t)__builtin_bswap64(x))
+#else
+#define cpu_to_be16(x) (x)
+#define cpu_to_be32(x) (x)
+#define cpu_to_be64(x) ((uint64_t)x)
+#define be16_to_cpu(x) (x)
+#define be32_to_cpu(x) (x)
+#define be64_to_cpu(x) ((uint64_t)x)
+#define cpu_to_le16(x) __builtin_bswap16(x)
+#define cpu_to_le32(x) __builtin_bswap32(x)
+#define cpu_to_le64(x) ((uint64_t)__builtin_bswap64(x))
+#define le16_to_cpu(x) __builtin_bswap16(x)
+#define le32_to_cpu(x) __builtin_bswap32(x)
+#define le64_to_cpu(x) ((uint64_t)__builtin_bswap64(x))
+#endif
+
+// vim:fenc=utf-8:tw=75:noet

src/json.c

@@ -3,6 +3,7 @@
 
 #include "parse_loader_data.h"
 #include "efibootmgr.h"
+#include "jsondp.h"
 #include "error.h"
 #include "json.h"
 
@@ -140,6 +141,7 @@ json_fill_vars(json_t *root, const char *prefix, list_t *entry_list)
 		json_object_set_new(boot_json, "active", json_boolean(active));
 		json_object_set_new(boot_json, "description",
 				json_string((char *)description));
+		json_fill_device_path(boot_json, load_option, boot->data_size);
 		json_array_append_new(vars_json, boot_json);
 	}
 

src/json_utils.c

@@ -0,0 +1,78 @@
+#include <efivar.h>
+
+#include "json_utils.h"
+
+static char *
+hex_to_string(const void *addr, size_t len,
+              const char *separator, int stride)
+{
+	size_t sep_len = separator ? strlen(separator) : 0;
+	const unsigned char *bytes = addr;
+	size_t out_len = len * 2;
+	char *str, *p;
+
+	if (separator && stride > 0 && len > 1)
+		out_len += ((len - 1) / stride) * sep_len;
+
+	str = malloc(out_len + 1);
+	if (!str)
+		return NULL;
+
+	p = str;
+
+	for (size_t i = 0; i < len; i++) {
+		if (i && separator && stride > 0 && i % stride == 0) {
+			memcpy(p, separator, sep_len);
+			p += sep_len;
+		}
+
+		sprintf(p, "%02x", bytes[i]);
+		p += 2;
+	}
+
+	*p = '\0';
+	return str;
+}
+
+json_t *
+json_hex(const void *addr, size_t len, const char *sep, int stride)
+{
+	char *s = hex_to_string(addr, len, sep, stride);
+	json_t *j;
+
+	if (!s)
+		return NULL;
+
+	j = json_string(s);
+	free(s);
+	return j;
+}
+
+json_t *
+json_ipv4(const uint8_t ip[4])
+{
+	char buf[16];
+
+	snprintf(buf, sizeof(buf),
+		 "%u.%u.%u.%u",
+		 ip[0], ip[1], ip[2], ip[3]);
+
+	return json_string(buf);
+}
+
+json_t *
+json_guid(const void *guid_data)
+{
+	efi_guid_t guid;
+	char *guid_str;
+	json_t *res;
+
+	memcpy(&guid, guid_data, sizeof(guid));
+
+	if (efi_guid_to_str(&guid, &guid_str) < 0)
+		return NULL;
+
+	res = json_string(guid_str);
+	free(guid_str);
+	return res;
+}

src/json_utils.h

@@ -0,0 +1,10 @@
+#include <jansson.h>
+#include <stdlib.h>
+
+#ifdef JSON
+json_t *json_hex(const void *addr, size_t len, const char *sep, int stride);
+
+json_t *json_ipv4(const uint8_t ip[4]);
+
+json_t *json_guid(const void *guid_data);
+#endif