kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make socket connection nonblocking to timeout to dead ip addrs 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16611 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2010-02-11 22:16:25 +00:00
parent 28bef5149a
commit 1a5799ad40
1 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libs/miniupnpc/miniwget.c
View File

@ -24,6 +24,7 @@
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h>
#define closesocket close #define closesocket close
#endif #endif
#if defined(__sun) || defined(sun) #if defined(__sun) || defined(sun)
@ -40,9 +41,12 @@ miniwget2(const char * url, const char * host,
int * size, char * addr_str, int addr_str_len) int * size, char * addr_str, int addr_str_len)
{ {
char buf[2048]; char buf[2048];
int s; int s, fd_flags;
struct sockaddr_in dest; struct sockaddr_in dest;
struct hostent *hp; struct hostent *hp;
fd_flags = 0;
*size = 0; *size = 0;
hp = gethostbyname(host); hp = gethostbyname(host);
if(hp==NULL) if(hp==NULL)
@ -61,13 +65,61 @@ miniwget2(const char * url, const char * host,
} }
dest.sin_family = AF_INET; dest.sin_family = AF_INET;
dest.sin_port = htons(port); dest.sin_port = htons(port);
if(connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in))<0)
{ {
perror("connect"); #ifdef WIN32
closesocket(s); u_long arg = 1;
if (ioctlsocket((SOCKET) s, FIONBIO, &arg) == SOCKET_ERROR) {
return NULL; return NULL;
} }
#else
fd_flags = fcntl(s, F_GETFL, 0);
if (fcntl(s, F_SETFL, fd_flags | O_NONBLOCK)) {
return NULL;
}
#endif
}
connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in));
{
fd_set wfds;
struct timeval tv = { 2, 0 };
int r;
FD_ZERO(&wfds);
FD_SET(s, &wfds);
r = select(s + 1, NULL, &wfds, NULL, &tv);
if (r <= 0) {
return NULL;
}
if (!FD_ISSET(s, &wfds)) {
return NULL;
}
}
#ifdef WIN32
{
u_long arg = 0;
if (ioctlsocket((SOCKET) s, FIONBIO, &arg) == SOCKET_ERROR) {
return NULL;
}
}
#else
fcntl(s, F_SETFL, fd_flags);
#endif
/* get address for caller ! */ /* get address for caller ! */
if(addr_str) if(addr_str)
{ {
@ -201,8 +253,9 @@ void * miniwget(const char * url, int * size)
/* protocol://host:port/chemin */ /* protocol://host:port/chemin */
char hostname[MAXHOSTNAMELEN+1]; char hostname[MAXHOSTNAMELEN+1];
*size = 0; *size = 0;
if(!parseURL(url, hostname, &port, &path)) if(!parseURL(url, hostname, &port, &path)) {
return NULL; return NULL;
}
return miniwget2(url, hostname, port, path, size, 0, 0); return miniwget2(url, hostname, port, path, size, 0, 0);
} }