[Evolution-hackers] [PATCH] IPv6 Fixes

[Dominik 'Aeneas' Schnitzer <dominik schnitzer at>]

Hi,

Using --enable-ipv6 as configure option doesn't enable IPv6 support in
evolution 1.2.2 (and 1.2.1). ENABLE_IPv6 is just set as an
AM_CONDITIONAL() in the configure script, but needs to be set by
AC_DEFINE() to be used in the .c/.h files.

The first patch fixes this in the configure.in and acconfig.h file.
(configure-in.patch)

By enabling IPv6 I hit a minor IPv6+ssl bug in camel during compilation.
It's a trivial oneliner.

This is fixed in the second patch attached. (camel-ipv6ssl.patch)

---

IPv6 support is really cool in evolution. This mail should already have
an IPv6 hop in it's mailheaders :-))

I am not subscribed to this list - please include my mail if you've got
comments!

best wishes,
domi.

-- 
Dominik 'Aeneas' Schnitzer <dominik schnitzer at>
http://www.schnitzer.at/dominik/ OpenPGP:C0C2CBEE
Latest Update - 24. August 2002: Interrail 2002 pictures

--- evolution/configure.in~	2003-02-17 14:24:09.000000000 +0100
+++ evolution/configure.in	2003-02-17 14:13:39.000000000 +0100
@@ -311,6 +311,9 @@
 else
 	msg_ipv6=no
 fi
+if test "x$enable_ipv6" = "xyes"; then
+	AC_DEFINE(ENABLE_IPv6)
+fi
 AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes")
 
 
--- evolution/acconfig.h~	2003-02-17 14:24:20.000000000 +0100
+++ evolution/acconfig.h	2003-02-17 14:14:29.000000000 +0100
@@ -26,6 +26,7 @@
 #undef HAVE_BROKEN_SPOOL
 #undef ENABLE_PEDANTIC_PGPMIME
 #undef HAVE_KDE_APPLNK
+#undef ENABLE_IPv6
 
 /* db3 version */
 #undef EVOLUTION_DB_VERSION_MAJOR

--- evolution/camel/camel-tcp-stream-ssl.c~	2003-02-17 15:39:02.000000000 +0100
+++ evolution/camel/camel-tcp-stream-ssl.c	2003-02-17 15:36:44.000000000 +0100
@@ -1003,7 +1003,7 @@
 	
 	memset ((void *) &netaddr, 0, sizeof (PRNetAddr));
 #ifdef ENABLE_IPv6
-	if (h->addrtype == AF_INET6)
+	if (host->h_addrtype == AF_INET6)
 		memcpy (&netaddr.ipv6.ip, host->h_addr, sizeof (netaddr.ipv6.ip));
 	else
 		memcpy (&netaddr.inet.ip, host->h_addr, sizeof (netaddr.inet.ip));