X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fchat.git;a=blobdiff_plain;f=tcp_connect.c;h=fd1af5e529397ef9468bf9016c60492e286563f0;hp=54ea3fd364b65ceaa37530d8bb0dcc282cfe1670;hb=97183f5a2720f6fd212bcffb5a6a445d5be94338;hpb=68aad407c269e1ccea8ccba21101ab6f93470890 diff --git a/tcp_connect.c b/tcp_connect.c index 54ea3fd..fd1af5e 100644 --- a/tcp_connect.c +++ b/tcp_connect.c @@ -77,9 +77,9 @@ tcp_connect4 (struct dns_srv srv) fd = tcp_connect_a4 (a4->dnsa4_addr[i], srv.port); if (fd >= 0) { - free (a4); - return fd; - } + free (a4); + return fd; + } } free (a4); return -1; @@ -99,16 +99,16 @@ tcp_connect6 (struct dns_srv srv) fd = tcp_connect_a6 (a6->dnsa6_addr[i], srv.port); if (fd >= 0) { - free (a6); + free (a6); return fd; - } + } } free (a6); return -1; } int -tcp_connect (char *server, char *service) +hc_tcp_connect (char *server, char *service) { struct dns_rr_srv *srv; int i; @@ -116,7 +116,7 @@ tcp_connect (char *server, char *service) srv = dns_resolve_srv (NULL, server, service, "tcp", 0); if (srv == NULL) return -1; - dns_srv_sort (srv->dnssrv_srv, srv->dnssrv_nrr); + hc_dns_srv_sort (srv->dnssrv_srv, srv->dnssrv_nrr); for (i = 0; i < srv->dnssrv_nrr; i++) { fd = tcp_connect6 (srv->dnssrv_srv[i]); @@ -124,9 +124,9 @@ tcp_connect (char *server, char *service) fd = tcp_connect4 (srv->dnssrv_srv[i]); if (fd >= 0) { - free (srv); + free (srv); return fd; - } + } } free (srv); return -1; @@ -142,7 +142,7 @@ main (int argc, char **argv) dns_init (NULL, 1); server = (argc >= 2) ? argv[1] : "holoscopio.com"; service = (argc >= 3) ? argv[2] : "xmpp-client"; - fd = tcp_connect (server, service); + fd = hc_tcp_connect (server, service); if (fd > 0) close (fd); return 0;