From f0b56fe88fe9a852ea55a02ae96c53c2118c9cf5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 24 Sep 2013 09:11:10 +0200
Subject: mmpstrucdata: add structured data in explicit subtree

---
 plugins/mmpstrucdata/mmpstrucdata.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/mmpstrucdata/mmpstrucdata.c b/plugins/mmpstrucdata/mmpstrucdata.c
index 0fc559cd..4b2a985b 100644
--- a/plugins/mmpstrucdata/mmpstrucdata.c
+++ b/plugins/mmpstrucdata/mmpstrucdata.c
@@ -307,7 +307,7 @@ parse_sd(instanceData *pData, msg_t *pMsg)
 	int field;
 	uchar *buf;
 #endif
-	struct json_object *json;
+	struct json_object *json, *jroot;
 	uchar *sdbuf;
 	int lenbuf;
 	int i = 0;
@@ -332,7 +332,13 @@ dbgprintf("DDDD: parse_sd\n");
 dbgprintf("DDDD: parse_sd, i:%d\n", i);
 	}
 dbgprintf("DDDD: json: '%s'\n", json_object_get_string(json));
- 	msgAddJSON(pMsg, pData->jsonRoot, json);
+
+	jroot =  json_object_new_object();
+	if(jroot == NULL) {
+		ABORT_FINALIZE(RS_RET_ERR);
+	}
+	json_object_object_add(jroot, "RFC5424-SD", json);
+ 	msgAddJSON(pMsg, pData->jsonRoot, jroot);
 finalize_it:
 	RETiRet;
 }
-- 
cgit v1.2.3