ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Acccept incoming TCP connections on linux

This commit is contained in:
bossiel 2012-04-23 11:25:34 +00:00
parent debebfe22d
commit f6367d3290
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
branches/2.0/doubango/tinyNET/src/tnet_transport_poll.c
View File

@ -594,6 +594,7 @@ void *tnet_transport_mainthread(void *param)
transport_context_t *context = transport->context; transport_context_t *context = transport->context;
int ret; int ret;
tsk_size_t i; tsk_size_t i;
tsk_bool_t is_stream;
struct sockaddr_storage remote_addr = {0}; struct sockaddr_storage remote_addr = {0};
transport_socket_t* active_socket; transport_socket_t* active_socket;
@ -604,6 +605,8 @@ void *tnet_transport_mainthread(void *param)
goto bail; goto bail;
} }
is_stream = TNET_SOCKET_TYPE_IS_STREAM(transport->master->type);
TSK_DEBUG_INFO("Starting [%s] server with IP {%s} on port {%d}...", transport->description, transport->master->ip, transport->master->port); TSK_DEBUG_INFO("Starting [%s] server with IP {%s} on port {%d}...", transport->description, transport->master->ip, transport->master->port);
while(TSK_RUNNABLE(transport)->running || TSK_RUNNABLE(transport)->started){ while(TSK_RUNNABLE(transport)->running || TSK_RUNNABLE(transport)->started){
@ -671,7 +674,7 @@ void *tnet_transport_mainthread(void *param)
* This apply whatever you are using the 3rd or 5th edition. * This apply whatever you are using the 3rd or 5th edition.
* Download link: http://wiki.forum.nokia.com/index.php/Open_C/C%2B%2B_Release_History * Download link: http://wiki.forum.nokia.com/index.php/Open_C/C%2B%2B_Release_History
*/ */
if(tnet_ioctlt(active_socket->fd, FIONREAD, &len) < 0){ if((tnet_ioctlt(active_socket->fd, FIONREAD, &len) < 0 || !len) && is_stream){
/* It's probably an incoming connection --> try to accept() it */ /* It's probably an incoming connection --> try to accept() it */
tnet_fd_t fd; tnet_fd_t fd;
if((fd = accept(active_socket->fd, tsk_null, 0)) != TNET_INVALID_SOCKET){ if((fd = accept(active_socket->fd, tsk_null, 0)) != TNET_INVALID_SOCKET){
@ -719,7 +722,7 @@ void *tnet_transport_mainthread(void *param)
} }
} }
else { else {
if(TNET_SOCKET_TYPE_IS_STREAM(transport->master->type)){ if(is_stream){
ret = tnet_sockfd_recv(active_socket->fd, buffer, len, 0); ret = tnet_sockfd_recv(active_socket->fd, buffer, len, 0);
} }
else { else {