luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.NET]

Browse source 
* BUG: ServerSocket: Do not use the static string returned by inet_ntoa() 
  for the Connection event argument. It can be erased by ohter calls to
  inet_ntoa()!


git-svn-id: svn://localhost/gambas/trunk@4728 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-05-13 14:52:21 +00:00
parent 0852b3d4ab
commit 96615a348b
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gb.net/src/CServerSocket.c
View file

@ -52,27 +52,37 @@ static void srvsock_post_error(CSERVERSOCKET *_object)
static void CServerSocket_CallBack(int fd, int type, intptr_t lParam)
{
int okval=0;
char *rem_ip_buf;
unsigned int ClientLen;
int okval = 0;
char *remote_ip;
unsigned int clen;
CSERVERSOCKET *_object = (CSERVERSOCKET*)lParam;
if ( SOCKET->status != NET_ACTIVE) return;
if (SOCKET->status != NET_ACTIVE) return;
SOCKET->status = NET_PENDING;
ClientLen=sizeof(struct sockaddr_in);
THIS->Client=accept(SOCKET->socket,(struct sockaddr*)&THIS->so_client.in,&ClientLen);
clen = sizeof(struct sockaddr_in);
THIS->Client = accept(SOCKET->socket, (struct sockaddr*)&THIS->so_client.in, &clen);
if (THIS->Client == -1)
{
close(THIS->Client);
//close(THIS->Client);
SOCKET->status = NET_ACTIVE;
return;
}
rem_ip_buf=inet_ntoa(THIS->so_client.in.sin_addr);
if ( (!THIS->iMaxConn) || (THIS->iCurConn < THIS->iMaxConn) ) okval=1;
if ( (!THIS->iPause) && (okval) )
GB.Raise(THIS,EVENT_Connection,1,GB_T_STRING,rem_ip_buf,0);
if ( SOCKET->status == NET_PENDING) close(THIS->Client);
if ((!THIS->iMaxConn) || (THIS->iCurConn < THIS->iMaxConn))
okval = 1;
if ((!THIS->iPause) && (okval))
{
remote_ip = GB.NewZeroString(inet_ntoa(THIS->so_client.in.sin_addr));
GB.Raise(THIS,EVENT_Connection, 1, GB_T_STRING, remote_ip, GB.StringLength(remote_ip));
GB.FreeString(&remote_ip);
}
if (SOCKET->status == NET_PENDING)
close(THIS->Client);
SOCKET->status = NET_ACTIVE;
}