Merge "Initial support for DPDK 18.05"

[samplevnf.git] / VNFs / DPPD-PROX / parse_utils.c

diff --git a/VNFs/DPPD-PROX/parse_utils.c b/VNFs/DPPD-PROX/parse_utils.c
index d258c59..32db5de 100644 (file)
--- a/VNFs/DPPD-PROX/parse_utils.c
+++ b/VNFs/DPPD-PROX/parse_utils.c
@@ -106,7 +106,7 @@ static struct var *var_lookup(const char *name)
        return NULL;
 }
 
-static int parse_single_var(char *val, size_t len, const char *name)
+int parse_single_var(char *val, size_t len, const char *name)
 {
        struct var *match;
 
@@ -135,7 +135,7 @@ int parse_vars(char *val, size_t len, const char *name)
 {
        static char result[MAX_CFG_STRING_LEN];
        static char cur_var[MAX_CFG_STRING_LEN];
-       char parsed[2048];
+       char parsed[MAX_CFG_STRING_LEN];
        size_t name_len = strlen(name);
        enum parse_vars_state {NO_VAR, WHOLE_VAR, INLINE_VAR} state = NO_VAR;
        size_t result_len = 0;
@@ -430,6 +430,8 @@ int parse_mac(struct ether_addr *ether_addr, const char *str2)
                return -1;
 
        uint8_t ret = rte_strsplit(str, strlen(str), addr_parts, 7, ':');
+       if (ret != 6)
+               ret = rte_strsplit(str, strlen(str), addr_parts, 7, ' ');
 
        if (ret != 6) {
                set_errf("Invalid MAC address format");