refactor get.*PropVal() series of functions

4 files changed, 47 insertions, 51 deletions

diff --git a/runtime/msg.c b/runtime/msg.c
index ea14eefa..a0215ab6 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2516,10 +2516,11 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
 
 
 /* Get a JSON-Property as string value  (used for various types of JSON-based vars) */
-static rsRetVal
-getJSONPropVal(struct json_object *jroot, uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed)
+rsRetVal
+getJSONPropVal(msg_t *pMsg, msgPropDescr_t *pProp, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed)
 {
 	uchar *leaf;
+	struct json_object *jroot;
 	struct json_object *parent;
 	struct json_object *field;
 	DEFiRet;
@@ -2527,13 +2528,26 @@ getJSONPropVal(struct json_object *jroot, uchar *propName, int propNameLen, ucha
 	if(*pbMustBeFreed)
 		free(*pRes);
 	*pRes = NULL;
+
+	if(pProp->id == PROP_CEE) {
+		jroot = pMsg->json;
+	} else if(pProp->id == PROP_LOCAL_VAR) {
+		jroot = pMsg->localvars;
+	} else if(pProp->id == PROP_GLOBAL_VAR) {
+		pthread_rwlock_rdlock(&glblVars_rwlock);
+		jroot = global_var_root;
+	} else {
+		DBGPRINTF("msgGetJSONPropVal; invalid property id %d\n",
+			  pProp->id);
+		ABORT_FINALIZE(RS_RET_NOT_FOUND);
+	}
 	if(jroot == NULL) goto finalize_it;
 
-	if(!strcmp((char*)propName, "!")) {
+	if(!strcmp((char*)pProp->name, "!")) {
 		field = jroot;
 	} else {
-		leaf = jsonPathGetLeaf(propName, propNameLen);
-		CHKiRet(jsonPathFindParent(jroot, propName+1, leaf, &parent, 1));
+		leaf = jsonPathGetLeaf(pProp->name, pProp->nameLen);
+		CHKiRet(jsonPathFindParent(jroot, pProp->name, leaf, &parent, 1));
 		field = json_object_object_get(parent, (char*)leaf);
 	}
 	if(field != NULL) {
@@ -2543,6 +2557,8 @@ getJSONPropVal(struct json_object *jroot, uchar *propName, int propNameLen, ucha
 	}
 
 finalize_it:
+	if(pProp->id == PROP_GLOBAL_VAR)
+		pthread_rwlock_unlock(&glblVars_rwlock);
 	if(*pRes == NULL) {
 		/* could not find any value, so set it to empty */
 		*pRes = (unsigned char*)"";
@@ -2551,28 +2567,6 @@ finalize_it:
 	RETiRet;
 }
 
-rsRetVal
-getCEEPropVal(msg_t *pM, uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed)
-{
-	return getJSONPropVal(pM->json, propName, propNameLen, pRes, buflen, pbMustBeFreed);
-}
-
-rsRetVal
-getLocalVarPropVal(msg_t *pM,  uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed)
-{
-	return getJSONPropVal(pM->localvars, propName, propNameLen, pRes, buflen, pbMustBeFreed);
-}
-
-rsRetVal
-getGlobalVarPropVal(uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed)
-{
-	DEFiRet;
-	pthread_rwlock_rdlock(&glblVars_rwlock);
-	iRet = getJSONPropVal(global_var_root, propName, propNameLen, pRes, buflen, pbMustBeFreed);
-	pthread_rwlock_unlock(&glblVars_rwlock);
-	RETiRet;
-}
-
 
 /* Get a JSON-based-variable as native json object */
 rsRetVal
@@ -3014,10 +3008,9 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			}
 			break;
 		case PROP_CEE:
-			getCEEPropVal(pMsg, pProp->name, pProp->nameLen, &pRes, &bufLen, pbMustBeFreed);
-			break;
 		case PROP_LOCAL_VAR:
-			getLocalVarPropVal(pMsg, pProp->name, pProp->nameLen, &pRes, &bufLen, pbMustBeFreed);
+		case PROP_GLOBAL_VAR:
+			getJSONPropVal(pMsg, pProp, &pRes, &bufLen, pbMustBeFreed);
 			break;
 		case PROP_SYS_BOM:
 			if(*pbMustBeFreed == 1)
@@ -4221,6 +4214,7 @@ msgPropDescrDestruct(msgPropDescr_t *pProp)
 	}
 }
 
+
 /* dummy */
 rsRetVal msgQueryInterface(void) { return RS_RET_NOT_IMPLEMENTED; }
 
diff --git a/runtime/msg.h b/runtime/msg.h
index 3e6bf767..c19e7e36 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -196,7 +196,6 @@ rsRetVal msgGetCEEVar(msg_t *pThis, cstr_t *propName, var_t **ppVar);
 es_str_t* msgGetCEEVarNew(msg_t *pMsg, char *name);
 es_str_t* msgGetLocalVarNew(msg_t *pMsg, char *name);
 rsRetVal msgAddJSON(msg_t *pM, uchar *name, struct json_object *json);
-rsRetVal getCEEPropVal(msg_t *pM, uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed);
 rsRetVal MsgGetSeverity(msg_t *pThis, int *piSeverity);
 rsRetVal MsgDeserialize(msg_t *pMsg, strm_t *pStrm);
 
@@ -214,11 +213,8 @@ uchar *getProgramName(msg_t *pM, sbool bLockMutex);
 uchar *getRcvFrom(msg_t *pM);
 rsRetVal propNameToID(uchar *pName, propid_t *pPropID);
 uchar *propIDToName(propid_t propID);
-rsRetVal msgGetCEEPropJSON(msg_t *pM, msgPropDescr_t *pProp, struct json_object **pjson);
-rsRetVal getGlobalVarPropVal(uchar *propName, int propNameLen, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed);
-rsRetVal msgGetLocalVarJSON(msg_t *pM, msgPropDescr_t *pProp, struct json_object **pjson);
-rsRetVal msgGetGlobalVarJSON(msgPropDescr_t *pProp, struct json_object **pjson);
 rsRetVal msgGetJSONPropJSON(msg_t *pMsg, msgPropDescr_t *pProp, struct json_object **pjson);
+rsRetVal getJSONPropVal(msg_t *pMsg, msgPropDescr_t *pProp, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed);
 rsRetVal msgSetJSONFromVar(msg_t *pMsg, uchar *varname, struct var *var);
 rsRetVal msgDelJSON(msg_t *pMsg, uchar *varname);
 rsRetVal jsonFind(struct json_object *jroot, uchar *propName, int propNameLen, struct json_object **jsonres);
diff --git a/template.c b/template.c
index e97428db..807acd75 100644
--- a/template.c
+++ b/template.c
@@ -163,13 +163,13 @@ tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *pLenBuf,
 		FINALIZE;
 	}
 
-	if(pTpl->subtree != NULL) {
+	if(pTpl->bHaveSubtree) {
 		/* only a single CEE subtree must be provided */
 		/* note: we could optimize the code below, however, this is
 		 * not worth the effort, as this passing mode is not expected
 		 * in subtree mode and so most probably only used for debug & test.
 		 */
-		getCEEPropVal(pMsg, pTpl->subtree, pTpl->subtreeLen, &pVal, &iLenVal, &bMustBeFreed);
+		getJSONPropVal(pMsg, &pTpl->subtree, &pVal, &iLenVal, &bMustBeFreed);
 		if(iLenVal >= (rs_size_t)*pLenBuf) /* we reserve one char for the final \0! */
 			CHKiRet(ExtendBuf(ppBuf, pLenBuf, iLenVal + 1));
 		memcpy(*ppBuf, pVal, iLenVal+1);
@@ -263,12 +263,12 @@ tplToArray(struct template *pTpl, msg_t *pMsg, uchar*** ppArr, struct syslogTime
 	assert(pMsg != NULL);
 	assert(ppArr != NULL);
 
-	if(pTpl->subtree) {
+	if(pTpl->bHaveSubtree) {
 		/* Note: this mode is untested, as there is no official plugin
 		 *       using array passing, so I simply could not test it.
 		 */
 		CHKmalloc(pArr = calloc(2, sizeof(uchar*)));
-		getCEEPropVal(pMsg, pTpl->subtree, pTpl->subtreeLen, &pVal, &propLen, &bMustBeFreed);
+		getJSONPropVal(pMsg, &pTpl->subtree, &pVal, &propLen, &bMustBeFreed);
 		if(bMustBeFreed) { /* if it must be freed, it is our own private copy... */
 			pArr[0] = pVal; /* ... so we can use it! */
 		} else {
@@ -324,8 +324,8 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson, struct
 	rsRetVal localRet;
 	DEFiRet;
 
-	if(pTpl->subtree != NULL){
-		localRet = jsonFind(pMsg->json, pTpl->subtree, pTpl->subtreeLen, pjson);
+	if(pTpl->bHaveSubtree){
+		localRet = jsonFind(pMsg->json, pTpl->subtree.name, pTpl->subtree.nameLen, pjson);
 		if(*pjson == NULL) {
 			/* we need to have a root object! */
 			*pjson = json_object_new_object();
@@ -534,7 +534,6 @@ tplConstruct(rsconf_t *conf)
 	struct template *pTpl;
 	if((pTpl = calloc(1, sizeof(struct template))) == NULL)
 		return NULL;
-pTpl->subtree = NULL;
 	
 	/* basic initialisation is done via calloc() - need to
 	 * initialize only values != 0. */
@@ -1698,8 +1697,9 @@ tplProcessCnf(struct cnfobj *o)
 	char *name = NULL;
 	uchar *tplStr = NULL;
 	uchar *plugin = NULL;
-	uchar *subtree = NULL;
 	uchar *p;
+	msgPropDescr_t subtree;
+	sbool bHaveSubtree = 0;
 	enum { T_STRING, T_PLUGIN, T_LIST, T_SUBTREE }
 		tplType = T_STRING; /* init just to keep compiler happy: mandatory parameter */
 	int i;
@@ -1746,7 +1746,11 @@ tplProcessCnf(struct cnfobj *o)
 				free(name); /* overall assigned */
 				ABORT_FINALIZE(RS_RET_ERR);
 			} else {
-				subtree = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+				uchar *cstr;
+				cstr  = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+				CHKiRet(msgPropDescrFill(&subtree, cstr, ustrlen(cstr)));
+				free(cstr);
+				bHaveSubtree = 1;
 			}
 		} else if(!strcmp(pblk.descr[i].name, "plugin")) {
 			plugin = (uchar*) es_str2cstr(pvals[i].val.d.estr, NULL);
@@ -1789,7 +1793,7 @@ tplProcessCnf(struct cnfobj *o)
 		}
 	}
 
-	if(subtree  == NULL) {
+	if(bHaveSubtree) {
 		if(tplType == T_SUBTREE) {
 			errmsg.LogError(0, RS_RET_ERR, "template '%s' of type subtree needs "
 				"subtree parameter", name);
@@ -1859,8 +1863,8 @@ tplProcessCnf(struct cnfobj *o)
 			break;
 	case T_LIST:	createListTpl(pTpl, o);
 			break;
-	case T_SUBTREE:	pTpl->subtree = subtree;
-			pTpl->subtreeLen = ustrlen(subtree);
+	case T_SUBTREE:	memcpy(&pTpl->subtree, &subtree, sizeof(msgPropDescr_t));
+			pTpl->bHaveSubtree = 1;
 			break;
 	}
 	
@@ -1963,7 +1967,8 @@ void tplDeleteAll(rsconf_t *conf)
 		pTplDel = pTpl;
 		pTpl = pTpl->pNext;
 		free(pTplDel->pszName);
-		free(pTplDel->subtree);
+		if(pTplDel->bHaveSubtree)
+			msgPropDescrDestruct(&pTplDel->subtree);
 		free(pTplDel);
 	}
 	ENDfunc
@@ -2020,7 +2025,8 @@ void tplDeleteNew(rsconf_t *conf)
 		pTplDel = pTpl;
 		pTpl = pTpl->pNext;
 		free(pTplDel->pszName);
-		free(pTplDel->subtree);
+		if(pTplDel->bHaveSubtree)
+			msgPropDescrDestruct(&pTplDel->subtree);
 		free(pTplDel);
 	}
 	ENDfunc
diff --git a/template.h b/template.h
index 1f612eaf..39fbbe03 100644
--- a/template.h
+++ b/template.h
@@ -40,8 +40,8 @@ struct template {
 	char *pszName;
 	int iLenName;
 	rsRetVal (*pStrgen)(msg_t*, uchar**, size_t *);
-	uchar *subtree;	/* subtree name for subtree-type templates */
-	int subtreeLen;
+	sbool bHaveSubtree;
+	msgPropDescr_t subtree;	/* subtree property name for subtree-type templates */
 	int tpenElements; /* number of elements in templateEntry list */
 	struct templateEntry *pEntryRoot;
 	struct templateEntry *pEntryLast;