[IPv6 IRC-DEV] [CVS] Module ipv6: Change committed
Brought to you by:
zolty
From: Toni G. <zo...@us...> - 2003-01-31 14:10:06
|
CVSROOT : /cvsroot/irc-dev Module : ipv6 Commit time: 2003-01-31 14:10:05 UTC Modified files: CAMBIOS.Ipv6 include/inet.h include/patchlevel.h ircd/common.c ircd/support.c Log message: INET6.19 ---------------------- diff included ---------------------- Index: ipv6/CAMBIOS.Ipv6 diff -u ipv6/CAMBIOS.Ipv6:1.18 ipv6/CAMBIOS.Ipv6:1.19 --- ipv6/CAMBIOS.Ipv6:1.18 Fri Jan 31 04:02:44 2003 +++ ipv6/CAMBIOS.Ipv6 Fri Jan 31 06:09:54 2003 @@ -1,3 +1,9 @@ +* 2003/01/31 zoltan y thebutche INET6.19 +----------------------------------------------------------------------- +Common.c: Se añade el : en el macro de NTL_IRCIP. (zoltan) +Solucionado un warning de compilacion en FREEBSD. (thebutche) + + * 2003/01/31 the...@in... INET6.18 ----------------------------------------------------------------------- Compila en FREEBSD sin problemas :) Index: ipv6/include/inet.h diff -u ipv6/include/inet.h:1.7 ipv6/include/inet.h:1.8 --- ipv6/include/inet.h:1.7 Mon Sep 16 07:07:32 2002 +++ ipv6/include/inet.h Fri Jan 31 06:09:54 2003 @@ -24,6 +24,9 @@ #include <arpa/nameser.h> #include <netdb.h> #include <netinet/in.h> +#if defined(__FreeBSD__) +#include <netinet6/in6.h> +#endif #include <sys/socket.h> @@ -48,6 +51,14 @@ /* Delimitador de campos de las lineas del ircd.conf */ #define IRCDCONF_DELIMITER '%' + +#if defined(__FreeBSD__) +#undef IN6_IS_ADDR_V4MAPPED +#define IN6_IS_ADDR_V4MAPPED(a) \ + (((const unsigned int *) (a))[0] == 0 \ + && ((const unsigned int *) (a))[1] == 0 \ + && ((const unsigned int *) (a))[2] == htonl (0xffff)) +#endif /* Localhost loopback */ #ifndef IN6_IS_ADDR_LOOPBACK Index: ipv6/include/patchlevel.h diff -u ipv6/include/patchlevel.h:1.19 ipv6/include/patchlevel.h:1.20 --- ipv6/include/patchlevel.h:1.19 Fri Jan 31 04:02:45 2003 +++ ipv6/include/patchlevel.h Fri Jan 31 06:09:54 2003 @@ -49,7 +49,7 @@ \ \ \ - "+INET6.18" + "+INET6.19" /* * Deliberate empty lines Index: ipv6/ircd/common.c diff -u ipv6/ircd/common.c:1.2 ipv6/ircd/common.c:1.3 --- ipv6/ircd/common.c:1.2 Mon Sep 30 08:02:00 2002 +++ ipv6/ircd/common.c Fri Jan 31 06:09:54 2003 @@ -369,7 +369,7 @@ markString(NTL_IRCHN, "-_."); /* Some DNS might allow '_' per RFC 1033 ! */ moveMacro(NTL_DIGIT, NTL_IRCIP); - markString(NTL_IRCIP, "."); + markString(NTL_IRCIP, ".:"); moveMacro(NTL_DIGIT | NTL_ALPHA, NTL_IRCNK); markString(NTL_IRCNK, "-_`"); Index: ipv6/ircd/support.c diff -u ipv6/ircd/support.c:1.6 ipv6/ircd/support.c:1.7 --- ipv6/ircd/support.c:1.6 Mon Sep 16 08:47:29 2002 +++ ipv6/ircd/support.c Fri Jan 31 06:09:55 2003 @@ -27,6 +27,7 @@ #endif #include <stdarg.h> #include <signal.h> +#include "inet.h" #include "h.h" #include "send.h" #include "ircd.h" @@ -36,7 +37,7 @@ #include "common.h" #include "fileio.h" -RCSTAG_CC("$Id: support.c,v 1.6 2002/09/16 15:47:29 zolty Exp $"); +RCSTAG_CC("$Id: support.c,v 1.7 2003/01/31 14:09:55 zolty Exp $"); #ifndef HAVE_STRTOKEN /* ----------------------- End of diff ----------------------- |