dreid 00/11/06 06:19:01
Modified: src/lib/apr aclocal.m4 configure.in
src/lib/apr/include apr.h.in
Log:
This commit adds the start of IPv6 support. Before we all get too excited,
please note that it doesn't do anything at present. All this adds is the
configure checks and a few variables that will be used by the code.
Can anyone on an IPv6 system please see how these work and report any problems
so we can refine our plans before we submit the next patch? Thanks.
Systems tested so far are FreeBSD 4, Mandrake 7 and Solaris 8.
Reviewed by: Jeff Trawick
Revision Changes Path
1.29 +54 -0 apache-2.0/src/lib/apr/aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- aclocal.m4 2000/10/05 05:42:04 1.28
+++ aclocal.m4 2000/11/06 14:18:58 1.29
@@ -343,5 +343,59 @@
fi
])
+AC_DEFUN(APR_CHECK_SOCKADDR_IN6,[
+AC_CACHE_CHECK(for sockaddr_in6, ac_cv_define_sockaddr_in6,[
+AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+],[
+struct sockaddr_in6 sa;
+],[
+ ac_cv_define_sockaddr_in6=yes
+],[
+ ac_cv_define_sockaddr_in6=no
+])
+])
+
+if test "$ac_cv_define_sockaddr_in6" = "yes"; then
+ have_sockaddr_in6=1
+else
+ have_sockaddr_in6=0
+fi
+])
+
+#
+# Check to see if this platform includes sa_len in it's
+# struct sockaddr. If it does it changes the length of sa_family
+# which could cause us problems
+#
+AC_DEFUN(APR_CHECK_SOCKADDR_SA_LEN,[
+AC_CACHE_CHECK(for sockaddr sa_len, ac_cv_define_sockaddr_sa_len,[
+AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+],[
+struct sockaddr_in sai;
+int i = sai.sin_len;
+],[
+ ac_cv_define_sockaddr_sa_len=yes
+],[
+ ac_cv_define_sockaddr_sa_len=no
+])
+])
+
+if test "$ac_cv_define_sockaddr_sa_len" = "yes"; then
+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1 ,[Define if we have length field in
sockaddr_in])
+fi
+])
+
sinclude(apr_common.m4)
sinclude(hints.m4)
1.165 +14 -1 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- configure.in 2000/11/02 05:10:28 1.164
+++ configure.in 2000/11/06 14:18:58 1.165
@@ -699,8 +699,21 @@
AC_SUBST(have_in_addr)
AC_SUBST(file_as_socket)
+AC_CHECK_FUNCS(inet_pton)
+AC_CHECK_FUNCS(inet_ntop)
+APR_CHECK_SOCKADDR_SA_LEN
+
APR_CHECK_GETHOSTBYNAME_NAS
+echo "${nl}IPv6 Networking support??"
+dnl # Start of checking for IPv6 support...
+AC_SEARCH_LIBS(getaddrinfo, inet6)
+AC_CHECK_FUNCS(getaddrinfo)
+AC_CHECK_FUNCS(getipnodebyname)
+AC_CHECK_FUNCS(getipnodebyaddr)
+APR_CHECK_SOCKADDR_IN6
+AC_SUBST(have_sockaddr_in6)
+
dnl #----------------------------- Construct the files
AC_SUBST(LDLIBS)
@@ -715,7 +728,7 @@
AC_SUBST(THREAD_CPPFLAGS)
AC_SUBST(THREAD_CFLAGS)
-echo "Construct Makefiles and header files."
+echo "${nl}${nl}Construct Makefiles and header files."
MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile
tables/Makefile"
SUBDIRS="lib strings passwd tables "
for dir in $MODULES
1.48 +2 -0 apache-2.0/src/lib/apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apr.h.in 2000/10/25 02:46:43 1.47
+++ apr.h.in 2000/11/06 14:19:00 1.48
@@ -74,6 +74,8 @@
#define APR_HAVE_STRSTR @have_strstr@
#define APR_HAVE_MEMMOVE @have_memmove@
#define APR_HAVE_BZERO @have_bzero@
+#define APR_HAVE_V6 @have_sockaddr_in6@
+
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
