* Began implementation of WebCit connecting to Citadel server using IPv6

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 755469ccdadb3b91b045d35f0e85c665d5239771..83f841555770bd72c810a1693777642bd823fd78 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -168,7 +168,7 @@ int GetConnected (void)
        if (is_uds) /* unix domain socket */
                WCC->serv_sock = uds_connectsock(serv_sock_name);
        else        /* tcp socket */
-               WCC->serv_sock = tcp_connectsock(ctdlhost, atoi(ctdlport));
+               WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
        
        if (WCC->serv_sock < 0) {
                do_logout();

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index fe7ce36e9aa651bb58472791ef99cb3463aa6b97..fa37c18d3a7ff42f0264cb8f4e02427480f54144 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -69,41 +69,80 @@ int uds_connectsock(char *sockpath)
 
 
 /*
- * TCP client - connect to a host/port (FIXME this needs to be IPv6 enabled)
+ * TCP client - connect to a host/port 
  */
-int tcp_connectsock(char *host, int port)
+int tcp_connectsock(char *host, char *service)
 {
-       struct sockaddr_in stSockAddr;
-       int rv;
-       int sock;
-
-       sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if (sock < 0) {
-               lprintf(1, "Can't create socket: %s\n", strerror(errno));
+       struct in6_addr serveraddr;
+       struct addrinfo hints;
+       struct addrinfo *res = NULL;
+       struct addrinfo *ai = NULL;
+       int rc = (-1);
+       int s = (-1);
+
+       if ((host == NULL) || IsEmptyStr(host))
+               return (-1);
+       if ((service == NULL) || IsEmptyStr(service))
                return (-1);
+
+       lprintf(9, "tcp_connectsock(%s,%s)\n", host, service);
+
+       memset(&hints, 0x00, sizeof(hints));
+       hints.ai_flags = AI_NUMERICSERV;
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_STREAM;
+
+       /*
+        * Handle numeric IPv4 and IPv6 addresses
+        */
+       rc = inet_pton(AF_INET, host, &serveraddr);
+       if (rc == 1) {                                          /* dotted quad */
+               hints.ai_family = AF_INET;
+               hints.ai_flags |= AI_NUMERICHOST;
+       } else {
+               rc = inet_pton(AF_INET6, host, &serveraddr);
+               if (rc == 1) {                                  /* IPv6 address */
+                       hints.ai_family = AF_INET6;
+                       hints.ai_flags |= AI_NUMERICHOST;
+               }
        }
 
-       memset(&stSockAddr, 0, sizeof(struct sockaddr_in));
-       stSockAddr.sin_family = AF_INET;
-       stSockAddr.sin_port = htons(port);
-       rv = inet_pton(AF_INET, host, &stSockAddr.sin_addr);
+       /* Begin the connection process */
 
-       if (rv <= 0) {
-               lprintf(1, "Can't grok %s: %s\n", host, strerror(errno));
-               return (-1);
+       rc = getaddrinfo(host, service, &hints, &res);
+       if (rc != 0) {
+               lprintf(1, "%s: %s\n", host, gai_strerror(rc));
+               return(-1);
        }
 
-       if (connect(sock, (const struct sockaddr *)&stSockAddr, sizeof(struct sockaddr_in)) != 0) {
-               lprintf(1, "Can't connect to %s.%d: %s\n", host, port, strerror(errno));
-               close(sock);
-               return (-1);
+       /*
+        * Try all available addresses until we connect to one or until we run out.
+        */
+       for (ai = res; ai != NULL; ai = ai->ai_next) {
+
+               if (ai->ai_family == AF_INET) lprintf(9, "Trying IPv4\n");
+               else if (ai->ai_family == AF_INET6) lprintf(9, "Trying IPv6\n");
+               else lprintf(9, "This is going to fail.\n");
+
+               s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+               if (s < 0) {
+                       lprintf(1, "socket() failed: %s\n", strerror(errno));
+                       return(-1);
+               }
+               rc = connect(s, res->ai_addr, res->ai_addrlen);
+               if (rc >= 0) {
+                       return(s);
+               }
+               else {
+                       lprintf(1, "connect() failed: %s\n", strerror(errno));
+                       close(s);
+               }
        }
 
-       return (sock);
+       return(-1);
 }
 
 
-
 /*
  *  input string from pipe
  */

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 4b76557a057c4159ffd26acb172229a14518000d..860129e2f72036f78e79c2f0f2b5b3c96b42ebbc 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -39,10 +39,11 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/un.h>
 #include <netdb.h>
+#include <sys/un.h>
 #include <sys/poll.h>
 #include <string.h>
 #include <pwd.h>
@@ -53,10 +54,6 @@
 #include <sys/utsname.h>
 #include <libcitadel.h>
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
@@ -647,7 +644,7 @@ void CreateMimeStr(void);
 int GetConnected(void);
 void DeleteServInfo(ServInfo **FreeMe);
 int uds_connectsock(char *);
-int tcp_connectsock(char *, int);
+int tcp_connectsock(char *, char *);
 int serv_getln(char *strbuf, int bufsize);
 int StrBuf_ServGetln(StrBuf *buf);
 int GetServerStatus(StrBuf *Line, long* FullState);