Correzione per gestire IPv4 e IPv6, fase 1

[gapil.git] / sources / sockconn.c

diff --git a/sources/sockconn.c b/sources/sockconn.c
index 81c982d0481ec37036f48aa5167b70a9efd88867..952910a362892377c9318a45030e5af87652efaa 100644 (file)
--- a/sources/sockconn.c
+++ b/sources/sockconn.c
@@ -37,7 +37,7 @@
 
 int sockconn(char *host, char *serv, int prot, int type) 
 {
-    struct addrinfo hint, *addr;
+    struct addrinfo hint, *addr, *save;
     int res;
     int sock;
     /* initialize hint structure */
@@ -49,20 +49,36 @@ int sockconn(char *host, char *serv, int prot, int type)
     if (res != 0) {                                /* on error exit */
        printf("sockconn cannot resolve host %s, service %s, ", host, serv);
        printf("protocol %d: %s\n", prot, gai_strerror(res));
+       errno = 0;                                 /* clear errno */
        return -1;
     }
-    /* get a socket */
-    sock = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
-    if (sock < 0) {
-       printf("sockconn cannot create socket\n");
-       return sock;
+    /* loop on possible addresses */
+    save = addr;
+    while (addr != NULL) {
+       /* get a socket */
+       sock = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+       if (sock < 0) {
+           if (addr->ai_next == NULL) {
+               addr=addr->ai_next;
+               continue;
+           } else {
+               printf("sockconn cannot create socket\n");
+               return sock;
+           }
+       }
+       /* connect the socket */
+       res = connect(sock, addr->ai_addr, addr->ai_addrlen);
+       if (res < 0) {
+           if (addr->ai_next == NULL) {
+               close(sock);
+               addr=addr->ai_next;
+               continue;
+           } else {
+               printf("sockconn cannot connect socket\n");
+               return res;
+           }
+       }
     }
-    /* connect the socket */
-    res = connect(sock, addr->ai_addr, addr->ai_addrlen);
-    if (res < 0) {
-       printf("sockconn cannot connect socket\n");
-       return res;
-    }
-    freeaddrinfo(addr);         /* done, release memory */
+    freeaddrinfo(save);         /* done, release memory */
     return sock;
 }