cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #639 from Nordix/config-corrections 

Corrections in config code
This commit is contained in:
johnjiang 2022-02-26 14:34:50 +08:00 committed by GitHub
parent f684d891ac 24a9ac3341
commit 53dfa0c4e5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ff_config.c
View File

@ -191,6 +191,7 @@ freebsd_conf_handler(struct ff_config *cfg, const char *section,
} }
} else { } else {
fprintf(stderr, "freebsd conf section[%s] error\n", section); fprintf(stderr, "freebsd conf section[%s] error\n", section);
free(newconf);
return 0; return 0;
} }
@ -367,7 +368,7 @@ parse_port_slave_list(struct ff_port_cfg *cfg, const char *v_str)
} }
static int static int
vip_cfg_hander(struct ff_port_cfg *cur) vip_cfg_handler(struct ff_port_cfg *cur)
{ {
//vip cfg //vip cfg
int ret; int ret;
@ -375,7 +376,7 @@ vip_cfg_hander(struct ff_port_cfg *cur)
ret = rte_strsplit(cur->vip_addr_str, strlen(cur->vip_addr_str), &vip_addr_array[0], VIP_MAX_NUM, ';'); ret = rte_strsplit(cur->vip_addr_str, strlen(cur->vip_addr_str), &vip_addr_array[0], VIP_MAX_NUM, ';');
if (ret <= 0) { if (ret <= 0) {
fprintf(stdout, "vip_cfg_hander nb_vip is 0, not set vip_addr or set invalid vip_addr %s\n", fprintf(stdout, "vip_cfg_handler nb_vip is 0, not set vip_addr or set invalid vip_addr %s\n",
cur->vip_addr_str); cur->vip_addr_str);
return 1; return 1;
} }
@ -384,7 +385,7 @@ vip_cfg_hander(struct ff_port_cfg *cur)
cur->vip_addr_array = (char **)calloc(cur->nb_vip, sizeof(char *)); cur->vip_addr_array = (char **)calloc(cur->nb_vip, sizeof(char *));
if (cur->vip_addr_array == NULL) { if (cur->vip_addr_array == NULL) {
fprintf(stderr, "vip_cfg_hander malloc failed\n"); fprintf(stderr, "vip_cfg_handler malloc failed\n");
goto err; goto err;
} }
@ -404,7 +405,7 @@ err:
#ifdef INET6 #ifdef INET6
static int static int
vip6_cfg_hander(struct ff_port_cfg *cur) vip6_cfg_handler(struct ff_port_cfg *cur)
{ {
//vip6 cfg //vip6 cfg
int ret; int ret;
@ -413,7 +414,7 @@ vip6_cfg_hander(struct ff_port_cfg *cur)
ret = rte_strsplit(cur->vip_addr6_str, strlen(cur->vip_addr6_str), ret = rte_strsplit(cur->vip_addr6_str, strlen(cur->vip_addr6_str),
&vip_addr6_array[0], VIP_MAX_NUM, ';'); &vip_addr6_array[0], VIP_MAX_NUM, ';');
if (ret == 0) { if (ret == 0) {
fprintf(stdout, "vip6_cfg_hander nb_vip6 is 0, not set vip_addr6 or set invalid vip_addr6 %s\n", fprintf(stdout, "vip6_cfg_handler nb_vip6 is 0, not set vip_addr6 or set invalid vip_addr6 %s\n",
cur->vip_addr6_str); cur->vip_addr6_str);
return 1; return 1;
} }
@ -422,7 +423,7 @@ vip6_cfg_hander(struct ff_port_cfg *cur)
cur->vip_addr6_array = (char **) calloc(cur->nb_vip6, sizeof(char *)); cur->vip_addr6_array = (char **) calloc(cur->nb_vip6, sizeof(char *));
if (cur->vip_addr6_array == NULL) { if (cur->vip_addr6_array == NULL) {
fprintf(stderr, "port_cfg_handler malloc failed\n"); fprintf(stderr, "vip6_cfg_handler malloc failed\n");
goto fail; goto fail;
} }
@ -506,7 +507,7 @@ port_cfg_handler(struct ff_config *cfg, const char *section,
} else if (strcmp(name, "vip_addr") == 0) { } else if (strcmp(name, "vip_addr") == 0) {
cur->vip_addr_str = strdup(value); cur->vip_addr_str = strdup(value);
if (cur->vip_addr_str) { if (cur->vip_addr_str) {
return vip_cfg_hander(cur); return vip_cfg_handler(cur);
} }
} else if (strcmp(name, "vip_ifname") == 0) { } else if (strcmp(name, "vip_ifname") == 0) {
cur->vip_ifname = strdup(value); cur->vip_ifname = strdup(value);
@ -521,8 +522,8 @@ port_cfg_handler(struct ff_config *cfg, const char *section,
cur->gateway6_str = strdup(value); cur->gateway6_str = strdup(value);
} else if (strcmp(name, "vip_addr6") == 0) { } else if (strcmp(name, "vip_addr6") == 0) {
cur->vip_addr6_str = strdup(value); cur->vip_addr6_str = strdup(value);
if (cur->vip_addr_str) { if (cur->vip_addr6_str) {
return vip6_cfg_hander(cur); return vip6_cfg_handler(cur);
} }
} else if (0 == strcmp(name, "vip_prefix_len")) { } else if (0 == strcmp(name, "vip_prefix_len")) {
cur->vip_prefix_len = atoi(value); cur->vip_prefix_len = atoi(value);