status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpc: set timeout for select() in connecthostport()

This commit is contained in:
Thomas Bernard 2019-01-23 09:44:21 +01:00
parent 510a6e9630
commit 2656f41c7a
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniupnpc/Changelog.txt
View File

@ -1,6 +1,9 @@
$Id: Changelog.txt,v 1.235 2018/05/07 11:05:16 nanard Exp $ $Id: Changelog.txt,v 1.235 2018/05/07 11:05:16 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2019/01/23:
set timeout for select() in connecthostport()
VERSION 2.1 : released 2018/05/07 VERSION 2.1 : released 2018/05/07
2018/05/07: 2018/05/07:

34
miniupnpc/connecthostport.c
View File

@ -2,7 +2,7 @@
/* vim: tabstop=4 shiftwidth=4 noexpandtab /* vim: tabstop=4 shiftwidth=4 noexpandtab
* Project : miniupnp * Project : miniupnp
* Author : Thomas Bernard * Author : Thomas Bernard
* Copyright (c) 2010-2018 Thomas Bernard * Copyright (c) 2010-2019 Thomas Bernard
* This software is subject to the conditions detailed in the * This software is subject to the conditions detailed in the
* LICENCE file provided in this distribution. */ * LICENCE file provided in this distribution. */
@ -116,8 +116,22 @@ SOCKET connecthostport(const char * host, unsigned short port,
int err; int err;
FD_ZERO(&wset); FD_ZERO(&wset);
FD_SET(s, &wset); FD_SET(s, &wset);
if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR) #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
timeout.tv_sec = 3;
timeout.tv_usec = 0;
n = select(s + 1, NULL, &wset, NULL, &timeout);
#else
n = select(s + 1, NULL, &wset, NULL, NULL);
#endif
if(n == -1 && errno == EINTR)
continue; continue;
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
if(n == 0) {
errno = ETIMEDOUT;
n = -1;
break;
}
#endif
/*len = 0;*/ /*len = 0;*/
/*n = getpeername(s, NULL, &len);*/ /*n = getpeername(s, NULL, &len);*/
len = sizeof(err); len = sizeof(err);
@ -213,8 +227,22 @@ SOCKET connecthostport(const char * host, unsigned short port,
int err; int err;
FD_ZERO(&wset); FD_ZERO(&wset);
FD_SET(s, &wset); FD_SET(s, &wset);
if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR) #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
timeout.tv_sec = 3;
timeout.tv_usec = 0;
n = select(s + 1, NULL, &wset, NULL, &timeout);
#else
n = select(s + 1, NULL, &wset, NULL, NULL);
#endif
if(n == -1 && errno == EINTR)
continue; continue;
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
if(n == 0) {
errno = ETIMEDOUT;
n = -1;
break;
}
#endif
/*len = 0;*/ /*len = 0;*/
/*n = getpeername(s, NULL, &len);*/ /*n = getpeername(s, NULL, &len);*/
len = sizeof(err); len = sizeof(err);