aboutsummaryrefslogtreecommitdiffstats
path: root/src/nSocket/nstack
diff options
context:
space:
mode:
Diffstat (limited to 'src/nSocket/nstack')
-rw-r--r--src/nSocket/nstack/nstack.c2
-rw-r--r--src/nSocket/nstack/nstack_fd_mng.c2
-rw-r--r--src/nSocket/nstack/nstack_info_parse.c14
-rw-r--r--src/nSocket/nstack/nstack_socket.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/nSocket/nstack/nstack.c b/src/nSocket/nstack/nstack.c
index 4198266..225c297 100644
--- a/src/nSocket/nstack/nstack.c
+++ b/src/nSocket/nstack/nstack.c
@@ -769,7 +769,7 @@ nstack_fw_init ()
}
common_mem_rwlock_read_lock (get_fork_lock ());
- updata_sys_pid ();
+ update_sys_pid ();
u8 proc_type = NSFW_PROC_APP;
nsfw_mem_para stinfo = { 0 };
diff --git a/src/nSocket/nstack/nstack_fd_mng.c b/src/nSocket/nstack/nstack_fd_mng.c
index ba9b8f1..86e045d 100644
--- a/src/nSocket/nstack/nstack_fd_mng.c
+++ b/src/nSocket/nstack/nstack_fd_mng.c
@@ -180,7 +180,7 @@ nstack_fork_init_parent (pid_t ppid)
void
nstack_fork_init_child (pid_t ppid)
{
- pid_t cpid = updata_sys_pid ();
+ pid_t cpid = update_sys_pid ();
NSSOC_LOGDBG ("parent_pid=%d, child_pid=%d", ppid, cpid);
nsfw_mgr_clr_fd_lock ();
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);
diff --git a/src/nSocket/nstack/nstack_socket.c b/src/nSocket/nstack/nstack_socket.c
index cd1557b..c967d64 100644
--- a/src/nSocket/nstack/nstack_socket.c
+++ b/src/nSocket/nstack/nstack_socket.c
@@ -2797,7 +2797,7 @@ nstack_fork (void)
pid = nsfw_base_fork ();
if (pid == 0)
{
- updata_sys_pid ();
+ update_sys_pid ();
}
NSSOC_LOGERR ("g_nStackInfo has not initialized]parent_pid=%d, pid=%d",
parent_pid, pid);