* trunk webcit is now IPv6-enabled by default

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 56aa70347f4fafd19f0937b93a8c2e73521ad3fb..9907bc288caec943d34319e6d0bb4cb31e1b909c 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [7.80], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.81], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index ae99fc3dc85562cb2f6744ff77230bf5916da5e9..ecfc4d3da5ce962b63e3ff295caaa4ac6bb47ed9 100644 (file)
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -23,8 +23,9 @@
 #include "webcit.h"
 
 
-#ifdef CTDL_IPV6
-
+/*
+ * IPv6 enabled locate_host()
+ */
 void locate_host(StrBuf *tbuf, int client_socket)
 {
        struct sockaddr_in6 clientaddr;
@@ -42,8 +43,11 @@ void locate_host(StrBuf *tbuf, int client_socket)
         StrBufAppendBufPlain(tbuf, clienthost, -1, 0);
 }
 
-#else /* CTDL_IPV6 */
 
+#if 0
+/*
+ * IPv4-only locate_host()
+ */
 void locate_host(StrBuf *tbuf, int client_socket)
 {
        struct sockaddr_in cs;
@@ -69,5 +73,4 @@ void locate_host(StrBuf *tbuf, int client_socket)
        }
        StrBufAppendBufPlain(tbuf, ch->h_name, -1, 0);
 }
-
-#endif /* CTDL_IPV6 */
+#endif

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index b73823a58f70de86726abe77b403dac1805b8a93..71d89a949a9f801ff6086b360f0444e5750811fa 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -490,8 +490,6 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
                                                         &Error);
 }
 
-#ifdef CTDL_IPV6
-
 /* 
  * This is a generic function to set up a master socket for listening on
  * a TCP port.  The server shuts down if the bind fails.  (IPv4/IPv6 version)
@@ -560,11 +558,10 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
        return (s);
 }
 
-#else /* CTDL_IPV6 */
-
+#if 0
 /* 
  * This is a generic function to set up a master socket for listening on
- * a TCP port.  The server shuts down if the bind fails.
+ * a TCP port.  The server shuts down if the bind fails.  (Old IPv4-only version)
  *
  * ip_addr     IP address to bind
  * port_number port number to bind
@@ -615,8 +612,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
        }
        return (s);
 }
-
-#endif /* CTDL_IPV6 */
+#endif
 
 
 /*

diff --git a/webcit/webcit.h b/webcit/webcit.h
index e1b1f747c1f97cf1a86646ca1bb738c2090ec058..5c7b506ab5d2daac57487d46a37e695cf5ccb591 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -138,9 +138,9 @@ extern char *ssl_cipher_list;
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         780             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    780             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          780             /* min required libcitadel ver */
+#define CLIENT_VERSION         781             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    781             /* min required Citadel ver */
+#define        LIBCITADEL_MIN          781             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Target for inline URL's */