From 7fe9a3cebe9e46d9695685ce8e7499bc311e71e2 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 24 Jul 2015 16:58:13 -0500
Subject: [PATCH] nlmon: decode MANUFACTURER attributes

---
 monitor/nlmon.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/monitor/nlmon.c b/monitor/nlmon.c
index aa062dc9..e6150d58 100644
--- a/monitor/nlmon.c
+++ b/monitor/nlmon.c
@@ -1491,6 +1491,34 @@ static void print_wsc_bool(unsigned int level, const char *label,
 	print_attr(level, "%s: %s", label, bytes[0] ? "True" : "False");
 }
 
+static void print_wsc_ascii_string(unsigned int level, const char *label,
+					const void *data, uint16_t size,
+					uint16_t max_len)
+{
+	const char *p = data;
+	unsigned int i;
+
+	if (size >= max_len) {
+		printf("malformed packet\n");
+		return;
+	}
+
+	for (i = 0; i < size; i++) {
+		if (!p[i])
+			break;
+
+		if (!l_ascii_isprint(p[i]))
+			goto invalid_ascii;
+	}
+
+	print_attr(level, "%s: %.*s", label, i, p);
+	return;
+
+invalid_ascii:
+	print_attr(level, "%s: (Non-Ascii, len: %d)", label, size);
+	print_hexdump(level + 1, data, size);
+}
+
 static void print_wsc_uuid(unsigned int level, const char *label,
 				const void *data, uint16_t size)
 {
@@ -1540,6 +1568,12 @@ static void print_wsc_device_password_id(unsigned int level, const char *label,
 		print_attr(level, "%s: Random via OOB (%02x)", label, v);
 }
 
+static void print_wsc_manufacturer(unsigned int level, const char *label,
+					const void *data, uint16_t size)
+{
+	print_wsc_ascii_string(level, label, data, size, 64);
+}
+
 static void print_wsc_response_type(unsigned int level, const char *label,
 					const void *data, uint16_t size)
 {
@@ -1599,6 +1633,8 @@ static struct attr_entry wsc_attr_entry[] = {
 		ATTR_CUSTOM,	{ .function = print_wsc_device_password_id } },
 	{ WSC_ATTR_KEY_PROVIDED_AUTOMATICALLY,	"Key Provided Automatically",
 		ATTR_CUSTOM,	{ .function = print_wsc_bool } },
+	{ WSC_ATTR_MANUFACTURER,		"Manufacturer",
+		ATTR_CUSTOM,	{ .function = print_wsc_manufacturer } },
 	{ WSC_ATTR_NETWORK_INDEX,		"Network Index",
 		ATTR_CUSTOM,	{ .function = print_wsc_byte } },
 	{ WSC_ATTR_NETWORK_KEY_INDEX,		"Network Key Index (Reserved)",