From ac4d5d74fc4fc222d7ab034203f9d3efb64d459a Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Sat, 3 Nov 2007 22:23:03 +0000
Subject: [PATCH] Change BongoConfiguration parser into something which takes
 Json nodes

---
 include/bongoagent.h       |  2 +-
 src/libs/nmap/bongoagent.c | 34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/include/bongoagent.h b/include/bongoagent.h
index 18d1929..14bde89 100644
--- a/include/bongoagent.h
+++ b/include/bongoagent.h
@@ -98,7 +98,7 @@ typedef struct _BongoConfigItem {
 } BongoConfigItem;
 
 BOOL ReadBongoConfiguration(BongoConfigItem *config, char *filename);
-BOOL ParseBongoConfiguration(BongoConfigItem *config, const unsigned char *content);
+BOOL ProcessBongoConfiguration(BongoConfigItem *config, const BongoJsonNode *node);
 BOOL SetBongoConfigItem(BongoConfigItem *schema, BongoJsonNode *node);
 void FreeBongoConfiguration(BongoConfigItem *config);
 
diff --git a/src/libs/nmap/bongoagent.c b/src/libs/nmap/bongoagent.c
index 4d8a024..dc88180 100644
--- a/src/libs/nmap/bongoagent.c
+++ b/src/libs/nmap/bongoagent.c
@@ -214,49 +214,47 @@ SetBongoConfigItem(BongoConfigItem *schema, BongoJsonNode *node) {
 BOOL 
 ReadBongoConfiguration(BongoConfigItem *config, char *filename) {
 	unsigned char *pconfig;
+	BongoJsonNode *node = NULL;
+	BOOL retcode;
 	
 	if (! NMAPReadConfigFile(filename, &pconfig)) {
 		XplConsolePrintf("config: couldn't read config '%s' from store\r\n", filename);
 		return FALSE;
 	}
-	return ParseBongoConfiguration(config, pconfig);
+	if (BongoJsonParseString(pconfig, &node) != BONGO_JSON_OK) {
+		retcode = FALSE;
+	} else {
+		retcode = ProcessBongoConfiguration(config, node);
+	}
+	
+	if (node) BongoJsonNodeFree(node);
+	return retcode;
 }
 
 /**
- * Parse a configuration document
+ * Process a configuration definition
  * \param	config	BongoConfigItem array which defines configuration variables
- * \param	content	JSON text we want parsed
+ * \param	JSON node tree we want to look in
  * \return	Whether or not we were successful
  */
 
 BOOL
-ParseBongoConfiguration(BongoConfigItem *config, const unsigned char *content)
+ProcessBongoConfiguration(BongoConfigItem *config, const BongoJsonNode *node)
 {
-	BOOL retcode = FALSE;
-	BongoJsonNode *node = NULL;
-
-	if (BongoJsonParseString(content, &node) != BONGO_JSON_OK) {
-		goto finish;
-	}
-	
 	while (config->type != BONGO_JSON_NULL) {
 		BongoJsonNode *result = BongoJsonJPath(node, config->source);
 		if (!result) {
 			XplConsolePrintf("config: JSON tree for schema source %s not found\r\n", config->source);
-			goto finish;
+			return FALSE;
 		}
 		if (!SetBongoConfigItem(config, result)) {
-			// can't set item
+			// can't set item  - should return FALSE here?
 			XplConsolePrintf("config: schema source %s not found\r\n", config->source);
 		}
 		config++;
 	}
 	
-	retcode = TRUE;
-
-finish:
-	if (node) BongoJsonNodeFree(node);
-	return retcode;
+	return TRUE;
 }
 
 int