# HG changeset patch
# User Markus Bröker <mbroeker@largo.dyndns.tv>
# Date 1289617514 -3600
# Node ID b223089872b6302a9819a30237658487d724c04b
# Parent  53ca9bff8b40c16f596d5304dadf705e6df1eb6d
ipv6 support added

committer: Markus Bröker <mbroeker@largo.homelinux.org>

diff --git a/connection.c b/connection.c
--- a/connection.c
+++ b/connection.c
@@ -16,36 +16,38 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-int connection (char *ip, unsigned short port)
+int connection (char *server, char *port)
 {
-    struct hostent *hs;
-    struct sockaddr_in sock;
+    struct addrinfo hints;
+    struct addrinfo *result, *rp;
 
-    int sockfd;
-
-    memset (&sock, 0, sizeof (sock));
-    sock.sin_family = PF_INET;
-    sock.sin_port = htons (port);
+    int sockfd = -1;
 
-    if ((sock.sin_addr.s_addr = inet_addr (ip)) == -1) {
-        if ((hs = gethostbyname (ip)) == NULL) {
-            perror ("[-] Error");
-            return -1;
-        }
-        sock.sin_family = hs->h_addrtype;
-        memcpy (&sock.sin_addr.s_addr, hs->h_addr_list[0], hs->h_length);
-    }
+    memset (&hints, 0, sizeof (struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = 0;
+    hints.ai_protocol = IPPROTO_TCP;
 
-    if ((sockfd = socket (PF_INET, SOCK_STREAM, 0)) < 0) {
-        perror ("[-] Error");
+    if (getaddrinfo (server, port, &hints, &result) != 0) {
+        perror ("getaddrinfo");
         return -1;
     }
 
-    if (connect (sockfd, (struct sockaddr *)&sock, sizeof (sock)) < 0) {
-        perror ("[-] Error ");
-        return -1;
+    for (rp = result; rp != NULL; rp = rp->ai_next) {
+        if ((sockfd = socket (rp->ai_family, rp->ai_socktype, rp->ai_protocol)) == -1)
+            continue;
+
+        if (connect (sockfd, rp->ai_addr, rp->ai_addrlen) != -1) {
+            break;
+        }
+        close (sockfd);
+        sockfd = -1;
     }
 
+    if (result != NULL)
+        freeaddrinfo (result);
+
     return (sockfd);
 }
 
@@ -58,16 +60,16 @@
     int num;
 
     if (argc != 3) {
-        printf ("Usage: %s <ipaddr> <port>\n", argv[0]);
+        printf ("Usage: %s <ipaddr> <service>\n", argv[0]);
         return EXIT_FAILURE;
     }
 
-    if ((sockfd = connection (argv[1], atoi (argv[2]))) < 0) {
-        printf ("Connection error: %s:%d\n", argv[1], atoi (argv[2]));
+    if ((sockfd = connection (argv[1], argv[2])) < 0) {
+        printf ("Connection error: %s:%s\n", argv[1], argv[2]);
         return EXIT_FAILURE;
     }
 
-    if (write (sockfd, "GET /\r\n", 7) == -1) {
+    if (write (sockfd, "GET / HTTP/1.0\r\n\r\n", 18) == -1) {
         perror ("write");
         return EXIT_FAILURE;
     }
diff --git a/dnsresolve.c b/dnsresolve.c
--- a/dnsresolve.c
+++ b/dnsresolve.c
@@ -11,27 +11,42 @@
 
 int main (int argc, char **argv)
 {
-    struct hostent *he;
+    struct addrinfo hints;
+    struct addrinfo *result, *rp;
 
-    char *ip;
-
-    int i = 0;
+    void *addr = NULL;
+    char ip[INET6_ADDRSTRLEN];
 
     if (argc != 2) {
         fprintf (stderr, "Usage: %s <hostname>\n", argv[0]);
         return EXIT_FAILURE;
     }
 
-    he = gethostbyname (argv[1]);
-    ip = NULL;
+    memset (&hints, 0, sizeof (hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+
+    if (getaddrinfo (argv[1], NULL, &hints, &result) != 0) {
+        perror ("getaddrinfo");
+        return EXIT_FAILURE;
+    }
 
-    if (he != NULL) {
-        while (he->h_addr_list[i] != NULL) {
-            ip = inet_ntoa (*((struct in_addr *)he->h_addr_list[i]));
-            printf ("%s: %s\n", argv[1], ip);
-            i++;
+    for (rp = result; rp != NULL; rp = rp->ai_next) {
+        if (rp->ai_family == AF_INET6) {
+            struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)rp->ai_addr;
+            addr = &(ipv6->sin6_addr);
+        } else if (rp->ai_family == AF_INET) {
+            struct sockaddr_in *ipv4 = (struct sockaddr_in *)rp->ai_addr;
+            addr = &(ipv4->sin_addr);
+        }
+        if (addr != NULL) {
+            if (inet_ntop (rp->ai_family, addr, ip, sizeof (ip)) != NULL)
+                printf ("%s: %s\n", argv[1], ip);
         }
     }
 
+    if (result != NULL)
+        freeaddrinfo (result);
+
     return EXIT_SUCCESS;
 }
diff --git a/lsflib/include/lsf/lsf.h b/lsflib/include/lsf/lsf.h
--- a/lsflib/include/lsf/lsf.h
+++ b/lsflib/include/lsf/lsf.h
@@ -31,7 +31,7 @@
 int isFile (char *);
 
 /* isLink returns true, if a fd points to a link */
-int isLink(char *);
+int isLink (char *);
 
 /* getdir prints a dir hierarchy */
 void getdir (char *, int);