From: Xavier Simonart <xavier.simonart@intel.com>
Date: Mon, 23 Apr 2018 08:19:24 +0000 (+0200)
Subject: Add support for multiple variables in core definition
X-Git-Tag: opnfv-6.0.0~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F56579%2F1;p=samplevnf.git

Add support for multiple variables in core definition

In the [core] definition we were able to use one variable
such as $core1 in [core $core1] but not [core ${core1}].
The second syntax is used when we want multiple
variables such as in [core ${first_core}-${last_core}].
This second syntax is now supported.

Change-Id: Ic94b84cb8cf827acb6697789cd180f41c3bdb028
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
---

diff --git a/VNFs/DPPD-PROX/cfgfile.c b/VNFs/DPPD-PROX/cfgfile.c
index 0c5950e4..b15fc0ad 100644
--- a/VNFs/DPPD-PROX/cfgfile.c
+++ b/VNFs/DPPD-PROX/cfgfile.c
@@ -191,9 +191,10 @@ static struct cfg_section *cfg_check_section(char *buffer, struct cfg_section *p
 
 	/* only numeric characters are valid for section index */
 	char val[MAX_CFG_STRING_LEN];
-	if (pend[0] == '$')
-		parse_single_var(val, sizeof(val), pend);
-	else
+	if (pend[0] == '$') {
+		if (parse_vars(val, sizeof(val), pend))
+			return NULL;
+	} else
 		strncpy(val, pend, sizeof(val));
 
 	for (len = 0; val[len] != '\0'; ++len) {