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

FS-5325 this should prefer v4 addrs to avoid the blocking on connect as well so you can use the dns name again

This commit is contained in:
Anthony Minessale 2013-04-24 10:49:04 -05:00
parent 6368321bd3
commit 9dcfc67dd0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/iksemel/.update
View File

@ -1 +1 @@
Wed Apr 24 10:12:23 CDT 2013 Wed Apr 24 10:48:25 CDT 2013

8
libs/iksemel/src/io-posix.c
View File

@ -37,9 +37,14 @@ io_connect (iksparser *prs, void **socketptr, const char *server, int port)
struct addrinfo *addr_res, *addr_ptr; struct addrinfo *addr_res, *addr_ptr;
char port_str[6]; char port_str[6];
int err = 0; int err = 0;
int family = AF_INET;
if (strchr(server, ':')) {
family = AF_INET6;
}
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
hints.ai_family = PF_UNSPEC; hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = 0; hints.ai_protocol = 0;
hints.ai_addrlen = 0; hints.ai_addrlen = 0;
@ -58,6 +63,7 @@ io_connect (iksparser *prs, void **socketptr, const char *server, int port)
if (sock != -1) { if (sock != -1) {
err = IKS_NET_NOCONN; err = IKS_NET_NOCONN;
tmp = connect (sock, addr_ptr->ai_addr, addr_ptr->ai_addrlen); tmp = connect (sock, addr_ptr->ai_addr, addr_ptr->ai_addrlen);
if (tmp == 0) break; if (tmp == 0) break;
io_close ((void *) sock); io_close ((void *) sock);
sock = -1; sock = -1;