pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use getPeerIpAddPort insteed of getPeerIpaddr

connection_manager
YuQing 2020-03-26 11:37:32 +08:00
parent 17c51bce29
commit fcfe02896d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sf_global.c
View File

@ -291,7 +291,6 @@ int sf_load_context_from_config(SFContext *sf_context,
sf_context->outer_port = default_outer_port; sf_context->outer_port = default_outer_port;
} }
inner_bind_addr = iniGetStrValue(section_name, inner_bind_addr = iniGetStrValue(section_name,
"inner_bind_addr", pIniContext); "inner_bind_addr", pIniContext);
outer_bind_addr = iniGetStrValue(section_name, outer_bind_addr = iniGetStrValue(section_name,

8
src/sf_service.c
View File

@ -318,10 +318,10 @@ static void *accept_thread_entrance(void *arg)
{ {
struct accept_thread_context *accept_context; struct accept_thread_context *accept_context;
int incomesock; int incomesock;
int port;
struct sockaddr_in inaddr; struct sockaddr_in inaddr;
socklen_t sockaddr_len; socklen_t sockaddr_len;
struct fast_task_info *task; struct fast_task_info *task;
char szClientIp[IP_ADDRESS_SIZE];
accept_context = (struct accept_thread_context *)arg; accept_context = (struct accept_thread_context *)arg;
while (g_sf_global_vars.continue_flag) { while (g_sf_global_vars.continue_flag) {
@ -338,8 +338,6 @@ static void *accept_thread_entrance(void *arg)
continue; continue;
} }
getPeerIpaddr(incomesock,
szClientIp, IP_ADDRESS_SIZE);
if (tcpsetnonblockopt(incomesock) != 0) { if (tcpsetnonblockopt(incomesock) != 0) {
close(incomesock); close(incomesock);
continue; continue;
@ -354,7 +352,9 @@ static void *accept_thread_entrance(void *arg)
close(incomesock); close(incomesock);
continue; continue;
} }
strcpy(task->client_ip, szClientIp); getPeerIpAddPort(incomesock, task->client_ip,
sizeof(task->client_ip), &port);
task->port = port;
task->canceled = false; task->canceled = false;
task->ctx = accept_context->sf_context; task->ctx = accept_context->sf_context;