diff --git a/src/sf_global.c b/src/sf_global.c index dfa0905..2f97d33 100644 --- a/src/sf_global.c +++ b/src/sf_global.c @@ -291,7 +291,6 @@ int sf_load_context_from_config(SFContext *sf_context, sf_context->outer_port = default_outer_port; } - inner_bind_addr = iniGetStrValue(section_name, "inner_bind_addr", pIniContext); outer_bind_addr = iniGetStrValue(section_name, diff --git a/src/sf_service.c b/src/sf_service.c index 0ec8fa1..fd12b53 100644 --- a/src/sf_service.c +++ b/src/sf_service.c @@ -318,10 +318,10 @@ static void *accept_thread_entrance(void *arg) { struct accept_thread_context *accept_context; int incomesock; + int port; struct sockaddr_in inaddr; socklen_t sockaddr_len; struct fast_task_info *task; - char szClientIp[IP_ADDRESS_SIZE]; accept_context = (struct accept_thread_context *)arg; while (g_sf_global_vars.continue_flag) { @@ -338,8 +338,6 @@ static void *accept_thread_entrance(void *arg) continue; } - getPeerIpaddr(incomesock, - szClientIp, IP_ADDRESS_SIZE); if (tcpsetnonblockopt(incomesock) != 0) { close(incomesock); continue; @@ -354,7 +352,9 @@ static void *accept_thread_entrance(void *arg) close(incomesock); continue; } - strcpy(task->client_ip, szClientIp); + getPeerIpAddPort(incomesock, task->client_ip, + sizeof(task->client_ip), &port); + task->port = port; task->canceled = false; task->ctx = accept_context->sf_context;