diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-10-10 01:31:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-10-10 01:31:45 +0000 |
| commit | d622bf60c1894488276928f350c22e7a95008161 (patch) | |
| tree | cdffa038feb893dbe218ce3d9a326bf70f81be05 /src/nSocket/nstack/nstack_info_parse.c | |
| parent | 88ef84f0e10ff670c9465800193e42c8f6a5aa9f (diff) | |
| parent | 74d149fea978f0200a1d3af07e0efccaf0ee993a (diff) | |
Merge "Fix: delete g_nstack_plane_info and fix json file"
Diffstat (limited to 'src/nSocket/nstack/nstack_info_parse.c')
| -rw-r--r-- | src/nSocket/nstack/nstack_info_parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nSocket/nstack/nstack_info_parse.c b/src/nSocket/nstack/nstack_info_parse.c index 989c3b8..04abb4e 100644 --- a/src/nSocket/nstack/nstack_info_parse.c +++ b/src/nSocket/nstack/nstack_info_parse.c @@ -241,7 +241,8 @@ nstack_parse_rd_cfg_json (char *param, rd_route_data ** data, int *num) { rddata = rdtemp + icnt; rddata->type = RD_DATA_TYPE_IP; - (void) json_object_object_get_ex (module_obj, "type", &temp_obj); + (void) json_object_object_get_ex (module_obj, "stack_name", + &temp_obj); if (temp_obj) { temp_value = json_object_get_string (temp_obj); @@ -280,21 +281,21 @@ nstack_parse_rd_cfg_json (char *param, rd_route_data ** data, int *num) } } - for (index = 0; index < ip_list_num; index++) + for (index = 0; index < proto_list_num; index++) { module_obj = json_object_array_get_idx (proto_list_obj, index); if (module_obj) { rddata = rdtemp + icnt; rddata->type = RD_DATA_TYPE_PROTO; - (void) json_object_object_get_ex (module_obj, "type", &temp_obj); + (void) json_object_object_get_ex (module_obj, "stack_name", + &temp_obj); if (temp_obj) { temp_value = json_object_get_string (temp_obj); if (!temp_value) { - NSSOC_LOGERR ("can't get value from subnet index:%d", - index); + NSSOC_LOGERR ("can't get value from proto index:%d", index); goto RETURN_ERROR; } (void) STRNCPY_S (rddata->stack_name, RD_PLANE_NAMELEN, @@ -307,8 +308,7 @@ nstack_parse_rd_cfg_json (char *param, rd_route_data ** data, int *num) temp_value = json_object_get_string (temp_obj); if (!temp_value) { - NSSOC_LOGERR ("can't get value from subnet index:%d", - index); + NSSOC_LOGERR ("can't get value from proto index:%d", index); goto RETURN_ERROR; } rddata->proto_type = atoi (temp_value); |