[cvslog] (2003-11-01 23:27:09 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sat Nov 1 17:27:09 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-11-01 23:27:08 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     NEWS acconfig.h aclocal.m4 config.h.in configure configure.in
     eggdrop.conf doc/UPDATES1.6 doc/html/egg-core.html
     doc/html/mod-server.html doc/html/news.html
     doc/settings/core.settings doc/settings/mod.server
     src/Makefile.in src/botnet.c src/cmds.c src/dcc.c src/eggdrop.h
     src/main.c src/modules.c src/net.c src/patch.h src/proto.h
     src/tcl.c src/tcldcc.c src/tclmisc.c src/compat/Makefile.in
     src/compat/compat.h src/md5/Makefile.in src/mod/Makefile.in
     src/mod/module.h src/mod/assoc.mod/Makefile
     src/mod/blowfish.mod/Makefile src/mod/channels.mod/Makefile
     src/mod/compress.mod/Makefile.in src/mod/console.mod/Makefile
     src/mod/ctcp.mod/Makefile src/mod/dns.mod/Makefile.in
     src/mod/dns.mod/configure src/mod/dns.mod/configure.in
     src/mod/dns.mod/dns.c src/mod/filesys.mod/Makefile
     src/mod/filesys.mod/filesys.c src/mod/irc.mod/Makefile
     src/mod/notes.mod/Makefile src/mod/seen.mod/Makefile
     src/mod/server.mod/Makefile src/mod/server.mod/server.c
     src/mod/server.mod/servmsg.c src/mod/share.mod/Makefile
     src/mod/share.mod/share.c src/mod/transfer.mod/Makefile
     src/mod/transfer.mod/transfer.c src/mod/uptime.mod/Makefile
     src/mod/wire.mod/Makefile src/mod/woobie.mod/Makefile

Removed files:
     doc/IPV6 doc/html/ipv6.html src/compat/inet_ntop.c
     src/compat/inet_ntop.h

Log message:

* Remove IPv6 for now. I know we've discussed this on the lists and in
  #eggdrop/#eggdev on Undernet, and I think we pretty much agreed (as far
  as 'agreeing' goes on eggdev anyway ;p) to ditch this hacked togeather
  code and get Ian's code tested and put that in an upcoming release instead.
  IPv6 realllyyyyyyy screwed up .15. I'm basically ready to release .16..
  can anyone think of anything else that needs to be done? Bugzilla is dead
  and i'm not sure if eggdev's up or not, but changes appears to work. The
  lists have been down alot lately. Anyway, e-mail me if I forgot any little
  pieces, but I don't think I did. -- Wcc

---------------------- diff included ----------------------
Index: eggdrop1.6/NEWS
diff -u eggdrop1.6/NEWS:1.28 eggdrop1.6/NEWS:1.29
--- eggdrop1.6/NEWS:1.28	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/NEWS	Sat Nov  1 17:26:56 2003
@@ -56,11 +56,6 @@
     gzip support to Eggdrop (via Tcl commands) and enables compressed
     userfile transfer. See doc/settings/mod.compress for more information.
 
-  IPV6 SUPPORT
-
-    Eggdrop now supports version 6 of the IP protocol. See doc/IPV6 for
-    information about how to enable Eggdrop's support for IPv6.
-
   SHARE MODULE
 
     The share module has a new setting now (override-bots) which allows
Index: eggdrop1.6/acconfig.h
diff -u eggdrop1.6/acconfig.h:1.18 eggdrop1.6/acconfig.h:1.19
--- eggdrop1.6/acconfig.h:1.18	Tue Jun 10 10:16:07 2003
+++ eggdrop1.6/acconfig.h	Sat Nov  1 17:26:56 2003
@@ -5,17 +5,11 @@
  * acconfig.h
  *   template file autoheader uses when building config.h.in
  * 
- * $Id: acconfig.h,v 1.18 2003/06/10 15:16:07 stdarg Exp $
+ * $Id: acconfig.h,v 1.19 2003/11/01 23:26:56 wcc Exp $
  */
 
 /* Define if stripping is enabled. */
 #undef ENABLE_STRIP
-
-/* Define if you want to enable IPv6 support. */
-#undef HAVE_IPV6
-
-/* Define if you have support for socklen_t. */
-#undef HAVE_SOCKLEN_T
 
 /* Define if modules will work on your system. */
 #undef MODULES_OK
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.71 eggdrop1.6/aclocal.m4:1.72
--- eggdrop1.6/aclocal.m4:1.71	Tue Jun 10 10:16:07 2003
+++ eggdrop1.6/aclocal.m4	Sat Nov  1 17:26:56 2003
@@ -1,7 +1,7 @@
 dnl aclocal.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: aclocal.m4,v 1.71 2003/06/10 15:16:07 stdarg Exp $
+dnl $Id: aclocal.m4,v 1.72 2003/11/01 23:26:56 wcc Exp $
 dnl
 
 
@@ -43,87 +43,6 @@
 
 EOF
   exit 1
-fi
-])dnl
-
-dnl  EGG_IPV6_SUPPORTED()
-dnl
-AC_DEFUN(EGG_IPV6_SUPPORTED, [dnl
-AC_MSG_CHECKING(for kernel IPv6 support)
-AC_CACHE_VAL(egg_cv_ipv6_supported,[
- AC_TRY_RUN([
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-
-int main()
-{
-  struct sockaddr_in6 sin6;
-  int s = socket(AF_INET6, SOCK_STREAM, 0);
-
-  if (s != -1)
-    close(s);
-  return (s == -1);
-}
-], egg_cv_ipv6_supported=yes, egg_cv_ipv6_supported=no,
-egg_cv_ipv6_supported=no)])
-if test "$egg_cv_ipv6_supported" = "yes"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-])dnl
-
-dnl  EGG_IPV6_OPTIONS()
-dnl
-AC_DEFUN(EGG_IPV6_OPTIONS, [dnl
-AC_MSG_CHECKING(whether or not you enabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [  --enable-ipv6           enable IPv6 support],
-[ ac_cv_ipv6="yes"
-  if test "$egg_cv_ipv6_supported" = "no"; then
-    ac_cv_ipv6="no"
-  fi
-  AC_MSG_RESULT($ac_cv_ipv6)
-],
-[ ac_cv_ipv6="no"
-  AC_MSG_RESULT(no)
-])
-if test "$ac_cv_ipv6" = "yes"; then
-  AC_DEFINE(HAVE_IPV6)
-  ENABLEIPV6="--enable-ipv6"
-fi
-AC_SUBST(ENABLEIPV6)
-])dnl
-
-dnl  EGG_CHECK_SOCKLEN_T()
-dnl
-AC_DEFUN(EGG_CHECK_SOCKLEN_T, [dnl
-AC_MSG_CHECKING(for socklen_t)
-AC_CACHE_VAL(egg_cv_socklen_t,[
-  AC_TRY_RUN([
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int main()
-{
-  socklen_t test = sizeof(int);
-
-  return 0;
-}
-  ],
-egg_cv_socklen_t=yes, egg_cv_socklen_t=no, egg_cv_socklen_t=no)])
-if test "$egg_cv_socklen_t" = "yes"; then
-  AC_DEFINE(HAVE_SOCKLEN_T)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
 fi
 ])dnl
 
Index: eggdrop1.6/config.h.in
diff -u eggdrop1.6/config.h.in:1.33 eggdrop1.6/config.h.in:1.34
--- eggdrop1.6/config.h.in:1.33	Tue Jun 10 14:05:37 2003
+++ eggdrop1.6/config.h.in	Sat Nov  1 17:26:56 2003
@@ -5,18 +5,12 @@
  * acconfig.h
  *   template file autoheader uses when building config.h.in
  * 
- * $Id: config.h.in,v 1.33 2003/06/10 19:05:37 wcc Exp $
+ * $Id: config.h.in,v 1.34 2003/11/01 23:26:56 wcc Exp $
  */
 
 /* Define if stripping is enabled. */
 #undef ENABLE_STRIP
 
-/* Define if you want to enable IPv6 support. */
-#undef HAVE_IPV6
-
-/* Define if you have support for socklen_t. */
-#undef HAVE_SOCKLEN_T
-
 /* Define if modules will work on your system. */
 #undef MODULES_OK
 
@@ -82,20 +76,11 @@
 /* Define to 1 if you have the `getdtablesize' function. */
 #undef HAVE_GETDTABLESIZE
 
-/* Define to 1 if you have the `gethostbyname2' function. */
-#undef HAVE_GETHOSTBYNAME2
-
-/* Define to 1 if you have the `getipnodebyname' function. */
-#undef HAVE_GETIPNODEBYNAME
-
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
 /* Define to 1 if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.98 eggdrop1.6/configure:1.99
--- eggdrop1.6/configure:1.98	Tue Jun 10 14:05:37 2003
+++ eggdrop1.6/configure	Sat Nov  1 17:26:56 2003
@@ -306,7 +306,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT ENABLEIPV6 EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -839,7 +839,6 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-strip          enable stripping of executables
   --disable-cc-optimization  disable -O2 cflag
-  --enable-ipv6           enable IPv6 support
   --disable-tcl-threads   disable threaded Tcl support if detected
 
 Optional Packages:
@@ -5980,160 +5979,6 @@
 
 
 
-# Check for IPv6 support
-echo "$as_me:$LINENO: checking for kernel IPv6 support" >&5
-echo $ECHO_N "checking for kernel IPv6 support... $ECHO_C" >&6
-if test "${egg_cv_ipv6_supported+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- if test "$cross_compiling" = yes; then
-  egg_cv_ipv6_supported=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-
-int main()
-{
-  struct sockaddr_in6 sin6;
-  int s = socket(AF_INET6, SOCK_STREAM, 0);
-
-  if (s != -1)
-    close(s);
-  return (s == -1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  egg_cv_ipv6_supported=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-egg_cv_ipv6_supported=no
-fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-if test "$egg_cv_ipv6_supported" = "yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-echo "$as_me:$LINENO: checking whether or not you enabled IPv6 support" >&5
-echo $ECHO_N "checking whether or not you enabled IPv6 support... $ECHO_C" >&6
-# Check whether --enable-ipv6 or --disable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then
-  enableval="$enable_ipv6"
-   ac_cv_ipv6="yes"
-  if test "$egg_cv_ipv6_supported" = "no"; then
-    ac_cv_ipv6="no"
-  fi
-  echo "$as_me:$LINENO: result: $ac_cv_ipv6" >&5
-echo "${ECHO_T}$ac_cv_ipv6" >&6
-
-else
-   ac_cv_ipv6="no"
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi;
-if test "$ac_cv_ipv6" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_IPV6 1
-_ACEOF
-
-  ENABLEIPV6="--enable-ipv6"
-fi
-
-
-echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-if test "${egg_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-  if test "$cross_compiling" = yes; then
-  egg_cv_socklen_t=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int main()
-{
-  socklen_t test = sizeof(int);
-
-  return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  egg_cv_socklen_t=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-( exit $ac_status )
-egg_cv_socklen_t=no
-fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-if test "$egg_cv_socklen_t" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
-
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
 # Checks for library functions
 
 
@@ -6145,10 +5990,7 @@
 
 
 
-
-
-
-for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom
+for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -6229,7 +6071,7 @@
 
 
 
-for ac_func in dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop memcpy strftime fsync gethostbyname2 getipnodebyname
+for ac_func in memset random srandom dlopen dprintf snprintf vsnprintf isascii inet_aton memcpy strftime fsync
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -7862,7 +7704,6 @@
 s, at SHLIB_STRIP@,$SHLIB_STRIP,;t t
 s, at DEFAULT_MAKE@,$DEFAULT_MAKE,;t t
 s, at MOD_EXT@,$MOD_EXT,;t t
-s, at ENABLEIPV6@,$ENABLEIPV6,;t t
 s, at EGGEXEC@,$EGGEXEC,;t t
 s, at TCLLIB@,$TCLLIB,;t t
 s, at TCLLIBFN@,$TCLLIBFN,;t t
Index: eggdrop1.6/configure.in
diff -u eggdrop1.6/configure.in:1.55 eggdrop1.6/configure.in:1.56
--- eggdrop1.6/configure.in:1.55	Tue May  6 23:45:10 2003
+++ eggdrop1.6/configure.in	Sat Nov  1 17:26:56 2003
@@ -54,14 +54,9 @@
 AC_CHECK_SIZEOF(long, 0)
 AC_CHECK_SIZEOF(int, 0)
 
-# Check for IPv6 support
-EGG_IPV6_SUPPORTED
-EGG_IPV6_OPTIONS
-EGG_CHECK_SOCKLEN_T
-
 # Checks for library functions
-AC_CHECK_FUNCS(clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom)
-AC_CHECK_FUNCS(dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop memcpy strftime fsync gethostbyname2 getipnodebyname)
+AC_CHECK_FUNCS(clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize)
+AC_CHECK_FUNCS(memset random srandom dlopen dprintf snprintf vsnprintf isascii inet_aton memcpy strftime fsync)
 EGG_CHECK_FUNC_VSPRINTF
 
 # Make sure we have stdc headers, since we can't compile without them
Index: eggdrop1.6/doc/IPV6
diff -u eggdrop1.6/doc/IPV6:1.1 eggdrop1.6/doc/IPV6:removed
--- eggdrop1.6/doc/IPV6:1.1	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/doc/IPV6	Sat Nov  1 17:27:08 2003
@@ -1,22 +0,0 @@
-Eggdrop IPv6 Information
-Last revised: April 16, 2003
-     _________________________________________________________________
-
-                         Eggdrop IPv6 Information
-
-
-    To enable IPv6 support, preform the following steps:
-
-      1. Run the following command from the eggdrop source directory:
-
-           ./configure --enable-ipv6
-
-      2. Continue compiling the bot, starting with 'make config'.
-
-      3. Follow the remaining install directions in the INSTALL file in the
-         Eggdrop source root directory.
-
-      4. Set 'my-ip6', 'my-ip', and 'my-hostname6' in your config file.
-     _________________________________________________________________
-
-   Copyright (C) 2003 Eggheads Development Team
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.513 eggdrop1.6/doc/UPDATES1.6:1.514
--- eggdrop1.6/doc/UPDATES1.6:1.513	Sat Nov  1 14:04:32 2003
+++ eggdrop1.6/doc/UPDATES1.6	Sat Nov  1 17:26:56 2003
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.513 2003/11/01 20:04:32 wcc Exp $
+$Id: UPDATES1.6,v 1.514 2003/11/01 23:26:56 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by     Fixed by  What...
+various      Wcc       removed IPv6 for now, will be implemented in a more
+                       proper way in an upcoming release
              BarkerJr  cleaned up "illegal channel option" Tcl errors
 Darki        Wiktor    .chanset accepts '*', reflect in the docs
 T. Salomäki  Eule      fixed bug 365 (missing call to check_this_user in 
Index: eggdrop1.6/doc/html/egg-core.html
diff -u eggdrop1.6/doc/html/egg-core.html:1.31 eggdrop1.6/doc/html/egg-core.html:1.32
--- eggdrop1.6/doc/html/egg-core.html:1.31	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/doc/html/egg-core.html	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.31 2003/04/17 04:38:33 wcc Exp $ -->
+<!-- $Id: egg-core.html,v 1.32 2003/11/01 23:26:57 wcc Exp $ -->
 
 <html>
   <head>
@@ -135,14 +135,6 @@
           You can specify either by hostname or by IP. You may also want to
           set the hostname here if Eggdrop has trouble detecting it when it
           starts up.</p>
-        </dd>
-
-        <dt><strong>set my-hostname6 &quot;virtual.host.com&quot;</strong></dt>
-        <dt><strong>set my-ip6 &quot;2001:1:1:1::1&quot;</strong></dt>
-
-        <dd>
-          <p>If you&quot;re using IPv6 support, set the IPv6 IP address and
-          hostname to bind to here. You still need to set my-ip.</p>
         </dd>
 
         <dt><strong>addlang &quot;english&quot;</strong></dt>
Index: eggdrop1.6/doc/html/ipv6.html
diff -u eggdrop1.6/doc/html/ipv6.html:1.1 eggdrop1.6/doc/html/ipv6.html:removed
--- eggdrop1.6/doc/html/ipv6.html:1.1	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/doc/html/ipv6.html	Sat Nov  1 17:27:08 2003
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: ipv6.html,v 1.1 2003/04/17 04:38:33 wcc Exp $ -->
-
-<html>
-  <head>
-    <title>Eggdrop Documentation: Eggdrop IPv6 Information</title>
-  </head>
-
-  <body>
-    <div align="center">
-      <p><strong>Eggdrop IPv6 Information</strong></p>
-    </div>
-    <hr>
-
-    <p>To enable IPv6 support, preform the following steps:</p>
-
-    <blockquote>
-      <ol>
-        <li>
-          <p>Run the following command from the eggdrop source directory:</p>
-
-          <blockquote>
-            <p>./configure --enable-ipv6</p>
-          </blockquote>
-        </li>
-
-        <li>
-          <p>Continue compiling the bot, starting with &#39;make
-          config&#39;.</p>
-        </li>
-
-        <li>
-          <p>Follow the remaining install directions in the INSTALL file in the
-         Eggdrop source root directory.</p>
-        </li>
-
-        <li>
-          <p>Set &#39;my-ip6&#39;, &#39;my-ip&#39;, and &#39;my-hostname6&#39;
-          in your config file.</p>
-        </li>
-      </ol>
-    </blockquote>
-    <hr>
-
-    <p><em>Copyright &copy; 1997 Robey Pointer<br>
-    Copyright &copy; 2003
-    <a href="http://www.eggheads.org/"> Eggheads Development Team</a></em></p>
-  </body>
-</html>
Index: eggdrop1.6/doc/html/mod-server.html
diff -u eggdrop1.6/doc/html/mod-server.html:1.29 eggdrop1.6/doc/html/mod-server.html:1.30
--- eggdrop1.6/doc/html/mod-server.html:1.29	Sun Aug 17 22:27:05 2003
+++ eggdrop1.6/doc/html/mod-server.html	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.29 2003/08/18 03:27:05 wcc Exp $ -->
+<!-- $Id: mod-server.html,v 1.30 2003/11/01 23:26:57 wcc Exp $ -->
 
 <html>
   <head>
@@ -127,9 +127,6 @@
 <pre>
         you.need.to.change.this:6667
         another.example.com:7000:password
-        {[3ffe:1234:2345::ABCD]}
-        {[3ffe:1234:2345::BCDE]:6668}
-        {[3ffe:1234:2345::CDEF]:6667:password}
 </pre>
         <p><strong>}</strong></p>
 
Index: eggdrop1.6/doc/html/news.html
diff -u eggdrop1.6/doc/html/news.html:1.26 eggdrop1.6/doc/html/news.html:1.27
--- eggdrop1.6/doc/html/news.html:1.26	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/doc/html/news.html	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: news.html,v 1.26 2003/04/17 04:38:33 wcc Exp $ -->
+<!-- $Id: news.html,v 1.27 2003/11/01 23:26:57 wcc Exp $ -->
 
 <html>
   <head>
@@ -88,14 +88,6 @@
       gzip support to Eggdrop via Tcl commands and enables compressed
       userfile transfer. See <a href="mod-compress.html">Compress Module</a>
       for more information.</p>
-    </blockquote>
-
-    <p><strong>IPv6 Support</strong></p>
-
-    <blockquote>
-      <p>Eggdrop now supports version 6 of the IP protocol. See
-      <a href="ipv6.html">IPv6</a> for information about how to enable
-      Eggdrop&#39;s support for IPv6.</p>
     </blockquote>
 
     <p><strong>Share Module</strong></p>
Index: eggdrop1.6/doc/settings/core.settings
diff -u eggdrop1.6/doc/settings/core.settings:1.24 eggdrop1.6/doc/settings/core.settings:1.25
--- eggdrop1.6/doc/settings/core.settings:1.24	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/doc/settings/core.settings	Sat Nov  1 17:26:57 2003
@@ -72,12 +72,6 @@
     Eggdrop has trouble detecting it when it starts up.
 
 
-  set my-hostname6 "virtual.host.com"
-  set my-ip6 "2001:1:1:1::1"
-    If you're using IPv6 support, set the IPv6 IP address and hostname to bind
-    to here. You still need to set my-ip.
-
-
   addlang "english"
     If you want to have your Eggdrop messages displayed in another language,
     change this command to match your preferences. An alternative would be
Index: eggdrop1.6/doc/settings/mod.server
diff -u eggdrop1.6/doc/settings/mod.server:1.28 eggdrop1.6/doc/settings/mod.server:1.29
--- eggdrop1.6/doc/settings/mod.server:1.28	Sun Aug 17 22:27:05 2003
+++ eggdrop1.6/doc/settings/mod.server	Sat Nov  1 17:26:57 2003
@@ -76,9 +76,6 @@
    set servers {
      you.need.to.change.this:6667
      another.example.com:7000:password
-     {[3ffe:1234:2345::ABCD]}
-     {[3ffe:1234:2345::BCDE]:6668}
-     {[3ffe:1234:2345::CDEF]:6667:password}
    }
      This is the bot's server list. The bot will start at the first server
      listed, and cycle through them whenever it gets disconnected. You need to
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.28 eggdrop1.6/eggdrop.conf:1.29
--- eggdrop1.6/eggdrop.conf:1.28	Sun Aug 17 22:27:05 2003
+++ eggdrop1.6/eggdrop.conf	Sat Nov  1 17:26:56 2003
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.28 2003/08/18 03:27:05 wcc Exp $
+# $Id: eggdrop.conf,v 1.29 2003/11/01 23:26:56 wcc Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -57,11 +57,6 @@
 #set my-hostname "virtual.host.com"
 #set my-ip "99.99.0.0"
 
-# If you're using IPv6 support, set the IPv6 IP address and hostname to bind to
-# here. You still need to set my-ip.
-#set my-hostname6 "virtual.host.com"
-#set my-ip6 "2001:1:1:1::1"
-
 # If you want to have your Eggdrop messages displayed in a language other
 # than English, change this setting to match your preference. An alternative
 # would be to set the environment variable EGG_LANG to that value.
@@ -813,9 +808,6 @@
 set servers {
   you.need.to.change.this:6667
   another.example.com:7000:password
-  {[3ffe:1234:2345::ABCD]}
-  {[3ffe:1234:2345::BCDE]:6668}
-  {[3ffe:1234:2345::CDEF]:6667:password}
 }
 
 # This setting makes the bot try to get his original nickname back if its
Index: eggdrop1.6/src/Makefile.in
diff -u eggdrop1.6/src/Makefile.in:1.17 eggdrop1.6/src/Makefile.in:1.18
--- eggdrop1.6/src/Makefile.in:1.17	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/
-# $Id: Makefile.in,v 1.17 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile.in,v 1.18 2003/11/01 23:26:57 wcc Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -86,132 +86,132 @@
 #safety hash
 bg.o: ./bg.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h bg.h
 botcmd.o: ./botcmd.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
 botmsg.o: ./botmsg.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
 botnet.o: ./botnet.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
 chanprog.o: ./chanprog.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h
 cmds.o: ./cmds.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
 dcc.o: ./dcc.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h md5/md5.h
 dccutil.o: ./dccutil.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
 dns.o: ./dns.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h dns.h
 flags.o: ./flags.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 language.o: ./language.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 main.o: ./main.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h bg.h patch.h
 match.o: ./match.c ./main.h
 mem.o: ./mem.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h mod/modvals.h
 misc.o: ./misc.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h stat.h
 misc_file.o: ./misc_file.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h stat.h
 modules.o: ./modules.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
 net.o: ./net.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 rfc1459.o: ./rfc1459.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 tcl.o: ./tcl.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 tcldcc.o: ./tcldcc.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
 tclhash.o: ./tclhash.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 tclmisc.o: ./tclmisc.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h md5/md5.h
 tcluser.o: ./tcluser.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
 userent.o: ./userent.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 userrec.o: ./userrec.c main.h ../config.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
- users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
 users.o: ./users.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
- compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
+ compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
Index: eggdrop1.6/src/botnet.c
diff -u eggdrop1.6/src/botnet.c:1.52 eggdrop1.6/src/botnet.c:1.53
--- eggdrop1.6/src/botnet.c:1.52	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/botnet.c	Sat Nov  1 17:26:57 2003
@@ -7,7 +7,7 @@
  *   linking, unlinking, and relaying to another bot
  *   pinging the bots periodically and checking leaf status
  *
- * $Id: botnet.c,v 1.52 2003/04/17 01:55:57 wcc Exp $
+ * $Id: botnet.c,v 1.53 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1054,11 +1054,7 @@
   strcpy(dcc[i].u.bot->version, "(primitive bot)");
   dcc[i].u.bot->numver = idx;
   dcc[i].u.bot->port = dcc[i].port;     /* Remember where i started */
-#ifdef USE_IPV6
-  dcc[i].sock = getsock(SOCK_STRONGCONN, getprotocol(dcc[i].host));
-#else
   dcc[i].sock = getsock(SOCK_STRONGCONN);
-#endif /* USE_IPV6 */
   nfree(linker);
   if (dcc[i].sock < 0 ||
       open_telnet_raw(dcc[i].sock, iptostr(htonl(dcc[i].addr)),
@@ -1094,11 +1090,7 @@
     return;
   }
   killsock(dcc[idx].sock);
-#ifdef USE_IPV6
-  dcc[idx].sock = getsock(SOCK_STRONGCONN, getprotocol(dcc[idx].host));
-#else
   dcc[idx].sock = getsock(SOCK_STRONGCONN);
-#endif /* USE_IPV6 */
   dcc[uidx].u.relay->sock = dcc[idx].sock;
   dcc[idx].port++;
   dcc[idx].timeval = now;
@@ -1144,11 +1136,7 @@
     return;
   }
 
-#ifdef USE_IPV6
-  dcc[i].sock = getsock(SOCK_STRONGCONN | SOCK_VIRTUAL, getprotocol(bi->address));
-#else
   dcc[i].sock = getsock(SOCK_STRONGCONN | SOCK_VIRTUAL);
-#endif /* USE_IPV6 */
   if (dcc[i].sock < 0) {
     lostdcc(i);
     dprintf(idx, "%s\n", MISC_NOFREESOCK);
Index: eggdrop1.6/src/cmds.c
diff -u eggdrop1.6/src/cmds.c:1.100 eggdrop1.6/src/cmds.c:1.101
--- eggdrop1.6/src/cmds.c:1.100	Wed Apr 16 23:52:48 2003
+++ eggdrop1.6/src/cmds.c	Sat Nov  1 17:26:57 2003
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.100 2003/04/17 04:52:48 wcc Exp $
+ * $Id: cmds.c,v 1.101 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -947,11 +947,7 @@
 static void cmd_chaddr(struct userrec *u, int idx, char *par)
 {
   int telnet_port = 3333, relay_port = 3333;
-#ifdef USE_IPV6
-  char *handle, *addr, *p, *q, *r;
-#else
   char *handle, *addr, *p, *q;
-#endif /* USE_IPV6 */
   struct bot_addr *bi;
   struct userrec *u1;
 
@@ -991,31 +987,6 @@
     bi->telnet_port = telnet_port;
     bi->relay_port = relay_port;
   } else {
-#ifdef USE_IPV6
-    r = strchr(addr, '[');
-    if (r) { /* ipv6 notation [3ffe:80c0:225::] */
-      *addr++;
-      r = strchr(addr, ']');
-      bi->address = user_malloc(r - addr + 1);
-      strncpyz(bi->address, addr, r - addr + 1);
-      addr = r;
-      *addr++;
-    } else {
-      bi->address = user_malloc(q - addr + 1);
-      strncpyz(bi->address, addr, q - addr + 1);
-    }
-    q = strchr(addr, ':');
-    if (q) {
-      p = q + 1;
-      bi->telnet_port = atoi(p);
-      q = strchr(p, '/');
-      if (!q) {
-        bi->relay_port = telnet_port;
-      } else {
-        bi->relay_port = atoi(q + 1);
-      }
-    }
-#else
     bi->address = user_malloc(q - addr + 1);
     strncpyz(bi->address, addr, q - addr + 1);
     p = q + 1;
@@ -1025,7 +996,6 @@
       bi->relay_port = bi->telnet_port;
     else
       bi->relay_port = atoi(q + 1);
-#endif /* USE_IPV6 */
   }
   set_user(&USERENTRY_BOTADDR, u1, bi);
 }
Index: eggdrop1.6/src/compat/Makefile.in
diff -u eggdrop1.6/src/compat/Makefile.in:1.6 eggdrop1.6/src/compat/Makefile.in:1.7
--- eggdrop1.6/src/compat/Makefile.in:1.6	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/compat/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/compat/
-# $Id: Makefile.in,v 1.6 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile.in,v 1.7 2003/11/01 23:26:57 wcc Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -18,7 +18,7 @@
 CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
-OBJS = inet_aton.o inet_ntop.o snprintf.o memset.o memcpy.o strcasecmp.o strftime.o
+OBJS = inet_aton.o snprintf.o memset.o memcpy.o strcasecmp.o strftime.o
 
 doofus:
 	@echo ""
@@ -49,17 +49,7 @@
  ../../src/users.h ../../src/compat/compat.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
- ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_aton.h \
- ../../src/compat/inet_ntop.h
- inet_ntop.o: ./inet_ntop.c ../../src/main.h ../../config.h \
- ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
- ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
- ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
- ../../src/users.h ../../src/compat/compat.h \
- ../../src/compat/inet_ntop.h ../../src/compat/snprintf.h \
- ../../src/compat/memset.h ../../src/compat/memcpy.h \
- ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_ntop.h \
- ../../src/compat/inet_aton.h
+ ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_aton.h
 memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
@@ -67,7 +57,7 @@
  ../../src/compat/compat.h ../../src/compat/inet_aton.h \
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
- ../../src/compat/strftime.h memcpy.h  ../../src/compat/inet_ntop.h
+ ../../src/compat/strftime.h memcpy.h
 memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
@@ -75,7 +65,7 @@
  ../../src/compat/compat.h ../../src/compat/inet_aton.h \
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
- ../../src/compat/strftime.h memset.h  ../../src/compat/inet_ntop.h
+ ../../src/compat/strftime.h memset.h
 snprintf.o: ./snprintf.c ../../src/main.h ../../config.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
@@ -83,7 +73,7 @@
  ../../src/users.h ../../src/compat/compat.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
- ../../src/compat/strcasecmp.h   ../../src/compat/inet_ntop.h \
+ ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h snprintf.h
 strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
@@ -92,7 +82,7 @@
  ../../src/users.h ../../src/compat/compat.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
- ../../src/compat/strcasecmp.h   ../../src/compat/inet_ntop.h \
+ ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memcpy.h
 strftime.o: ./strftime.c ../../src/main.h ../../config.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
@@ -101,5 +91,5 @@
  ../../src/users.h ../../src/compat/compat.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
- ../../src/compat/strcasecmp.h   ../../src/compat/inet_ntop.h \
+ ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h strftime.h
Index: eggdrop1.6/src/compat/compat.h
diff -u eggdrop1.6/src/compat/compat.h:1.7 eggdrop1.6/src/compat/compat.h:1.8
--- eggdrop1.6/src/compat/compat.h:1.7	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/compat/compat.h	Sat Nov  1 17:26:57 2003
@@ -2,7 +2,7 @@
  * compat.h
  *   wrap-around header for all compability functions.
  *
- * $Id: compat.h,v 1.7 2003/04/01 05:33:40 wcc Exp $
+ * $Id: compat.h,v 1.8 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -26,7 +26,6 @@
 #define _EGG_COMPAT_COMPAT_H
 
 #include "inet_aton.h"
-#include "inet_ntop.h"
 #include "snprintf.h"
 #include "memset.h"
 #include "memcpy.h"
Index: eggdrop1.6/src/compat/inet_ntop.c
diff -u eggdrop1.6/src/compat/inet_ntop.c:1.4 eggdrop1.6/src/compat/inet_ntop.c:removed
--- eggdrop1.6/src/compat/inet_ntop.c:1.4	Tue May  6 23:57:04 2003
+++ eggdrop1.6/src/compat/inet_ntop.c	Sat Nov  1 17:27:08 2003
@@ -1,207 +0,0 @@
-/*
- * inet_ntop.c --
- *
- *	provides inet_ntop()
- */
-/*
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.4 2003/05/07 04:57:04 wcc Exp $";
-#endif
-
-#include "main.h"
-#include "inet_ntop.h"
-
-#if defined(USE_IPV6) && !defined(HAVE_INET_NTOP)
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-#define NS_INADDRSZ     4       /* IPv4 T_A */
-#define NS_IN6ADDRSZ    16      /* IPv6 T_AAAA */
-#define NS_INT16SZ      2       /* #/bytes of data in a u_int16_t */
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *egg_inet_ntop4 (const u_char *src, char *dst, socklen_t size);
-static const char *egg_inet_ntop6 (const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-egg_inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	socklen_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (egg_inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (egg_inet_ntop6(src, dst, size));
-	default:
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-egg_inet_ntop4(src, dst, size)
-	const u_char *src;
-	char *dst;
-	socklen_t size;
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-
-	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {
-		return (NULL);
-	}
-	return strcpy(dst, tmp);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-egg_inet_ntop6(src, dst, size)
-	const u_char *src;
-	char *dst;
-	socklen_t size;
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	egg_memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i += 2)
-		words[i / 2] = (src[i] << 8) | src[i + 1];
-	best.base = -1;
-	cur.base = -1;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-			if (!egg_inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) ==
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((socklen_t)(tp - tmp) > size) {
-		return (NULL);
-	}
-	return strcpy(dst, tmp);
-}
-#endif /* !HAVE_INET_NTOP */
Index: eggdrop1.6/src/compat/inet_ntop.h
diff -u eggdrop1.6/src/compat/inet_ntop.h:1.3 eggdrop1.6/src/compat/inet_ntop.h:removed
--- eggdrop1.6/src/compat/inet_ntop.h:1.3	Wed May 14 00:27:48 2003
+++ eggdrop1.6/src/compat/inet_ntop.h	Sat Nov  1 17:27:08 2003
@@ -1,46 +0,0 @@
-/*
- * inet_ntop.h --
- *
- *	prototypes for inet_ntop.c
- */
-/*
- * Copyright (C) 2000, 2001, 2002, 2003 Eggheads Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-/*
- * $Id: inet_ntop.h,v 1.3 2003/05/14 05:27:48 stdarg Exp $
- */
-
-#ifndef _EGG_COMPAT_INET_NTOP_H
-#define _EGG_COMPAT_INET_NTOP_H
-
-#include "src/main.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef USE_IPV6
-#  ifndef HAVE_INET_NTOP
-const char *egg_inet_ntop(int af, const void *src, char *dst, socklen_t size);
-#  else
-#    define egg_inet_ntop inet_ntop
-#  endif
-#else
-#  define egg_inet_ntop 0
-#endif
-
-#endif /* !_EGG_COMPAT_INET_NTOP_H */
Index: eggdrop1.6/src/dcc.c
diff -u eggdrop1.6/src/dcc.c:1.68 eggdrop1.6/src/dcc.c:1.69
--- eggdrop1.6/src/dcc.c:1.68	Sat Aug 16 15:12:36 2003
+++ eggdrop1.6/src/dcc.c	Sat Nov  1 17:26:57 2003
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.68 2003/08/16 20:12:36 wcc Exp $
+ * $Id: dcc.c,v 1.69 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -234,11 +234,7 @@
 
   /* Try next port */
   killsock(dcc[idx].sock);
-#ifdef USE_IPV6
-  dcc[idx].sock = getsock(SOCK_STRONGCONN, getprotocol(dcc[idx].host));
-#else
   dcc[idx].sock = getsock(SOCK_STRONGCONN);
-#endif /* USE_IPV6 */
   dcc[idx].port++;
   dcc[idx].timeval = now;
   if (dcc[idx].sock < 0 ||
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.48 eggdrop1.6/src/eggdrop.h:1.49
--- eggdrop1.6/src/eggdrop.h:1.48	Tue May  6 23:45:10 2003
+++ eggdrop1.6/src/eggdrop.h	Sat Nov  1 17:26:57 2003
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.48 2003/05/07 04:45:10 wcc Exp $
+ * $Id: eggdrop.h,v 1.49 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -29,16 +29,6 @@
 #define _EGG_EGGDROP_H
 
 /*
- * Enable IPv6 support?
- */
-#define USE_IPV6
-
-/*
- * Enable IPv6 debugging?
- */
-#define DEBUG_IPV6
-
-/*
  * If you're *only* going to link to new version bots (1.3.0 or higher)
  * then you can safely define this.
  */
@@ -109,22 +99,6 @@
 #  include "error you need vsprintf to compile eggdrop"
 #endif
 
-/* IPv6 sanity checks. */
-#ifdef USE_IPV6
-#  ifndef HAVE_IPV6
-#    undef USE_IPV6
-#  endif
-#  ifndef HAVE_GETHOSTBYNAME2
-#    ifndef HAVE_GETIPNODEBYNAME
-#      undef USE_IPV6
-#    endif
-#  endif
-#endif
-
-#ifndef USE_IPV6
-#  undef DEBUG_IPV6
-#endif
-
 #if HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
@@ -195,10 +169,6 @@
 #  define sigemptyset(x) ((*(int *)(x))=0)
 #endif
 
-#if !HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-
 /*
  *    Handy aliases for memory tracking and core dumps
  */
@@ -287,10 +257,6 @@
 struct dcc_t {
   long sock;                    /* This should be a long to keep 64-bit machines sane */
   IP addr;                      /* IP address in host byte order */
-#ifdef USE_IPV6
-  char addr6[121];              /* easier.. ipv6 address in regular notation (3ffe:80c0:225::) */
-  int af_type;                  /* AF_INET or AF_INET6 */
-#endif /* USE_IPV6 */
   unsigned int port;
   struct userrec *user;
   char nick[NICKLEN];
@@ -604,9 +570,6 @@
   char *outbuf;
   unsigned long outbuflen;      /* Outbuf could be binary data  */
   unsigned long inbuflen;       /* Inbuf could be binary data   */
-#ifdef USE_IPV6
-  unsigned int af;
-#endif /* USE_IPV6 */
 } sock_list;
 
 enum {
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.101 eggdrop1.6/src/main.c:1.102
--- eggdrop1.6/src/main.c:1.101	Mon Jun 30 23:36:26 2003
+++ eggdrop1.6/src/main.c	Sat Nov  1 17:26:57 2003
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.101 2003/07/01 04:36:26 wcc Exp $
+ * $Id: main.c,v 1.102 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -241,11 +241,7 @@
      *       _not_ safe <cybah>
      */
     x = creat("DEBUG.DEBUG", 0644);
-#ifdef USE_IPV6
-    setsock(x, SOCK_NONSOCK, AF_INET);
-#else
     setsock(x, SOCK_NONSOCK);
-#endif /* USE_IPV6 */
     if (x >= 0) {
       strncpyz(s, ctime(&now), sizeof s);
       dprintf(-x, "Debug (%s) written %s\n", ver, s);
@@ -270,11 +266,7 @@
   putlog(LOG_MISC, "*", "* Please REPORT this BUG!");
   putlog(LOG_MISC, "*", "* Check doc/BUG-REPORT on how to do so.");
   x = creat("DEBUG", 0644);
-#ifdef USE_IPV6
-  setsock(x, SOCK_NONSOCK, AF_INET);
-#else
   setsock(x, SOCK_NONSOCK);
-#endif /* USE_IPV6 */
   if (x < 0) {
     putlog(LOG_MISC, "*", "* Failed to write DEBUG");
   } else {
@@ -914,11 +906,7 @@
       userlist = adduser(userlist, "HQ", "none", "-", USER_PARTY);
       dcc[n].user = get_user_by_handle(userlist, "HQ");
     }
-#ifdef USE_IPV6
-    setsock(STDOUT, 0, AF_INET); /* Entry in net table */
-#else
     setsock(STDOUT, 0);          /* Entry in net table */
-#endif /* USE_IPV6 */
     dprintf(n, "\n### ENTERING DCC CHAT SIMULATION ###\n\n");
     dcc_chatter(n);
   }
Index: eggdrop1.6/src/md5/Makefile.in
diff -u eggdrop1.6/src/md5/Makefile.in:1.10 eggdrop1.6/src/md5/Makefile.in:1.11
--- eggdrop1.6/src/md5/Makefile.in:1.10	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/md5/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/md5/
-# $Id: Makefile.in,v 1.10 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile.in,v 1.11 2003/11/01 23:26:57 wcc Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -46,6 +46,6 @@
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
  ../../src/tclhash.h ../../src/chan.h ../../src/users.h \
  ../../src/compat/compat.h ../../src/compat/inet_aton.h \
- ../../src/compat/inet_ntop.h ../../src/compat/snprintf.h \
+ ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h md5.h
Index: eggdrop1.6/src/mod/Makefile.in
diff -u eggdrop1.6/src/mod/Makefile.in:1.14 eggdrop1.6/src/mod/Makefile.in:1.15
--- eggdrop1.6/src/mod/Makefile.in:1.14	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/mod/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/
-# $Id: Makefile.in,v 1.14 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile.in,v 1.15 2003/11/01 23:26:57 wcc Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -23,7 +23,6 @@
 MOD_CPPFLAGS = @CPPFLAGS@
 XLIBS = @XLIBS@
 MOD_EXT = @MOD_EXT@
-ENABLEIPV6 = @ENABLEIPV6@
 
 # Note: The following three lines are automatically adjusted by
 #       misc/modconfig. They have to be present here.
@@ -87,7 +86,7 @@
 			echo "Configuring module $${modname} ..."; \
 			echo ""; \
 			if test ! -d $$i; then mkdir $$i; fi; \
-			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) $(ENABLEIPV6) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
+			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
 		fi; \
 	done; \
 	echo ""
Index: eggdrop1.6/src/mod/assoc.mod/Makefile
diff -u eggdrop1.6/src/mod/assoc.mod/Makefile:1.13 eggdrop1.6/src/mod/assoc.mod/Makefile:1.14
--- eggdrop1.6/src/mod/assoc.mod/Makefile:1.13	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/mod/assoc.mod/Makefile	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/assoc.mod/
-# $Id: Makefile,v 1.13 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:57 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/blowfish.mod/Makefile
diff -u eggdrop1.6/src/mod/blowfish.mod/Makefile:1.12 eggdrop1.6/src/mod/blowfish.mod/Makefile:1.13
--- eggdrop1.6/src/mod/blowfish.mod/Makefile:1.12	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/mod/blowfish.mod/Makefile	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/blowfish.mod/
-# $Id: Makefile,v 1.12 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile,v 1.13 2003/11/01 23:26:57 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/channels.mod/Makefile
diff -u eggdrop1.6/src/mod/channels.mod/Makefile:1.13 eggdrop1.6/src/mod/channels.mod/Makefile:1.14
--- eggdrop1.6/src/mod/channels.mod/Makefile:1.13	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/src/mod/channels.mod/Makefile	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/channels.mod/
-# $Id: Makefile,v 1.13 2003/04/01 05:33:40 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:57 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/compress.mod/Makefile.in
diff -u eggdrop1.6/src/mod/compress.mod/Makefile.in:1.8 eggdrop1.6/src/mod/compress.mod/Makefile.in:1.9
--- eggdrop1.6/src/mod/compress.mod/Makefile.in:1.8	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/compress.mod/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile.in for src/mod/compress.mod/
-# $Id: Makefile.in,v 1.8 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile.in,v 1.9 2003/11/01 23:26:57 wcc Exp $
 
 ZLIB = @ZLIB@
 srcdir = .
@@ -41,7 +41,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h  ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/console.mod/Makefile
diff -u eggdrop1.6/src/mod/console.mod/Makefile:1.15 eggdrop1.6/src/mod/console.mod/Makefile:1.16
--- eggdrop1.6/src/mod/console.mod/Makefile:1.15	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/console.mod/Makefile	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/console.mod/
-# $Id: Makefile,v 1.15 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.16 2003/11/01 23:26:57 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/ctcp.mod/Makefile
diff -u eggdrop1.6/src/mod/ctcp.mod/Makefile:1.12 eggdrop1.6/src/mod/ctcp.mod/Makefile:1.13
--- eggdrop1.6/src/mod/ctcp.mod/Makefile:1.12	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/ctcp.mod/Makefile	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/ctcp.mod/
-# $Id: Makefile,v 1.12 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.13 2003/11/01 23:26:57 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../src/proto.h ../../../lush.h ../../../src/misc_file.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
  ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/dns.mod/Makefile.in
diff -u eggdrop1.6/src/mod/dns.mod/Makefile.in:1.9 eggdrop1.6/src/mod/dns.mod/Makefile.in:1.10
--- eggdrop1.6/src/mod/dns.mod/Makefile.in:1.9	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/dns.mod/Makefile.in	Sat Nov  1 17:26:57 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/dns.mod/
-# $Id: Makefile.in,v 1.9 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile.in,v 1.10 2003/11/01 23:26:57 wcc Exp $
 
 RESLIB = @RESLIB@
 RESINCLUDE = @RESINCLUDE@
@@ -42,7 +42,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h  ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/dns.mod/configure
diff -u eggdrop1.6/src/mod/dns.mod/configure:1.10 eggdrop1.6/src/mod/dns.mod/configure:1.11
--- eggdrop1.6/src/mod/dns.mod/configure:1.10	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/dns.mod/configure	Sat Nov  1 17:26:57 2003
@@ -32,7 +32,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:561: checking for $ac_word" >&5
+echo "configure:559: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -62,7 +62,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:591: checking for $ac_word" >&5
+echo "configure:589: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -113,7 +113,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:642: checking for $ac_word" >&5
+echo "configure:640: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -145,7 +145,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:674: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:672: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -156,12 +156,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 685 "configure"
+#line 683 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -187,12 +187,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:716: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:721: checking whether we are using GNU C" >&5
+echo "configure:719: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -201,7 +201,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -220,7 +220,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:749: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:747: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -252,12 +252,12 @@
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:781: checking for Cygwin environment" >&5
+echo "configure:779: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 786 "configure"
+#line 784 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -268,7 +268,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -285,29 +285,14 @@
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 
-echo $ac_n "checking whether or not you enabled IPv6 support""... $ac_c" 1>&6
-echo "configure:815: checking whether or not you enabled IPv6 support" >&5
-# Check whether --enable-ipv6 or --disable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then
-  enableval="$enable_ipv6"
-   ac_cv_m_ipv6="yes"
-  echo "$ac_t""$ac_cv_m_ipv6" 1>&6
-
-else
-   ac_cv_m_ipv6="no"
-  echo "$ac_t""$ac_cv_m_ipv6" 1>&6
-
-fi
-
-
 dns_reslib_avail="true"
 echo $ac_n "checking for res_init""... $ac_c" 1>&6
-echo "configure:831: checking for res_init" >&5
+echo "configure:814: checking for res_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 836 "configure"
+#line 819 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_init(); below.  */
@@ -330,7 +315,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_res_init=yes"
 else
@@ -348,7 +333,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6
-echo "configure:877: checking for res_init in -lresolv" >&5
+echo "configure:860: checking for res_init in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -356,7 +341,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 885 "configure"
+#line 868 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -367,7 +352,7 @@
 res_init()
 ; return 0; }
 EOF
-if { (eval echo configure:896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -386,7 +371,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_init in -lbind""... $ac_c" 1>&6
-echo "configure:915: checking for res_init in -lbind" >&5
+echo "configure:898: checking for res_init in -lbind" >&5
 ac_lib_var=`echo bind'_'res_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -394,7 +379,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 923 "configure"
+#line 906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -405,7 +390,7 @@
 res_init()
 ; return 0; }
 EOF
-if { (eval echo configure:934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -434,12 +419,12 @@
 if test "${dns_reslib_avail}" = false; then
   dns_reslib_avail="true"
   echo $ac_n "checking for __res_init""... $ac_c" 1>&6
-echo "configure:963: checking for __res_init" >&5
+echo "configure:946: checking for __res_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func___res_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 968 "configure"
+#line 951 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_init(); below.  */
@@ -462,7 +447,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___res_init=yes"
 else
@@ -480,7 +465,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_init in -lresolv""... $ac_c" 1>&6
-echo "configure:1009: checking for __res_init in -lresolv" >&5
+echo "configure:992: checking for __res_init in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__res_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -488,7 +473,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1017 "configure"
+#line 1000 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -499,7 +484,7 @@
 __res_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -518,7 +503,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_init in -lbind""... $ac_c" 1>&6
-echo "configure:1047: checking for __res_init in -lbind" >&5
+echo "configure:1030: checking for __res_init in -lbind" >&5
 ac_lib_var=`echo bind'_'__res_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -526,7 +511,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1055 "configure"
+#line 1038 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -537,7 +522,7 @@
 __res_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -565,12 +550,12 @@
 fi
 
 echo $ac_n "checking for res_mkquery""... $ac_c" 1>&6
-echo "configure:1094: checking for res_mkquery" >&5
+echo "configure:1077: checking for res_mkquery" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_mkquery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1099 "configure"
+#line 1082 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_mkquery(); below.  */
@@ -593,7 +578,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_res_mkquery=yes"
 else
@@ -611,7 +596,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_mkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:1140: checking for res_mkquery in -lresolv" >&5
+echo "configure:1123: checking for res_mkquery in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -619,7 +604,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1148 "configure"
+#line 1131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -630,7 +615,7 @@
 res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -652,7 +637,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_mkquery in -lbind""... $ac_c" 1>&6
-echo "configure:1181: checking for res_mkquery in -lbind" >&5
+echo "configure:1164: checking for res_mkquery in -lbind" >&5
 ac_lib_var=`echo bind'_'res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -660,7 +645,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1189 "configure"
+#line 1172 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -671,7 +656,7 @@
 res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -706,12 +691,12 @@
 if test "${dns_reslib_avail}" = false; then
 dns_reslib_avail="true" 
 echo $ac_n "checking for __res_mkquery""... $ac_c" 1>&6
-echo "configure:1235: checking for __res_mkquery" >&5
+echo "configure:1218: checking for __res_mkquery" >&5
 if eval "test \"`echo '$''{'ac_cv_func___res_mkquery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1240 "configure"
+#line 1223 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_mkquery(); below.  */
@@ -734,7 +719,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___res_mkquery=yes"
 else
@@ -752,7 +737,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_mkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:1281: checking for __res_mkquery in -lresolv" >&5
+echo "configure:1264: checking for __res_mkquery in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -760,7 +745,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1289 "configure"
+#line 1272 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -771,7 +756,7 @@
 __res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -793,7 +778,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_mkquery in -lbind""... $ac_c" 1>&6
-echo "configure:1322: checking for __res_mkquery in -lbind" >&5
+echo "configure:1305: checking for __res_mkquery in -lbind" >&5
 ac_lib_var=`echo bind'_'__res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -801,7 +786,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1330 "configure"
+#line 1313 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -812,7 +797,7 @@
 __res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -848,7 +833,7 @@
 if test "$ac_cv_cygwin" = "yes"
 then
   echo $ac_n "checking for /usr/local/bind/lib/libbind.a""... $ac_c" 1>&6
-echo "configure:1377: checking for /usr/local/bind/lib/libbind.a" >&5
+echo "configure:1360: checking for /usr/local/bind/lib/libbind.a" >&5
   if test -r /usr/local/bind/lib/libbind.a
   then
     echo "$ac_t""yes" 1>&6
@@ -871,20 +856,6 @@
   ${srcdir}/../../../misc/modconfig -q --top_srcdir=${srcdir}/../../.. --bindir=../../.. del dns
 fi
 
-if test "${dns_reslib_avail}" != false; then
-  if test "${ac_cv_m_ipv6}" = "yes"; then
-    cat >&2 <<EOF
-configure: warning:
-
-  You have enabled IPv6 support. Eggdrop 1.6 does not support
-  asynchronous IPv6 DNS, and therefore the DNS module will be
-  disabled.
-
-EOF
-    ${srcdir}/../../../misc/modconfig -q --top_srcdir=${srcdir}/../../.. --bindir=../../.. del dns
-  fi
-fi
-
 
 
 
@@ -1141,5 +1112,4 @@
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
 
Index: eggdrop1.6/src/mod/dns.mod/configure.in
diff -u eggdrop1.6/src/mod/dns.mod/configure.in:1.8 eggdrop1.6/src/mod/dns.mod/configure.in:1.9
--- eggdrop1.6/src/mod/dns.mod/configure.in:1.8	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/dns.mod/configure.in	Sat Nov  1 17:26:57 2003
@@ -1,6 +1,6 @@
 dnl Eggdrop compile-time configuration file for src/mod/dns.mod
 dnl
-dnl $Id: configure.in,v 1.8 2003/04/01 05:33:41 wcc Exp $
+dnl $Id: configure.in,v 1.9 2003/11/01 23:26:57 wcc Exp $
 
 dnl This file is based on the autoconf m4 macros. Special eggdrop
 dnl macros are used to optimise the size of the resulting configure
@@ -17,15 +17,6 @@
 AC_PROG_CC
 AC_CYGWIN
 
-AC_MSG_CHECKING(whether or not you enabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [  --enable-ipv6           enable IPV6 support],
-[ ac_cv_m_ipv6="yes"
-  AC_MSG_RESULT($ac_cv_m_ipv6)
-],
-[ ac_cv_m_ipv6="no"
-  AC_MSG_RESULT($ac_cv_m_ipv6)
-])
-
 dns_reslib_avail="true"
 AC_CHECK_FUNC(res_init, ,
   AC_CHECK_LIB(resolv, res_init, RESLIB="-lresolv",
@@ -104,20 +95,6 @@
 
 EOF
   EGG_REMOVE_MOD(dns)
-fi
-
-if test "${dns_reslib_avail}" != false; then
-  if test "${ac_cv_m_ipv6}" = "yes"; then
-    cat >&2 <<EOF
-configure: warning:
-
-  You have enabled IPv6 support. Eggdrop 1.6 does not support
-  asynchronous IPv6 DNS, and therefore the DNS module will be
-  disabled.
-
-EOF
-    EGG_REMOVE_MOD(dns)
-  fi
 fi
 
 AC_SUBST(RESLIB)
Index: eggdrop1.6/src/mod/dns.mod/dns.c
diff -u eggdrop1.6/src/mod/dns.mod/dns.c:1.33 eggdrop1.6/src/mod/dns.mod/dns.c:1.34
--- eggdrop1.6/src/mod/dns.mod/dns.c:1.33	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/mod/dns.mod/dns.c	Sat Nov  1 17:26:57 2003
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: dns.c,v 1.33 2003/04/17 01:55:57 wcc Exp $
+ * $Id: dns.c,v 1.34 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -29,14 +29,8 @@
 #include "src/mod/module.h"
 #include "dns.h"
 
-/* No async IPv6 dns in 1.6 */
-#ifdef USE_IPV6
-#  include "You cannot use the dns module with IPv6, re-run make iconfig and disable the dns module!"
-#endif /* USE_IPV6 */
-
 static void dns_event_success(struct resolve *rp, int type);
 static void dns_event_failure(struct resolve *rp, int type);
-
 
 static Function *global = NULL;
 
Index: eggdrop1.6/src/mod/filesys.mod/Makefile
diff -u eggdrop1.6/src/mod/filesys.mod/Makefile:1.16 eggdrop1.6/src/mod/filesys.mod/Makefile:1.17
--- eggdrop1.6/src/mod/filesys.mod/Makefile:1.16	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/filesys.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/filesys.mod/
-# $Id: Makefile,v 1.16 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.17 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/filesys.mod/filesys.c
diff -u eggdrop1.6/src/mod/filesys.mod/filesys.c:1.61 eggdrop1.6/src/mod/filesys.mod/filesys.c:1.62
--- eggdrop1.6/src/mod/filesys.mod/filesys.c:1.61	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/mod/filesys.mod/filesys.c	Sat Nov  1 17:26:58 2003
@@ -2,7 +2,7 @@
  * filesys.c -- part of filesys.mod
  *   main file of the filesys eggdrop module
  *
- * $Id: filesys.c,v 1.61 2003/04/17 01:55:57 wcc Exp $
+ * $Id: filesys.c,v 1.62 2003/11/01 23:26:58 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -786,11 +786,7 @@
       lostdcc(i);
     } else {
       dcc[i].timeval = now;
-#ifdef USE_IPV6
-      dcc[i].sock = getsock(SOCK_BINARY, getprotocol(ip));
-#else
       dcc[i].sock = getsock(SOCK_BINARY);
-#endif /* USE_IPV6 */
       if (dcc[i].sock < 0 || open_telnet_dcc(dcc[i].sock, ip, prt) < 0)
         dcc[i].type->eof(i);
     }
@@ -835,11 +831,7 @@
   } else {
     ip = newsplit(&msg);
     prt = newsplit(&msg);
-#ifdef USE_IPV6
-    sock = getsock(0, getprotocol(ip));
-#else
     sock = getsock(0);
-#endif /* USE_IPV6 */
     if (sock < 0 || open_telnet_dcc(sock, ip, prt) < 0) {
       neterror(buf);
       if (!quiet_reject)
Index: eggdrop1.6/src/mod/irc.mod/Makefile
diff -u eggdrop1.6/src/mod/irc.mod/Makefile:1.12 eggdrop1.6/src/mod/irc.mod/Makefile:1.13
--- eggdrop1.6/src/mod/irc.mod/Makefile:1.12	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/irc.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/irc.mod/
-# $Id: Makefile,v 1.12 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.13 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/module.h
diff -u eggdrop1.6/src/mod/module.h:1.77 eggdrop1.6/src/mod/module.h:1.78
--- eggdrop1.6/src/mod/module.h:1.77	Sat Aug 16 15:12:36 2003
+++ eggdrop1.6/src/mod/module.h	Sat Nov  1 17:26:57 2003
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.77 2003/08/16 20:12:36 wcc Exp $
+ * $Id: module.h,v 1.78 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -63,9 +63,6 @@
 #ifdef egg_inet_aton
 #  undef egg_inet_aton
 #endif
-#ifdef egg_inet_ntop
-#  undef egg_inet_ntop
-#endif
 #ifdef egg_vsnprintf
 #  undef egg_vsnprintf
 #endif
@@ -201,11 +198,7 @@
 /* 80 - 83 */
 #define new_dcc ((int (*) (struct dcc_table *, int))global[80])
 #define lostdcc ((void (*) (int))global[81])
-#ifdef USE_IPV6
-#  define getsock ((int (*) (int,int))global[82])
-#else
-#  define getsock ((int (*) (int))global[82])
-#endif /* USE_IPV6 */
+#define getsock ((int (*) (int))global[82])
 #define killsock ((void (*) (int))global[83])
 /* 84 - 87 */
 #define open_listen ((int (*) (int *))global[84])
@@ -475,10 +468,10 @@
 /* 284 - 287 */
 #define quiet_reject (*(int *)(global[284]))
 #define file_readable ((int (*) (char *))global[285])
-#define getprotocol ((int (*)(char *))global[286])
-#define open_listen_by_af ((int (*) (int *, int))global[287])
+/* IPv6 leftovers: 286 */
+/* IPv6 leftovers: 287 */
 /* 288 - 291 */
-#define egg_inet_ntop ((int (*)(int af, const void *src, char *dst, socklen_t size))global[288])
+/* IPv6 leftovers: 288 */
 #define strip_mirc_codes ((void (*)(int, char *))global[289])
 #define check_ansi ((int (*) (char *))global[290])
 
Index: eggdrop1.6/src/mod/notes.mod/Makefile
diff -u eggdrop1.6/src/mod/notes.mod/Makefile:1.13 eggdrop1.6/src/mod/notes.mod/Makefile:1.14
--- eggdrop1.6/src/mod/notes.mod/Makefile:1.13	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/notes.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/notes.mod
-# $Id: Makefile,v 1.13 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/seen.mod/Makefile
diff -u eggdrop1.6/src/mod/seen.mod/Makefile:1.12 eggdrop1.6/src/mod/seen.mod/Makefile:1.13
--- eggdrop1.6/src/mod/seen.mod/Makefile:1.12	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/seen.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/seen.mod/
-# $Id: Makefile,v 1.12 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.13 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/server.mod/Makefile
diff -u eggdrop1.6/src/mod/server.mod/Makefile:1.13 eggdrop1.6/src/mod/server.mod/Makefile:1.14
--- eggdrop1.6/src/mod/server.mod/Makefile:1.13	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/server.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/server.mod/
-# $Id: Makefile,v 1.13 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.104 eggdrop1.6/src/mod/server.mod/server.c:1.105
--- eggdrop1.6/src/mod/server.mod/server.c:1.104	Sat Aug 16 11:41:01 2003
+++ eggdrop1.6/src/mod/server.mod/server.c	Sat Nov  1 17:26:58 2003
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.104 2003/08/16 16:41:01 stdarg Exp $
+ * $Id: server.c,v 1.105 2003/11/01 23:26:58 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -933,11 +933,7 @@
 static void add_server(char *ss)
 {
   struct server_list *x, *z;
-#ifdef USE_IPV6
-  char *p, *q, *r;
-#else
   char *p, *q;
-#endif /* USE_IPV6 */
 
   for (z = serverlist; z && z->next; z = z->next);
   while (ss) {
@@ -961,16 +957,6 @@
       x->name = nmalloc(strlen(ss) + 1);
       strcpy(x->name, ss);
     } else {
-#ifdef USE_IPV6
-      if (ss[0] == '[') {
-        *ss++;
-        q = strchr(ss, ']');
-        *q++ = 0; /* intentional */
-        r = strchr(q, ':');
-        if (!r)
-          x->port = default_port;
-      }
-#endif /* USE_IPV6 */
       *q++ = 0;
       x->name = nmalloc(q - ss);
       strcpy(x->name, ss);
@@ -983,13 +969,7 @@
         x->pass = nmalloc(strlen(q) + 1);
         strcpy(x->pass, q);
       }
-#ifdef USE_IPV6
-      if (!x->port) {
-        x->port = atoi(ss);
-      }
-#else
       x->port = atoi(ss);
-#endif /* USE_IPV6 */
     }
     ss = p;
   }
@@ -1494,39 +1474,20 @@
       putlog(LOG_MISC, "*", "DCC connection: CHAT (%s!%s)", dcc[i].nick, ip);
       return 1;
     }
-#ifdef USE_IPV6
-    if (ip[4] == ':') {
-      debug1("ipv6 addr: %s",ip);
-      strcpy(dcc[i].addr6,ip);
-      debug1("ipv6 addr: %s",dcc[i].addr6);
-      dcc[i].af_type = AF_INET6;
-    } else {
-      dcc[i].addr = my_atoul(ip);
-    }
-#else
     dcc[i].addr = my_atoul(ip);
-#endif /* USE_IPV6 */
     dcc[i].port = atoi(prt);
     dcc[i].sock = -1;
     strcpy(dcc[i].nick, u->handle);
     strcpy(dcc[i].host, from);
     dcc[i].timeval = now;
     dcc[i].user = u;
-#ifdef USE_IPV6
-    if (dcc[i].af_type != AF_INET6) {
-#endif /* USE_IPV6 */
-/* remove me? */
-      dcc[i].addr = my_atoul(ip);
-      dcc[i].u.dns->ip = dcc[i].addr;
-      dcc[i].u.dns->dns_type = RES_HOSTBYIP;
-      dcc[i].u.dns->dns_success = dcc_chat_hostresolved;
-      dcc[i].u.dns->dns_failure = dcc_chat_hostresolved;
-      dcc[i].u.dns->type = &DCC_CHAT_PASS;
-      dcc_dnshostbyip(dcc[i].addr);
-#ifdef USE_IPV6
-    } else
-      dcc_chat_hostresolved(i); /* Don't try to look it up */
-#endif /* USE_IPV6 */
+    dcc[i].addr = my_atoul(ip);
+    dcc[i].u.dns->ip = dcc[i].addr;
+    dcc[i].u.dns->dns_type = RES_HOSTBYIP;
+    dcc[i].u.dns->dns_success = dcc_chat_hostresolved;
+    dcc[i].u.dns->dns_failure = dcc_chat_hostresolved;
+    dcc[i].u.dns->type = &DCC_CHAT_PASS;
+    dcc_dnshostbyip(dcc[i].addr);
   }
   return 1;
 }
@@ -1537,37 +1498,13 @@
   struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0 };
 
   egg_snprintf(buf, sizeof buf, "%d", dcc[i].port);
-#ifndef USE_IPV6
   if (!hostsanitycheck_dcc(dcc[i].nick, dcc[i].host, dcc[i].addr,
                            dcc[i].u.dns->host, buf)) {
     lostdcc(i);
     return;
   }
-#else
-  if (dcc[i].af_type == AF_INET6) {
-    strcpy(ip,dcc[i].addr6); /* safe, addr6 is 121 */
-    debug0("afinet6, af_type, strcpy");
-  } else
-#endif /* !USE_IPV6 */
-    egg_snprintf(ip, sizeof ip, "%lu", iptolong(htonl(dcc[i].addr)));
-#ifdef USE_IPV6
-  if (dcc[i].af_type == AF_INET6) {
-#  ifdef IPV6_DEBUG
-    debug2("af_inet6 %s / %s", dcc[i].addr6, ip);
-#  endif /* IPV6_DEBUG */
-    dcc[i].sock = getsock(0, AF_INET6);
-  } else {
-#  ifdef IPV6_DEBUG
-    debug0("af_inet");
-#  endif /* IPV6_DEBUG */
-    dcc[i].sock = getsock(0, AF_INET);
-  }
-#else
+  egg_snprintf(ip, sizeof ip, "%lu", iptolong(htonl(dcc[i].addr)));
   dcc[i].sock = getsock(0);
-#  ifdef IPV6_DEBUG
-  debug2("sock: %d %s", dcc[i].sock, ip);
-#  endif /* IPV6_DEBUG */
-#endif /* USE_IPV6 */
   if (dcc[i].sock < 0 || open_telnet_dcc(dcc[i].sock, ip, buf) < 0) {
     neterror(buf);
     if (!quiet_reject)
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.79 eggdrop1.6/src/mod/server.mod/servmsg.c:1.80
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.79	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Sat Nov  1 17:26:58 2003
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.79 2003/04/17 01:55:57 wcc Exp $
+ * $Id: servmsg.c,v 1.80 2003/11/01 23:26:58 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1202,11 +1202,7 @@
     /* I'm resolving... don't start another server connect request */
     resolvserv = 1;
     /* Resolve the hostname. */
-#ifdef USE_IPV6
-    server_resolve_success(servidx);
-#else
     dcc_dnsipbyhost(dcc[servidx].host);
-#endif /* USE_IPV6 */
   }
 }
 
@@ -1228,11 +1224,7 @@
   dcc[servidx].addr = dcc[servidx].u.dns->ip;
   strcpy(pass, dcc[servidx].u.dns->cbuf);
   changeover_dcc(servidx, &SERVER_SOCKET, 0);
-#ifdef USE_IPV6
-  serv = open_telnet(dcc[servidx].host, dcc[servidx].port);
-#else
   serv = open_telnet(iptostr(htonl(dcc[servidx].addr)), dcc[servidx].port);
-#endif /* USE_IPV6 */
   if (serv < 0) {
     neterror(s);
     putlog(LOG_SERV, "*", "%s %s (%s)", IRC_FAILEDCONNECT, dcc[servidx].host,
Index: eggdrop1.6/src/mod/share.mod/Makefile
diff -u eggdrop1.6/src/mod/share.mod/Makefile:1.13 eggdrop1.6/src/mod/share.mod/Makefile:1.14
--- eggdrop1.6/src/mod/share.mod/Makefile:1.13	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/share.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/share.mod/
-# $Id: Makefile,v 1.13 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.75 eggdrop1.6/src/mod/share.mod/share.c:1.76
--- eggdrop1.6/src/mod/share.mod/share.c:1.75	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/mod/share.mod/share.c	Sat Nov  1 17:26:58 2003
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.75 2003/04/17 01:55:57 wcc Exp $
+ * $Id: share.c,v 1.76 2003/11/01 23:26:58 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1128,11 +1128,7 @@
   } else {
     ip = newsplit(&par);
     port = newsplit(&par);
-#ifdef USE_IPV6
-    sock = getsock(SOCK_BINARY, getprotocol(ip)); /* Don't buffer this -> mark binary. */
-#else
     sock = getsock(SOCK_BINARY); /* Don't buffer this -> mark binary. */
-#endif /* USE_IPV6 */
     if (sock < 0 || open_telnet_dcc(sock, ip, port) < 0) {
       killsock(sock);
       putlog(LOG_BOTS, "*", "Asynchronous connection failed!");
Index: eggdrop1.6/src/mod/transfer.mod/Makefile
diff -u eggdrop1.6/src/mod/transfer.mod/Makefile:1.13 eggdrop1.6/src/mod/transfer.mod/Makefile:1.14
--- eggdrop1.6/src/mod/transfer.mod/Makefile:1.13	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/transfer.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/transfer.mod/
-# $Id: Makefile,v 1.13 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.14 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h  ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.67 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.68
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.67	Wed Aug  6 13:17:56 2003
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Sat Nov  1 17:26:58 2003
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.67 2003/08/06 18:17:56 stdarg Exp $
+ * $Id: transfer.c,v 1.68 2003/11/01 23:26:58 wcc Exp $
  *
  * Copyright (C) 1997 Robey Pointer
  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -967,10 +967,6 @@
  * `filename' from `dir'.
  *
  * Use raw_dcc_resend() and raw_dcc_send() instead of this function.
- *
- * This function is NOT fully IPv6 capable, the DCC CHAT/SEND specs for
- * IPv6 aren't clear between all the different clients, but irssi and
- * KSIRC(?) appear to use the IPv6 in the 'long' format (hex w/o colons)
  * 
  */
 static int raw_dcc_resend_send(char *filename, char *nick, char *from,
@@ -994,19 +990,11 @@
 
   if (reserved_port_min > 0 && reserved_port_min < reserved_port_max) {
     for (port = reserved_port_min; port <= reserved_port_max; port++)
-#ifdef USE_IPV6
-      if ((zz = open_listen_by_af(&port, AF_INET6)) != -1) /* no idea how we want to handle this -poptix 02/03/03 */
-#else
       if ((zz = open_listen(&port)) != -1)
-#endif /* USE_IPV6 */
         break;
   } else {
     port = reserved_port_min;
-#ifdef USE_IPV6
-    zz = open_listen_by_af(&port, AF_INET6);
-#else
     zz = open_listen(&port);
-#endif /* USE_IPV6 */
   }
 
   if (zz == -1)
Index: eggdrop1.6/src/mod/uptime.mod/Makefile
diff -u eggdrop1.6/src/mod/uptime.mod/Makefile:1.3 eggdrop1.6/src/mod/uptime.mod/Makefile:1.4
--- eggdrop1.6/src/mod/uptime.mod/Makefile:1.3	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/uptime.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/uptime.mod/
-# $Id: Makefile,v 1.3 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.4 2003/11/01 23:26:58 wcc Exp $
 srcdir = .
 
 
@@ -36,7 +36,7 @@
  ../../../src/proto.h ../../../lush.h ../../../src/misc_file.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
  ../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/wire.mod/Makefile
diff -u eggdrop1.6/src/mod/wire.mod/Makefile:1.14 eggdrop1.6/src/mod/wire.mod/Makefile:1.15
--- eggdrop1.6/src/mod/wire.mod/Makefile:1.14	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/wire.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/wire.mod/
-# $Id: Makefile,v 1.14 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.15 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
  ../../../src/users.h ../../../src/compat/compat.h \
- ../../../src/compat/inet_aton.h ../../../src/compat/inet_ntop.h \
+ ../../../src/compat/inet_aton.h \
  ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
  ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
  ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
Index: eggdrop1.6/src/mod/woobie.mod/Makefile
diff -u eggdrop1.6/src/mod/woobie.mod/Makefile:1.10 eggdrop1.6/src/mod/woobie.mod/Makefile:1.11
--- eggdrop1.6/src/mod/woobie.mod/Makefile:1.10	Mon Mar 31 23:33:41 2003
+++ eggdrop1.6/src/mod/woobie.mod/Makefile	Sat Nov  1 17:26:58 2003
@@ -1,5 +1,5 @@
 # Makefile for src/mod/woobie.mod/
-# $Id: Makefile,v 1.10 2003/04/01 05:33:41 wcc Exp $
+# $Id: Makefile,v 1.11 2003/11/01 23:26:58 wcc Exp $
 
 srcdir = .
 
@@ -37,7 +37,7 @@
  ../../../src/misc_file.h ../../../src/cmdt.h ../../../src/tclegg.h \
  ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
  ../../../src/compat/compat.h ../../../src/compat/inet_aton.h \
- ../../../src/compat/inet_ntop.h ../../../src/compat/snprintf.h \
+ ../../../src/compat/snprintf.h \
  ../../../src/compat/memset.h ../../../src/compat/memcpy.h \
  ../../../src/compat/strcasecmp.h ../../../src/mod/modvals.h \
  ../../../src/tandem.h
Index: eggdrop1.6/src/modules.c
diff -u eggdrop1.6/src/modules.c:1.86 eggdrop1.6/src/modules.c:1.87
--- eggdrop1.6/src/modules.c:1.86	Sat Aug 16 15:12:36 2003
+++ eggdrop1.6/src/modules.c	Sat Nov  1 17:26:57 2003
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.86 2003/08/16 20:12:36 wcc Exp $
+ * $Id: modules.c,v 1.87 2003/11/01 23:26:57 wcc Exp $
  */
 /* 
  * Copyright (C) 1997 Robey Pointer
@@ -72,11 +72,7 @@
 
 extern char tempdir[], botnetnick[], botname[], natip[], hostname[],
             origbotname[], botuser[], admin[], userfile[], ver[], notify_new[],
-#ifdef USE_IPV6
-            helpdir[], version[], quit_msg[], hostname6[];
-#else
             helpdir[], version[], quit_msg[];
-#endif /* USE_IPV6 */
 
 extern int parties, noshare, dcc_total, egg_numver, userfile_perm, do_restart,
            ignore_time, must_be_owner, raw_log, max_dcc, make_userfile,
@@ -90,7 +86,6 @@
 
 extern Tcl_Interp *interp;
 extern sock_list *socklist;
-extern int getprotocol(char *);
 
 int cmd_die();
 int xtra_kill();
@@ -561,10 +556,10 @@
   /* 284 - 287 */
   (Function) & quiet_reject,      /* int                                 */
   (Function) file_readable,
-  (Function) getprotocol,
-  (Function) open_listen_by_af,
+  (Function) 0,                   /* IPv6 leftovers: 286                 */
+  (Function) 0,                   /* IPv6 leftovers: 287                 */
   /* 288 - 291 */
-  (Function) egg_inet_ntop,
+  (Function) 0,                   /* IPv6 leftovers: 288                 */
   (Function) strip_mirc_codes,
   (Function) check_ansi
 };
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.59 eggdrop1.6/src/net.c:1.60
--- eggdrop1.6/src/net.c:1.59	Tue Apr 29 22:47:46 2003
+++ eggdrop1.6/src/net.c	Sat Nov  1 17:26:57 2003
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  *
- * $Id: net.c,v 1.59 2003/04/30 03:47:46 wcc Exp $
+ * $Id: net.c,v 1.60 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * This is hereby released into the public domain.
@@ -43,11 +43,6 @@
 char hostname[121] = "";      /* Hostname can be specified in the config file */
 char myip[121] = "";          /* IP can be specified in the config file       */
 
-#ifdef USE_IPV6
-char myip6[121] = "";         /* IP can be specified in the config file       */
-char hostname6[121] = "";     /* Hostname can be specified in the config file */
-#endif /* USE_IPV6 */
-
 char firewall[121] = "";      /* Socks server for firewall                    */
 int firewallport = 1080;      /* Default port of Sock4/5 firewalls            */
 char botuser[21] = "eggdrop"; /* Username of the user running the bot         */
@@ -57,12 +52,6 @@
 int MAXSOCKS = 0;
 jmp_buf alarmret;             /* Env buffer for alarm() returns               */
 
-#ifdef USE_IPV6
-struct hostent *myipv6he;
-char myipv6host[120];
-unsigned long notalloc = 0;
-#endif /* USE_IPV6 */
-
 /* Types of proxy */
 #define PROXY_SOCKS   1
 #define PROXY_SUN     2
@@ -82,33 +71,6 @@
   return ret;
 }
 
-int getprotocol(char *host)
-{
-#ifdef USE_IPV6
-  struct hostent *he;
-#  ifndef HAVE_GETHOSTBYNAME2
-  int error_num;
-#  endif /* !HAVE_GETHOSTBYNAME2 */
-
-  if (!setjmp(alarmret)) {
-    alarm(resolve_timeout);
-
-#  ifdef HAVE_GETHOSTBYNAME2
-    he = gethostbyname2(host, AF_INET6);
-#  else
-    he = getipnodebyname(host, AF_INET6, AI_DEFAULT, &error_num);
-#  endif /* HAVE_GETHOSTBYNAME2 */
-    alarm(0);
-  } else
-    he = NULL;
-  if (!he)
-    return AF_INET;
-  return AF_INET6;
-#else
-  return 0;
-#endif /* USE_IPV6 */
-}
-
 /* Initialize the socklist
  */
 void init_net()
@@ -143,30 +105,6 @@
   char s[121];
   IP ip;
   struct in_addr *in;
-#if defined(USE_IPV6) && !defined(HAVE_GETHOSTBYNAME2)
-  int error_num;
-#endif /* USE_IPV6 && !HAVE_GETHOSTBYNAME2 */
-
-#ifdef USE_IPV6
-  myipv6he = NULL;
-  /* Could be pre-defined */
-  if (myip6[0]) {
-#  ifdef HAVE_GETHOSTBYNAME2
-    myipv6he = gethostbyname2(myip6, AF_INET6);
-#  else
-    myipv6he = getipnodebyname(myip6, AF_INET6, AI_DEFAULT, &error_num);
-#  endif /* !HAVE_GETHOSTBYNAME2 */
-    if (myipv6he == NULL)
-      fatal("Hostname IPV6 self-lookup failed.", 0);
-  }
-  if (hostname6[0]) {
-    myipv6he = gethostbyname2(hostname6, AF_INET6);
-    if (myipv6he == NULL)
-      fatal("Hostname IPV6 self-lookup failed.", 0);
-  }
-  if (myipv6he != NULL)
-    egg_inet_ntop(AF_INET6, &myipv6he, myipv6host, 119);
-#endif /* USE_IPV6 */
   if (myip[0]) {
     if ((myip[strlen(myip) - 1] >= '0') && (myip[strlen(myip) - 1] <= '9'))
       return (IP) inet_addr(myip);
@@ -178,17 +116,9 @@
     gethostname(s, 120);
     hp = gethostbyname(s);
   }
-#ifdef USE_IPV6
-  if (hp == NULL && myipv6he == NULL)
-#else
   if (hp == NULL)
-#endif /* USE_IPV6 */
     fatal("Hostname self-lookup failed. Please set 'my-ip' in the config "
           "file.", 0);
-#ifdef USE_IPV6
-  if(hp == NULL)
-    return 0;
-#endif /* USE_IPV6 */
   in = (struct in_addr *) (hp->h_addr_list[0]);
   ip = (IP) (in->s_addr);
   return ip;
@@ -297,11 +227,7 @@
 
 /* Return a free entry in the socket entry
  */
-#ifdef USE_IPV6
-int allocsock(int sock, int options, int af_ty)
-#else
 int allocsock(int sock, int options)
-#endif /* USE_IPV6 */
 {
   int i;
 
@@ -312,9 +238,6 @@
       socklist[i].inbuflen = socklist[i].outbuflen = 0;
       socklist[i].flags = options;
       socklist[i].sock = sock;
-#ifdef USE_IPV6
-      socklist[i].af = af_ty;
-#endif /* USE_IPV6 */
       return i;
     }
   }
@@ -324,15 +247,9 @@
 
 /* Request a normal socket for i/o
  */
-#ifdef USE_IPV6
-void setsock(int sock, int options, int af_ty)
-{
-  int i = allocsock(sock, options, af_ty), parm;
-#else
 void setsock(int sock, int options)
 {
   int i = allocsock(sock, options), parm;
-#endif /* USE_IPV6 */
 
   if (((sock != STDOUT) || backgrd) && !(socklist[i].flags & SOCK_NONSOCK)) {
     parm = 1;
@@ -350,22 +267,12 @@
   fcntl(sock, F_SETFL, O_NONBLOCK);
 }
 
-#ifdef USE_IPV6
-int getsock(int options, int af_def)
-{
-  int sock = socket(af_def, SOCK_STREAM, 0);
-#else
 int getsock(int options)
 {
   int sock = socket(AF_INET, SOCK_STREAM, 0);
-#endif /* USE_IPV6 */
 
   if (sock >= 0)
-#ifdef USE_IPV6
-    setsock(sock, options, af_def);
-#else
     setsock(sock, options);
-#endif /* USE_IPV6 */
   else
     putlog(LOG_MISC, "*", "Warning: Can't create new socket!");
   return sock;
@@ -403,42 +310,21 @@
  */
 static int proxy_connect(int sock, char *host, int port, int proxy)
 {
-#ifdef USE_IPV6
-  unsigned char x[32];
-  int af_ty;
-#else
   unsigned char x[10];
-#endif /* USE_IPV6 */
   struct hostent *hp;
   char s[256];
   int i;
 
-#ifdef USE_IPV6
-  af_ty = getprotocol(host);
-#endif /* USE_IPV6 */
   /* socks proxy */
   if (proxy == PROXY_SOCKS) {
     /* numeric IP? */
-#ifdef USE_IPV6
-    if ((host[strlen(host) - 1] >= '0' && host[strlen(host) - 1] <= '9') && af_ty != AF_INET6) {
-#else
     if (host[strlen(host) - 1] >= '0' && host[strlen(host) - 1] <= '9') {
-#endif /* USE_IPV6 */
       IP ip = ((IP) inet_addr(host));
       egg_memcpy(x, &ip, 4);
     } else {
       /* no, must be host.domain */
       if (!setjmp(alarmret)) {
-#ifdef USE_IPV6
-        alarm(resolve_timeout);
-        if (af_ty == AF_INET6)
-          hp = gethostbyname(host);
-        else
-#endif /* USE_IPV6 */
-          hp = gethostbyname(host);
-#ifdef USE_IPV6
-        alarm(0);
-#endif /* USE_IPV6 */
+        hp = gethostbyname(host);
       } else
         hp = NULL;
       if (hp == NULL) {
@@ -450,15 +336,6 @@
     for (i = 0; i < MAXSOCKS; i++)
       if (!(socklist[i].flags & SOCK_UNUSED) && socklist[i].sock == sock)
         socklist[i].flags |= SOCK_PROXYWAIT;    /* drummer */
-#ifdef USE_IPV6
-    if (af_ty == AF_INET6)
-      egg_snprintf(s, sizeof s,
-                   "\004\001%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%s",
-                   (port >> 8) % 256, (port % 256), x[0], x[1], x[2], x[3],
-                   x[4], x[5], x[6], x[7], x[9], x[9], x[10], x[11],  x[12],
-                   x[13], x[14], x[15], botuser);
-    else
-#endif /* USE_IPV6 */
       egg_snprintf(s, sizeof s, "\004\001%c%c%c%c%c%c%s", (port >> 8) % 256,
                    (port % 256), x[0], x[1], x[2], x[3], botuser);
     tputs(sock, s, strlen(botuser) + 9);        /* drummer */
@@ -469,24 +346,6 @@
   return sock;
 }
 
-
-/* Return protocol of socket
- */
-int getsockproto(int sock)
-{
-#ifdef USE_IPV6
-  int i;
-  for (i = 0; i < MAXSOCKS; i++) {
-    if (socklist[i].sock == sock)
-      return socklist[i].af;
-  }
-  return AF_INET;
-#else
-  return 0;
-#endif /* USE_IPV6 */
-}
-
-
 /* Starts a connection attempt to a socket
  *
  * If given a normal hostname, this will be resolved to the corresponding
@@ -500,14 +359,6 @@
 int open_telnet_raw(int sock, char *server, int sport)
 {
   struct sockaddr_in name;
-#ifdef USE_IPV6
-  struct sockaddr_in6 name6;
-  unsigned long succ;
-  int af_ty;
-#  ifndef HAVE_GETHOSTBYNAME2
-  int error_num;
-#  endif /* !HAVE_GETHOSTBYNAME2 */
-#endif /* USE_IPV6 */
   struct hostent *hp;
   char host[121];
   int i, port, rc;
@@ -528,94 +379,44 @@
     strcpy(host, server);
     port = sport;
   }
-#ifdef USE_IPV6
-  af_ty = getprotocol(host);
-  if (af_ty == AF_INET6) {
-    succ = getmyip();
-    bzero((char *) &name6, sizeof(struct sockaddr_in6));
-
-    name6.sin6_family = AF_INET6;
-    if (myip6[0]) {
-      if (myipv6he == NULL)
-        memcpy(&name6.sin6_addr, &in6addr_any, 16);
-      else
-        memcpy(&name6.sin6_addr, myipv6he->h_addr, myipv6he->h_length);
-    }
-    if (bind(sock, (struct sockaddr *) &name6, sizeof(name6)) < 0) {
-      killsock(sock);
-      return -1;
-    }
-    bzero((char *) &name6, sizeof(struct sockaddr_in6));
-    name6.sin6_family = AF_INET6;
-    name6.sin6_port = htons(port);
+  egg_bzero((char *) &name, sizeof(struct sockaddr_in));
+
+  name.sin_family = AF_INET;
+  name.sin_addr.s_addr = (myip[0] ? getmyip() : INADDR_ANY);
+  if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0)
+    return -1;
+  egg_bzero((char *) &name, sizeof(struct sockaddr_in));
+
+  name.sin_family = AF_INET;
+  name.sin_port = htons(port);
+  /* Numeric IP? */
+  if ((host[strlen(host) - 1] >= '0') && (host[strlen(host) - 1] <= '9'))
+    name.sin_addr.s_addr = inet_addr(host);
+  else {
+    /* No, must be host.domain */
+    debug0("WARNING: open_telnet_raw() is about to block in gethostbyname()!");
     if (!setjmp(alarmret)) {
       alarm(resolve_timeout);
-#  ifdef HAVE_GETHOSTBYNAME2
-      hp = gethostbyname2(host, AF_INET6);
-#  else
-      hp = getipnodebyname(host, AF_INET6, AI_DEFAULT, &error_num);
-#  endif /* HAVE_GETHOSTBYNAME2 */
+      hp = gethostbyname(host);
       alarm(0);
     } else
       hp = NULL;
-    if (hp == NULL) {
-      killsock(sock);
+    if (hp == NULL)
       return -2;
-    }
-    egg_memcpy((char *) &name6.sin6_addr, hp->h_addr, hp->h_length);
-    name6.sin6_family = hp->h_addrtype;
-#  ifndef HAVE_GETHOSTBYNAME2
-    freehostent(myipv6he);
-#  endif /* !HAVE_GETHOSTBYNAME2 */
-  } else {
-#endif /* USE_IPV6 */
-    egg_bzero((char *) &name, sizeof(struct sockaddr_in));
-
-    name.sin_family = AF_INET;
-    name.sin_addr.s_addr = (myip[0] ? getmyip() : INADDR_ANY);
-    if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0)
-      return -1;
-    egg_bzero((char *) &name, sizeof(struct sockaddr_in));
-
-    name.sin_family = AF_INET;
-    name.sin_port = htons(port);
-    /* Numeric IP? */
-    if ((host[strlen(host) - 1] >= '0') && (host[strlen(host) - 1] <= '9'))
-      name.sin_addr.s_addr = inet_addr(host);
-    else {
-      /* No, must be host.domain */
-      debug0("WARNING: open_telnet_raw() is about to block in gethostbyname()!");
-      if (!setjmp(alarmret)) {
-        alarm(resolve_timeout);
-        hp = gethostbyname(host);
-        alarm(0);
-      } else
-        hp = NULL;
-      if (hp == NULL)
-        return -2;
-      egg_memcpy(&name.sin_addr, hp->h_addr, hp->h_length);
-      name.sin_family = hp->h_addrtype;
-    }
-#ifdef USE_IPV6
+    egg_memcpy(&name.sin_addr, hp->h_addr, hp->h_length);
+    name.sin_family = hp->h_addrtype;
   }
-#endif /* USE_IPV6 */
   for (i = 0; i < MAXSOCKS; i++) {
     if (!(socklist[i].flags & SOCK_UNUSED) && (socklist[i].sock == sock))
       socklist[i].flags = (socklist[i].flags & ~SOCK_VIRTUAL) | SOCK_CONNECT;
   }
-#ifdef USE_IPV6
-  if(af_ty == AF_INET6)
-    rc = connect(sock, (struct sockaddr *) &name6,
-                 sizeof(struct sockaddr_in6));
-  else
-#endif /* USE_IPV6 */
-    rc = connect(sock, (struct sockaddr *) &name,
-                 sizeof(struct sockaddr_in));
-  if (rc < 0) {    if (errno == EINPROGRESS) {
+  rc = connect(sock, (struct sockaddr *) &name, sizeof(struct sockaddr_in));
+  if (rc < 0) {
+    if (errno == EINPROGRESS) {
       /* Firewall?  announce connect attempt to proxy */
       if (firewall[0])
         return proxy_connect(sock, server, sport, proxy);
-      return sock;              /* async success! */
+      return sock; /* async success! */
     } else
       return -1;
   }
@@ -628,11 +429,7 @@
 /* Ordinary non-binary connection attempt */
 int open_telnet(char *server, int port)
 {
-#ifdef USE_IPV6
-  int sock = getsock(0, getprotocol(server)), ret = open_telnet_raw(sock, server, port);
-#else
   int sock = getsock(0), ret = open_telnet_raw(sock, server, port);
-#endif /* USE_IPV6 */
 
   if (ret < 0)
     killsock(sock);
@@ -644,18 +441,10 @@
  *
  * 'addr' is ignored if af_def is AF_INET6 -poptix (02/03/03)
  */
-#ifdef USE_IPV6
-int open_address_listen(IP addr, int af_def, int *port)
-#else
 int open_address_listen(IP addr, int *port)
-#endif /* USE_IPV6 */
  {
   int sock = 0;
   unsigned int addrlen;
-#ifdef USE_IPV6
-  unsigned long ipp;
-  struct sockaddr_in6 name6;
-#endif /* USE_IPV6 */
   struct sockaddr_in name;
 
   if (firewall[0]) {
@@ -664,66 +453,31 @@
            "firewall)");
     return -1;
   }
-#ifdef USE_IPV6
-  if (af_def == AF_INET6) {
-    ipp = getmyip();
-    if(af_def == AF_INET6 && myipv6he != NULL) {
-
-      sock = getsock(SOCK_LISTEN, af_def);
-      bzero((char *) &name6, sizeof(name6));
-      name6.sin6_family = af_def;
-      name6.sin6_port = htons(*port);
-      memcpy(&name6.sin6_addr, &in6addr_any, 16);
-      /* memcpy(&name6.sin6_addr, myipv6he->h_addr, myipv6he->h_length); */
-      if (bind(sock, (struct sockaddr *) &name6, sizeof(name6)) < 0) {
-        killsock(sock);
-        return -1;
-      }
-      addrlen = sizeof(name6);
-      if (getsockname(sock, (struct sockaddr *) &name6, &addrlen) < 0) {
-        killsock(sock);
-        return -1;
-      }
-      *port = ntohs(name6.sin6_port);
-      if (listen(sock, 1) < 0) {
-        killsock(sock);
-        return -1;
-      }
+  if(getmyip() > 0) {
+    sock = getsock(SOCK_LISTEN);
+    if (sock < 1)
+      return -1;
+
+    egg_bzero((char *) &name, sizeof(struct sockaddr_in));
+    name.sin_family = AF_INET;
+    name.sin_port = htons(*port); /* 0 = just assign us a port */
+    name.sin_addr.s_addr = addr;
+    if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0) {
+      killsock(sock);
+      return -1;
     }
-  } else {
-#endif /* USE_IPV6 */
-    if(getmyip() > 0) {
-#ifdef USE_IPV6
-      sock = getsock(SOCK_LISTEN, AF_INET);
-#else
-      sock = getsock(SOCK_LISTEN);
-#endif /* USE_IPV6 */
-      if (sock < 1)
-        return -1;
-
-      egg_bzero((char *) &name, sizeof(struct sockaddr_in));
-      name.sin_family = AF_INET;
-      name.sin_port = htons(*port); /* 0 = just assign us a port */
-      name.sin_addr.s_addr = addr;
-      if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0) {
-        killsock(sock);
-        return -1;
-      }
-      /* what port are we on? */
-      addrlen = sizeof(name);
-      if (getsockname(sock, (struct sockaddr *) &name, &addrlen) < 0) {
-        killsock(sock);
-        return -1;
-      }
-      *port = ntohs(name.sin_port);
-      if (listen(sock, 1) < 0) {
-        killsock(sock);
-        return -1;
-      }
+    /* what port are we on? */
+    addrlen = sizeof(name);
+    if (getsockname(sock, (struct sockaddr *) &name, &addrlen) < 0) {
+      killsock(sock);
+      return -1;
+    }
+    *port = ntohs(name.sin_port);
+    if (listen(sock, 1) < 0) {
+      killsock(sock);
+      return -1;
     }
-#ifdef USE_IPV6
   }
-#endif /* USE_IPV6 */
   return sock;
 }
 
@@ -732,24 +486,7 @@
  */
 inline int open_listen(int *port)
 {
-#ifdef USE_IPV6
-  return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, AF_INET, port);
-#else
   return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
-#endif /* USE_IPV6 */
-}
-
-/* Same as above, except this one can be called with an AF_ type
- * the above is being left in for compatibility, and should NOT LONGER BE USED IN THE CORE CODE.
- */
-
-inline int open_listen_by_af(int *port, int af_def)
-{
-#ifdef USE_IPV6
-  return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, af_def, port);
-#else
-  return 0;
-#endif /* USE_IPV6 */
 }
 
 /* Given a network-style IP address, returns the hostname. The hostname
@@ -802,56 +539,25 @@
   int new_sock;
   unsigned int addrlen;
   struct sockaddr_in from;
-#ifdef USE_IPV6
-  int af_ty = getsockproto(sock);
-  struct sockaddr_in6 from6;
-
-  if (af_ty == AF_INET6) {
-    addrlen = sizeof(from6);
-    new_sock = accept(sock, (struct sockaddr *) &from6, &addrlen);
-  } else {
-#endif /* USE_IPV6 */
-    addrlen = sizeof(struct sockaddr);
-    new_sock = accept(sock, (struct sockaddr *) &from, &addrlen);
-#ifdef USE_IPV6
-  }
-#endif /* USE_IPV6 */
+
+  addrlen = sizeof(struct sockaddr);
+  new_sock = accept(sock, (struct sockaddr *) &from, &addrlen);
 
   if (new_sock < 0)
     return -1;
   if (ip != NULL) {
-#ifdef USE_IPV6
-    if (af_ty == AF_INET6) {
-      *ip = notalloc;
-      egg_inet_ntop(AF_INET6, &from6, caller, 119);
-      caller[120] = 0;
-    } else {
-#endif /* USE_IPV6 */
-      *ip = from.sin_addr.s_addr;
-      /* This is now done asynchronously. We now only provide the IP address.
-       *
-       * strncpy(caller, hostnamefromip(*ip), 120);
-       */
-      strncpyz(caller, iptostr(*ip), 121);
-      *ip = ntohl(*ip);
-#ifdef USE_IPV6
-    }
-#endif /* USE_IPV6 */
+    *ip = from.sin_addr.s_addr;
+    /* This is now done asynchronously. We now only provide the IP address.
+     *
+     * strncpy(caller, hostnamefromip(*ip), 120);
+     */
+    strncpyz(caller, iptostr(*ip), 121);
+    *ip = ntohl(*ip);
   }
-  if (port != NULL) {
-#ifdef USE_IPV6
-      if (af_ty == AF_INET6)
-        *port = ntohs(from6.sin6_port);
-      else
-#endif /* USE_IPV6 */
-        *port = ntohs(from.sin_port);
-    }
+  if (port != NULL)
+    *port = ntohs(from.sin_port);
   /* Set up all the normal socket crap */
-#ifdef USE_IPV6
-  setsock(new_sock, (binary ? SOCK_BINARY : 0), af_ty);
-#else
   setsock(new_sock, (binary ? SOCK_BINARY : 0));
-#endif /* USE_IPV6 */
   return new_sock;
 }
 
@@ -864,40 +570,21 @@
   char sv[500];
   unsigned char c[4];
 
-#ifdef DEBUG_IPV6
-  debug1("open_telnet_dcc %s", server);
-#endif /* DEBUG_IPV6 */
   if (port != NULL)
     p = atoi(port);
   else
     p = 2000;
-#ifdef USE_IPV6
-  if (getprotocol(server) == AF_INET6) {
-#  ifdef DEBUG_IPV6
-    debug0("open_telnet_dcc, af_inet6!");
-#  endif /* DEBUG_IPV6 */
-    strncpyz(sv, server, sizeof sv);
-    debug2("%s should be %s",sv,server);
-  } else {
-#endif /* USE_IPV6 */
-    if (server != NULL)
-      addr = my_atoul(server);
-    else
-      addr = 0L;
-    if (addr < (1 << 24))
-      return -3;                  /* fake address */
-    c[0] = (addr >> 24) & 0xff;
-    c[1] = (addr >> 16) & 0xff;
-    c[2] = (addr >> 8) & 0xff;
-    c[3] = addr & 0xff;
-    sprintf(sv, "%u.%u.%u.%u", c[0], c[1], c[2], c[3]);
-#ifdef USE_IPV6
-    }
-  /* strcpy(sv,hostnamefromip(addr)); */
-#  ifdef DEBUG_IPV6
-  debug3("open_telnet_raw %s %d %d", sv, sock,p);
-#  endif /* DEBUG_IPV6 */
-#endif /* USE_IPV6 */
+  if (server != NULL)
+    addr = my_atoul(server);
+  else
+    addr = 0L;
+  if (addr < (1 << 24))
+    return -3;                  /* fake address */
+  c[0] = (addr >> 24) & 0xff;
+  c[1] = (addr >> 16) & 0xff;
+  c[2] = (addr >> 8) & 0xff;
+  c[3] = addr & 0xff;
+  sprintf(sv, "%u.%u.%u.%u", c[0], c[1], c[2], c[3]);
   p = open_telnet_raw(sock, sv, p);
   return p;
 }
@@ -1448,10 +1135,6 @@
    * DNS names that are up to 255 characters long.  This is not broken.
    */
 
-  /* This function needs to be updated for IPv6 IP's, although it doesn't
-   * currently harm them (afaik)
-   */
-
   char badaddress[16];
   IP ip = my_atoul(ipaddy);
   int prt = atoi(port);
@@ -1459,11 +1142,6 @@
   /* It is disabled HERE so we only have to check in *one* spot! */
   if (!dcc_sanitycheck)
     return 1;
-
-#ifdef USE_IPV6
-  if (getprotocol(ipaddy) == AF_INET6)
-    return 1;
-#endif /* USE_IPV6 */
 
   if (prt < 1) {
     putlog(LOG_MISC, "*", "ALERT: (%s!%s) specified an impossible port of %u!",
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1008 eggdrop1.6/src/patch.h:1.1009
--- eggdrop1.6/src/patch.h:1.1008	Sat Nov  1 14:04:32 2003
+++ eggdrop1.6/src/patch.h	Sat Nov  1 17:26:57 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1008 2003/11/01 20:04:32 wcc Exp $
+ * $Id: patch.h,v 1.1009 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1067717037");            /* current unixtime */
+patch("1067728942");            /* current unixtime */
 /*
  *
  *
  */
-patch("badopt");
+patch("removeipv6");
 /*
  *
  *
Index: eggdrop1.6/src/proto.h
diff -u eggdrop1.6/src/proto.h:1.58 eggdrop1.6/src/proto.h:1.59
--- eggdrop1.6/src/proto.h:1.58	Sat Aug 16 15:12:36 2003
+++ eggdrop1.6/src/proto.h	Sat Nov  1 17:26:57 2003
@@ -7,7 +7,7 @@
  * because they use structures in those
  * (saves including those .h files EVERY time) - Beldin
  *
- * $Id: proto.h,v 1.58 2003/08/16 20:12:36 wcc Exp $
+ * $Id: proto.h,v 1.59 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -248,26 +248,14 @@
 unsigned long iptolong(IP);
 IP getmyip();
 void neterror(char *);
-#ifdef USE_IPV6
-void setsock(int, int, int);
-int allocsock(int, int, int);
-int getsock(int, int);
-#else
 void setsock(int, int);
 int allocsock(int, int);
 int getsock(int);
-#endif /* USE_IPV6 */
-int getprotocol(char *);
 char *hostnamefromip(unsigned long);
 void killsock(int);
 int answer(int, char *, unsigned long *, unsigned short *, int);
 inline int open_listen(int *);
-inline int open_listen_by_af(int *, int);
-#ifdef USE_IPV6
-int open_address_listen(IP addr, int af_def, int *);
-#else
 int open_address_listen(IP addr, int *);
-#endif /* USE_IPV6 */
 int open_telnet(char *, int);
 int open_telnet_dcc(int, char *, char *);
 int open_telnet_raw(int, char *, int);
Index: eggdrop1.6/src/tcl.c
diff -u eggdrop1.6/src/tcl.c:1.73 eggdrop1.6/src/tcl.c:1.74
--- eggdrop1.6/src/tcl.c:1.73	Wed Apr 16 23:38:33 2003
+++ eggdrop1.6/src/tcl.c	Sat Nov  1 17:26:57 2003
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.73 2003/04/17 04:38:33 wcc Exp $
+ * $Id: tcl.c,v 1.74 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -49,11 +49,7 @@
             firewall[], helpdir[], notify_new[], hostname[], myip[], moddir[],
             tempdir[], owner[], network[], botnetnick[], bannerfile[],
             egg_version[], natip[], configfile[], logfile_suffix[], textdir[],
-#ifdef USE_IPV6
-            pid_file[], hostname6[], myip6[];
-#else
             pid_file[];
-#endif /* USE_IPV6 */
 
 extern int backgrd, flood_telnet_thr, flood_telnet_time, shtime, share_greet,
            require_p, keep_all_logs, allow_new_telnets, stealth_telnets,
@@ -464,10 +460,6 @@
   {"owner",           owner,          120,           STR_PROTECT},
   {"my-ip",           myip,           120,                     0},
   {"my-hostname",     hostname,       120,                     0},
-#ifdef USE_IPV6
-  {"my-ip6",          myip6,          120,                     0},
-  {"my-hostname6",    hostname6,      120,                     0},
-#endif /* USE_IPV6 */
   {"network",         network,        40,                      0},
   {"whois-fields",    whois_fields,   1024,                    0},
   {"nat-ip",          natip,          120,                     0},
Index: eggdrop1.6/src/tcldcc.c
diff -u eggdrop1.6/src/tcldcc.c:1.47 eggdrop1.6/src/tcldcc.c:1.48
--- eggdrop1.6/src/tcldcc.c:1.47	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/tcldcc.c	Sat Nov  1 17:26:57 2003
@@ -2,7 +2,7 @@
  * tcldcc.c -- handles:
  *   Tcl stubs for the dcc commands
  *
- * $Id: tcldcc.c,v 1.47 2003/04/17 01:55:57 wcc Exp $
+ * $Id: tcldcc.c,v 1.48 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -842,11 +842,7 @@
     Tcl_AppendResult(irp, "out of dcc table space", NULL);
     return TCL_ERROR;
   }
-#ifdef USE_IPV6
-  sock = getsock(0, getprotocol(argv[1]));
-#else
   sock = getsock(0);
-#endif /* USE_IPV6 */
 
   if (sock < 0) {
     Tcl_AppendResult(irp, MISC_NOFREESOCK, NULL);
@@ -922,14 +918,7 @@
     j = port + 20;
     i = -1;
     while (port < j && i < 0) {
-#ifdef USE_IPV6
-      /* dum de dum, listen needs an af_def option, on linux this will listen on
-       * both ipv6 and ipv4 
-       */
-      i = open_listen_by_af(&port, AF_INET6);
-#else
       i = open_listen(&port);
-#endif /* USE_IPV6 */
       if (i == -1)
         port++;
       else if (i == -2)
@@ -944,11 +933,7 @@
       return TCL_ERROR;
     }
     idx = new_dcc(&DCC_TELNET, 0);
-#ifdef USE_IPV6
-    dcc[idx].addr = 0x00000000; /* it's not big enough to hold '0xffffffffffffffffffffffffffffffff' =P */
-#else
     dcc[idx].addr = iptolong(getmyip());
-#endif /* USE_IPV6 */
     dcc[idx].port = port;
     dcc[idx].sock = i;
     dcc[idx].timeval = now;
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.45 eggdrop1.6/src/tclmisc.c:1.46
--- eggdrop1.6/src/tclmisc.c:1.45	Mon May 12 18:57:51 2003
+++ eggdrop1.6/src/tclmisc.c	Sat Nov  1 17:26:57 2003
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.45 2003/05/12 23:57:51 wcc Exp $
+ * $Id: tclmisc.c,v 1.46 2003/11/01 23:26:57 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -53,25 +53,6 @@
 extern log_t *logs;
 extern Tcl_Interp *interp;
 
-#ifdef USE_IPV6
-extern char myipv6host[120];
-
-static int tcl_myip6 STDVAR      
-{
-  char s[120];
-
-  getmyip();
-
-  BADARGS(1, 1, "");
-
-  s[0] = 0;
-  if(strlen(myipv6host) < 120)
-    strcpy(s, myipv6host);
-  Tcl_AppendResult(irp, s, NULL);
-  return TCL_OK;
-}
-#endif /* USE_IPV6 */
-
 int expmem_tclmisc()
 {
   int i, tot = 0;
@@ -704,9 +685,6 @@
   {"strftime",         tcl_strftime},
   {"ctime",               tcl_ctime},
   {"myip",                 tcl_myip},
-#ifdef USE_IPV6
-  {"myip6",               tcl_myip6},
-#endif /* USE_IPV6 */
   {"rand",                 tcl_rand},
   {"sendnote",         tcl_sendnote},
   {"dumpfile",         tcl_dumpfile},
----------------------- End of diff -----------------------


More information about the Changes mailing list