X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2Fsockconn.c;h=543abe679109579160be079a889832e6af377e82;hp=81c982d0481ec37036f48aa5167b70a9efd88867;hb=c19330d1e61698f1758d5bf9d340955e1d4d876b;hpb=8654ce33b450ae7bb34c3907835000a0760c2931

diff --git a/sources/sockconn.c b/sources/sockconn.c
index 81c982d..543abe6 100644
--- a/sources/sockconn.c
+++ b/sources/sockconn.c
@@ -28,18 +28,24 @@
  *
  ****************************************************************/
 #include <arpa/inet.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
+#include <unistd.h>
 
 int sockconn(char *host, char *serv, int prot, int type) 
 {
-    struct addrinfo hint, *addr;
+    struct addrinfo hint, *addr, *save;
     int res;
     int sock;
+    int err;
+    char buffer[INET6_ADDRSTRLEN];
+    struct sockaddr_in *ip4;
+    struct sockaddr_in6 *ip6;
     /* initialize hint structure */
     memset(&hint, 0, sizeof(struct addrinfo)); 
     hint.ai_family = PF_UNSPEC;          /* generic address (IPv4 or IPv6) */
@@ -49,20 +55,49 @@ 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) {
+	if (addr->ai_family == PF_INET) {
+	    ip4 = (struct sockaddr_in *) addr->ai_addr;
+	    printf("Indirizzo %s\n", inet_ntop(ip4->sin_family, &ip4->sin_addr,
+					       buffer, sizeof(buffer)));
+	} else {
+      	    ip6 = (struct sockaddr_in6 *) addr->ai_addr;
+	    printf("Indirizzo %s\n", inet_ntop(ip6->sin6_family, 
+					       &ip6->sin6_addr,
+					       buffer, sizeof(buffer)));
+	}
+	/* 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 {
+		err = errno;
+		close(sock);
+		errno = err;
+		printf("sockconn cannot connect socket\n");
+		return res;
+	    }
+	} else break;
     }
-    /* 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;
 }