jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #332 from metalefty/freebsd/ipv6

Browse Source 
common: add log for g_tcp_connect
This commit is contained in:
jsorg71 2016-05-05 22:00:51 -07:00
commit 8249091183
1 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/os_calls.c
View File

@ -668,6 +668,7 @@ int APP_CC
g_tcp_connect(int sck, const char *address, const char *port) g_tcp_connect(int sck, const char *address, const char *port)
{ {
int res = 0; int res = 0;
char errorMsg[256];
struct addrinfo p; struct addrinfo p;
struct addrinfo *h = (struct addrinfo *)NULL; struct addrinfo *h = (struct addrinfo *)NULL;
struct addrinfo *rp = (struct addrinfo *)NULL; struct addrinfo *rp = (struct addrinfo *)NULL;
@ -693,6 +694,12 @@ g_tcp_connect(int sck, const char *address, const char *port)
{ {
res = getaddrinfo(address, port, &p, &h); res = getaddrinfo(address, port, &p, &h);
} }
if (res != 0)
{
snprintf(errorMsg, 255, "g_tcp_connect: getaddrinfo() failed: %s",
gai_strerror(res));
log_message(LOG_LEVEL_ERROR, errorMsg);
}
if (res > -1) if (res > -1)
{ {
if (h != NULL) if (h != NULL)
@ -979,8 +986,8 @@ g_tcp_accept(int sck)
ret = accept(sck, (struct sockaddr *)&s, &i); ret = accept(sck, (struct sockaddr *)&s, &i);
if(ret>0) if(ret>0)
{ {
snprintf(ipAddr,255,"A connection received from: %s port %d" snprintf(ipAddr, 255, "A connection received from: %s port %d",
,inet_ntoa(s.sin_addr),ntohs(s.sin_port)); inet_ntoa(s.sin_addr), ntohs(s.sin_port));
log_message(LOG_LEVEL_INFO,ipAddr); log_message(LOG_LEVEL_INFO,ipAddr);
} }
return ret ; return ret ;