irc-dev-ipv6 Mailing List for IRC-Dev ircd development (Page 3)

Brought to you by: zolty

irc-dev-ipv6 — Lista de desarrollo de IPv6

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (49)	_Oct (6)	_Nov (5)	_Dec (2)
2003	_Jan (8)	_Feb (11)	_Mar	_Apr	_May	_Jun	_Jul (2)	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan (1)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 > >> (Page 3 of 4)

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/doc Configure.help,1.1.1.1,1.2

From: Zolty <zo...@us...> - 2002-09-16 12:38:16

Update of /cvsroot/irc-dev/ipv6/doc
In directory usw-pr-cvs1:/tmp/cvs-serv16834/doc

Modified Files:
	Configure.help 
Log Message:
INET6.7

Index: Configure.help
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/doc/Configure.help,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Configure.help	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ Configure.help	16 Sep 2002 12:38:13 -0000	1.2
@@ -287,6 +287,13 @@
   a new conf file that has some extra O-lines.  So don't use this unless
   you're debugging.
 
+Enable IPv6 support
+INET6
+  Si tu sistema operativo tiene IPv6 activo, (se comprueba con el comando
+  de shell 'ifconfig') puedes activar esta opcion para activar el soporte
+  de IPv6 del ircd. Acepta conexiones de usuarios/servidores tanto de
+  IPv4 como IPv6.
+
 Set up a Unix domain socket to connect clients/servers
 UNIXPORT
   If there are lots of users having an account on the same machine

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.6,1.7 Ipv6.zoltan,1.9,1.10

From: Zolty <zo...@us...> - 2002-09-16 12:38:16

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv16834

Modified Files:
	CAMBIOS.Ipv6 Ipv6.zoltan 
Log Message:
INET6.7

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CAMBIOS.Ipv6	16 Sep 2002 12:22:12 -0000	1.6
+++ CAMBIOS.Ipv6	16 Sep 2002 12:38:13 -0000	1.7
@@ -1,3 +1,8 @@
+* 2002/09/16 zo...@ir...          INET6.7
+-----------------------------------------------------------------------
+Tras comprobar que es funcional, esto si, incompleto, se mete la
+pregunta en el 'make config'
+
 * 2002/09/16 zo...@ir...          INET6.6
 -----------------------------------------------------------------------
 Se corrige varios warnings de compilacion.

Index: Ipv6.zoltan
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Ipv6.zoltan,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Ipv6.zoltan	14 Sep 2002 22:44:50 -0000	1.9
+++ Ipv6.zoltan	16 Sep 2002 12:38:13 -0000	1.10
@@ -59,7 +59,7 @@
 
 12º Crear un ejemplo-ipv6.conf. (HECHO)
 
-13º Poner la pregunta en el make config.
+13º Poner la pregunta en el make config. (HECHO)

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd IPcheck.c,1.4,1.5 ircd.c,1.3,1.4 s_bsd.c,1.5,1.6 s_conf.c,1.5,1.6 s_misc.c,1.2,1.3 s_serv.c,1.3,1.4 s_user.c,1.4,1.5 support.c,1.3,1.4

From: Zolty <zo...@us...> - 2002-09-16 12:22:16

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv10753/ircd

Modified Files:
	IPcheck.c ircd.c s_bsd.c s_conf.c s_misc.c s_serv.c s_user.c 
	support.c 
Log Message:
INET6.6

Index: IPcheck.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/IPcheck.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- IPcheck.c	14 Sep 2002 22:44:51 -0000	1.4
+++ IPcheck.c	16 Sep 2002 12:22:13 -0000	1.5
@@ -37,6 +37,7 @@
 #include "support.h"
 #endif
 
+#ifndef INET6
 RCSTAG_CC("$Id$");
 
 extern aClient me;
@@ -101,11 +102,11 @@
  * CALCULATE_HASH for IPv6 address
  */
 /* FIXME-ZOLTAN: Adaptar el hash al ipv6 */
-// register char ip[sizeof(struct IN_ADDR)];
 #define CALCULATE_HASH(IN_ADDR) \
   struct IPregistry_vector *hash; \
-  do { register unsigned int ip = (IN_ADDR).S_ADDR; \
-       hash = &IPregistry_hashtable[((ip >> 14) + (ip >> 7) + ip) & (HASHTABSIZE - 1)]; } while(0)
+  do { register char *ip; \
+       memcpy(&ip, (IN_ADDR).S_ADDR, sizeof(struct IN_ADDR)); \
+       hash = &IPregistry_hashtable[ip]; } while(0)
 #else
 /*
  * CALCULATE_HASH for IPv4 address
@@ -162,7 +163,11 @@
   {
     struct IPregistry *i, *end = &iprv->vector[iprv->length];
     for (i = &iprv->vector[0]; i < end; ++i)
+#ifdef INET6
+      if (!memcmp(IP(i).S_ADDR, ip.S_ADDR, sizeof(struct IN_ADDR)))
+#else
       if (IP(i).S_ADDR == ip.S_ADDR)
+#endif
 	return i;
   }
   return NULL;
@@ -177,7 +182,11 @@
 
   for (curr = &iprv->vector[0]; curr < last;)
   {
+#ifdef INET6
+    if (!memcmp(IP(curr).S_ADDR, ip.S_ADDR, sizeof(struct IN_ADDR)))
+#else
     if (IP(curr).S_ADDR == ip.S_ADDR)
+#endif
       /* `curr' is element we looked for */
       retval = curr;
     else if (curr->connected == 0)
@@ -212,7 +221,11 @@
     ++curr;
   }
   /* Now check the last element in the list (curr == last) */
+#ifdef INET6
+  if (!memcmp(IP(curr).S_ADDR, ip.S_ADDR, sizeof(struct IN_ADDR)))
+#else
   if (IP(curr).S_ADDR == ip.S_ADDR)
+#endif
     /* `curr' is element we looked for */
     retval = curr;
   else if (curr->connected == 0)
@@ -657,3 +670,4 @@
 }
 
 #endif
+#endif /* !INET6 */

Index: ircd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/ircd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ircd.c	12 Sep 2002 19:02:14 -0000	1.3
+++ ircd.c	16 Sep 2002 12:22:13 -0000	1.4
@@ -70,6 +70,7 @@
 #include "numnicks.h"
 #include "IPcheck.h"
 #include "s_bdd.h"
+#include "inet.h"
 
 RCSTAG_CC("$Id$");
 

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_bsd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- s_bsd.c	14 Sep 2002 22:44:51 -0000	1.5
+++ s_bsd.c	16 Sep 2002 12:22:13 -0000	1.6
@@ -726,8 +726,8 @@
 #ifdef INET6
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x%08x%08x%08x]",
 	  inetntoa(cptr->ip), hp->h_name,
-	  ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
-	  ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+	  ((unsigned int *)hp->h_addr)[0], ((unsigned int *)hp->h_addr)[1],
+	  ((unsigned int *)hp->h_addr)[2], ((unsigned int *)hp->h_addr)[3]);
 #else
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x]",
 	  inetntoa(cptr->ip), hp->h_name, *((unsigned int *)hp->h_addr));
@@ -737,8 +737,8 @@
 	sprintf_irc(sendbuf, IP_LOOKUP_BAD,
 	    me.name, inetntoa(cptr->ip), hp->h_name,
 #ifdef INET6
-	    ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
-	    ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+	    ((unsigned int *)hp->h_addr)[0], ((unsigned int *)hp->h_addr)[1],
+	    ((unsigned int *)hp->h_addr)[2], ((unsigned int *)hp->h_addr)[3]);
 #else
 	    *((unsigned int *)hp->h_addr));
 #endif
@@ -752,7 +752,7 @@
 ** Gestion Distribuida de Clones
 */
 
-#if defined(BDD) && defined(BDD_CLONES)
+#if defined(BDD) && defined(BDD_CLONES) && !defined(INET6)
 
   if (hp)
   {
@@ -949,8 +949,8 @@
 #ifdef INET6
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x%08x%08x%08x]",
 	  inetntoa(cptr->ip), hp->h_name,
-	  ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
-	  ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+	  ((unsigned int *)hp->h_addr)[0], ((unsigned int *)hp->h_addr)[1],
+	  ((unsigned int *)hp->h_addr)[2], ((unsigned int *)hp->h_addr)[3]);
 #else
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x]",
 	  inetntoa(cptr->ip), hp->h_name, *((unsigned int *)hp->h_addr));
@@ -1522,6 +1522,7 @@
    * If it is a connection to a user port and if the site has been throttled,
    * reject the user.
    */
+#ifndef INET6
   if (IPcheck_local_connect(acptr) == -1 && IsUserPort(acptr))
   {
     ircstp->is_ref++;
@@ -1529,7 +1530,7 @@
 	"Your host is trying to (re)connect too fast -- throttled");
     return NULL;
   }
-
+#endif /* INET6 */
 #ifdef PROXY_PROTECTION
   if (IsUserPort(acptr))
   {

Index: s_conf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_conf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- s_conf.c	14 Sep 2002 22:44:51 -0000	1.5
+++ s_conf.c	16 Sep 2002 12:22:13 -0000	1.6
@@ -283,8 +283,10 @@
       {
 	/* Refuse connections when there are already <digit> clients connected with the same IP number */
 	unsigned short nr = *aconf->passwd - '0';
+#ifndef INET6
 	if (IPcheck_nr(cptr) > nr)
 	  return ACR_TOO_MANY_FROM_IP;	/* Already got nr with that ip# */
+#endif
       }
 #ifdef USEONE
       else if (!strcmp(aconf->passwd, "ONE"))

Index: s_misc.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_misc.c	12 Sep 2002 19:19:00 -0000	1.2
+++ s_misc.c	16 Sep 2002 12:22:13 -0000	1.3
@@ -618,8 +618,10 @@
     Count_unknowndisconnects(nrof);
 
   /* Update IPregistry */
+#ifndef INET6
   if (IsIPChecked(bcptr))
     IPcheck_disconnect(bcptr);
+#endif
 
   /* 
    * Remove from serv->client_list

Index: s_serv.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_serv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_serv.c	14 Sep 2002 22:44:51 -0000	1.3
+++ s_serv.c	16 Sep 2002 12:22:13 -0000	1.4
@@ -861,7 +861,9 @@
     tx_num_serie_dbs(cptr);
 #endif
 
+#ifndef INET6
     IPcheck_connect_fail(cptr);	/* Don't charge this IP# for connecting */
+#endif
   }
 
   det_confs_butmask(cptr,

Index: s_user.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_user.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- s_user.c	14 Sep 2002 22:44:51 -0000	1.4
+++ s_user.c	16 Sep 2002 12:22:13 -0000	1.5
@@ -423,7 +423,9 @@
 	  sendto_op_mask(SNO_TOOMANY, "Too many connections in class for %s.",
 	      sptr->sockhost);
 	}
+#ifndef INET6
 	IPcheck_connect_fail(sptr);
+#endif
 	ircstp->is_ref++;
 	{
 	  char *msg =
@@ -452,7 +454,9 @@
       case ACR_ALREADY_AUTHORIZED:
 	/* Can this ever happen? */
       case ACR_BAD_SOCKET:
+#ifndef INET6
 	IPcheck_connect_fail(sptr);
+#endif
 	return exit_client(cptr, sptr, &me, "Unknown error -- Try again");
     }
     if (IsUnixSocket(sptr))
@@ -482,7 +486,9 @@
     {
       ircstp->is_ref++;
       sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
+#ifndef INET6
       IPcheck_connect_fail(sptr);
+#endif
       return exit_client(cptr, sptr, &me, "Bad Password");
     }
 
@@ -647,7 +653,9 @@
     sendbufto_op_mask(SNO_CONNEXIT);
 #endif /* SNO_CONNEXIT_IP */
 #endif /* ALLOW_SNO_CONNEXIT */
+#ifndef INET6
     IPcheck_connect_succeeded(sptr);
+#endif
   }
   else
     /* if (IsServer(cptr)) */
@@ -680,10 +688,12 @@
     for (acptr = user->server; acptr != &me; acptr = acptr->serv->up)
       if (IsBurst(acptr) || Protocol(acptr) < 10)
 	break;
+#ifndef INET6
     if (IPcheck_remote_connect(sptr, user->host, (acptr != &me)) == -1)
       /* We ran out of bits to count this */
       return exit_client(cptr, sptr, &me,
 	  "More then 255 connections from this IP number");
+#endif
   }
 #ifdef NO_PROTOCOL9		/* Use this when all servers are 2.10 (but test it first) --Run */
 
@@ -1189,7 +1199,9 @@
    */
   if (IsUnknown(acptr) && MyConnect(acptr))
   {
+#ifndef INET6
     IPcheck_connect_fail(acptr);
+#endif
     exit_client(cptr, acptr, &me, "Overridden by other sign on");
     goto nickkilldone;
   }

Index: support.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/support.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- support.c	14 Sep 2002 22:44:51 -0000	1.3
+++ support.c	16 Sep 2002 12:22:13 -0000	1.4
@@ -151,6 +151,12 @@
   }
   return inet_pton(af, src, dst);
 }
+
+
+const unsigned char minus_one[] = { 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 0
+};
+
 #endif
 
 #ifndef HAVE_INET_NETOF

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.5,1.6 Makefile.in,1.2,1.3

From: Zolty <zo...@us...> - 2002-09-16 12:22:16

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv10753

Modified Files:
	CAMBIOS.Ipv6 Makefile.in 
Log Message:
INET6.6

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CAMBIOS.Ipv6	14 Sep 2002 22:44:50 -0000	1.5
+++ CAMBIOS.Ipv6	16 Sep 2002 12:22:12 -0000	1.6
@@ -1,3 +1,9 @@
+* 2002/09/16 zo...@ir...          INET6.6
+-----------------------------------------------------------------------
+Se corrige varios warnings de compilacion.
+Se deshabilita el IPcheck cuando compilas con IPv6, es temporal, que
+antes de esto hay cosas mas importantes por hacerlo.
+
 * 2002/09/15 zo...@ir...          INET6.5
 -----------------------------------------------------------------------
 En las rutinas de resolv, como no hay libreria resolv con IPv6, se hace

Index: Makefile.in
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	14 Sep 2002 14:42:04 -0000	1.2
+++ Makefile.in	16 Sep 2002 12:22:13 -0000	1.3
@@ -126,6 +126,6 @@
 
 # Indent all headers and source files:
 indent:
-	@test "`indent --version`" = "GNU indent 2.2.6" || \
+	@test "`indent --version`" = "GNU indent 2.2.8a" || \
 	  (echo "You need GNU indent 2.2.8a; See doc/readme.indent" && exit -1);
 	VERSION_CONTROL=none indent include/*.h ircd/*.c

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include inet.h,1.5,1.6 patchlevel.h,1.6,1.7 support.h,1.4,1.5

From: Zolty <zo...@us...> - 2002-09-16 12:22:16

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv10753/include

Modified Files:
	inet.h patchlevel.h support.h 
Log Message:
INET6.6

Index: inet.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/inet.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- inet.h	14 Sep 2002 22:44:50 -0000	1.5
+++ inet.h	16 Sep 2002 12:22:13 -0000	1.6
@@ -70,10 +70,6 @@
 	|(x)[8]|(x)[9]|(x)[10]|(x)[11] \
 	|(x)[12]|(x)[13]|(x)[14]|(x)[15])
 
-static unsigned char minus_one[] =
-    { 255, 255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 0
-};
 
 
 /* Tamanios */

Index: patchlevel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/patchlevel.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- patchlevel.h	14 Sep 2002 22:44:51 -0000	1.6
+++ patchlevel.h	16 Sep 2002 12:22:13 -0000	1.7
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.5"
+		"+INET6.6"
 
 /*
  * Deliberate empty lines

Index: support.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/support.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- support.h	14 Sep 2002 22:44:51 -0000	1.4
+++ support.h	16 Sep 2002 12:22:13 -0000	1.5
@@ -17,6 +17,7 @@
 extern char *inetntoa(struct IN_ADDR in);
 #ifdef INET6
 extern int inetpton(int af, const char *src, void *dst);
+extern const unsigned char minus_one[];
 #endif
 extern int check_if_ipmask(const char *mask);
 extern void write_log(const char *filename, const char *pattern, ...);

[IPv6 IRC-DEV] Web sobre IPv6

From: ZOLTAN <ZO...@te...> - 2002-09-16 10:06:44

http://www.elmundo.es/imasd/ipv6/

MUY INTERESANTE

Un saludo

zoltan

Re: [IPv6 IRC-DEV] Ultimo commit del CVS

From: ZOLTAN <ZO...@te...> - 2002-09-16 08:20:36

=3E =

=3E Pq no dices en la lista de irc-dev que existe esta=3F =3A)
=3E =


Tengo miedo a que me coma JCEA=2E=2E=2E =


Aparte de los miembros de IRC-Dev=2C hay 3 o 4 personas de fuera=2C que l=
o =

he invitado en privado=2E

La tem=E1tica de la lista es el IPv6=2C o sea se puede preguntar/comentar=
 =

sobre configuraciones IPv6=2C como utilizar el soporte IPv6 de programas=2C=
 =

clientes IRC incluidos=2C etc=2E=2E =


Un saludo

zoltan

Re: [IPv6 IRC-DEV] Ultimo commit del CVS

From: Ruben C. <ni...@te...> - 2002-09-15 10:43:35

Pq no dices en la lista de irc-dev que existe esta? :)

[IPv6 IRC-DEV] Ultimo commit del CVS

From: ZOLTAN <ZO...@te...> - 2002-09-15 07:50:59

En el ultimo commit=2C se ha agregado el soporte IPv6=2C pero est=E1 sin =

completar a=FAn=2E =


Ya escucha y acepta conexiones de tanto IPv4 como IPv6 cuando esta =

ocompilado con INET6=2E Pero al estar inacabado=2C la entrada de un =

cliente produce un core dump =3A)=2C es debido a que aun no he adaptado e=
l =

IPcheck=2Ec al IPv6=2E

Un saludo

zoltan

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd IPcheck.c,1.3,1.4 match.c,1.2,1.3 res.c,1.3,1.4 s_bsd.c,1.4,1.5 s_conf.c,1.4,1.5 s_debug.c,1.1.1.1,1.2 s_ping.c,1.3,1.4 s_serv.c,1.2,1.3 s_user.c,1.3,1.4 support.c,1.2,1.3 whocmds.c,1.3,1.4

From: Zolty <zo...@us...> - 2002-09-14 22:44:54

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv18553/ircd

Modified Files:
	IPcheck.c match.c res.c s_bsd.c s_conf.c s_debug.c s_ping.c 
	s_serv.c s_user.c support.c whocmds.c 
Log Message:
INET6.5

Index: IPcheck.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/IPcheck.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IPcheck.c	12 Sep 2002 19:02:14 -0000	1.3
+++ IPcheck.c	14 Sep 2002 22:44:51 -0000	1.4
@@ -96,6 +96,17 @@
  * Calculate a `hash' value between 0 and HASHTABSIZE, from the internet address `IN_ADDR'.
  * Apply it immedeately to the table, effectively hiding the table itself.
  */
+#ifdef INET6
+/*
+ * CALCULATE_HASH for IPv6 address
+ */
+/* FIXME-ZOLTAN: Adaptar el hash al ipv6 */
+// register char ip[sizeof(struct IN_ADDR)];
+#define CALCULATE_HASH(IN_ADDR) \
+  struct IPregistry_vector *hash; \
+  do { register unsigned int ip = (IN_ADDR).S_ADDR; \
+       hash = &IPregistry_hashtable[((ip >> 14) + (ip >> 7) + ip) & (HASHTABSIZE - 1)]; } while(0)
+#else
 /*
  * CALCULATE_HASH for IPv4 address
  */
@@ -103,6 +114,7 @@
   struct IPregistry_vector *hash; \
   do { register unsigned int ip = (IN_ADDR).S_ADDR; \
        hash = &IPregistry_hashtable[((ip >> 14) + (ip >> 7) + ip) & (HASHTABSIZE - 1)]; } while(0)
+#endif /* INET6 */
 
 /*
  * Fit `now' in an unsigned short, the advantage is that we use less memory `struct IPregistry::last_connect' can be smaller

Index: match.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/match.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- match.c	12 Sep 2002 19:02:14 -0000	1.2
+++ match.c	14 Sep 2002 22:44:51 -0000	1.3
@@ -1006,8 +1006,14 @@
   }
   while (*m++);
 
+#ifdef INET6
+  /* still IPv4 */
+  imask->bits.s_addr = htonl(bits);
+  imask->mask.s_addr = htonl(filt);
+#else
   imask->bits.S_ADDR = htonl(bits);
   imask->mask.S_ADDR = htonl(filt);
+#endif
   imask->fall = unco;
   return ((bits & ~filt) ? -1 : 0);
 

Index: res.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/res.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- res.c	12 Sep 2002 19:02:14 -0000	1.3
+++ res.c	14 Sep 2002 22:44:51 -0000	1.4
@@ -30,6 +30,7 @@
 #include "support.h"
 #include "common.h"
 #include "sprintf_irc.h"
+#include "inet.h"
 
 RCSTAG_CC("$Id$");
 
@@ -215,14 +216,25 @@
   if (!_res.nscount)
   {
     _res.nscount = 1;
+#ifdef INET6
+    /* still IPv4 */
+    _res.nsaddr_list[0].sin_addr.s_addr =
+	inet_pton(AF_INET, "127.0.0.1", &_res.nsaddr_list[0].sin_addr.s_addr);
+#else
     _res.nsaddr_list[0].SIN_ADDR.S_ADDR = inet_addr("127.0.0.1");
+#endif
   }
 #ifdef DEBUGMODE
   _res.options |= RES_DEBUG;
 #endif
 
   alarm(2);
+#ifdef INET6
+  /* still IPv4 */
+  fd = socket(AF_INET, SOCK_DGRAM, 0);
+#else
   fd = socket(AFINET, SOCK_DGRAM, 0);
+#endif
   alarm(0);
   if (fd < 0)
   {
@@ -233,7 +245,12 @@
        * socket at initialization time, it's pointless to continue.
        */
       alarm(2);
+#ifdef INET6
+      /* still IPv4 */
+      if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+#else
       if ((fd = socket(AFINET, SOCK_DGRAM, 0)) < 0)
+#endif
       {
 	alarm(0);
 	Debug((DEBUG_ERROR, "init_resolver: socket: No more sockets"));
@@ -318,8 +335,11 @@
   else
     memset(&nreq->cinfo, 0, sizeof(Link));
   nreq->timeout = 4;		/* start at 4 and exponential inc. */
+#ifdef INET6
+  nreq->addr = in6addr_any;
+#else
   nreq->addr.S_ADDR = INADDR_NONE;
-
+#endif
   nreq->he.h.h_addrtype = AFINET;
   nreq->he.h.h_length = sizeof(struct IN_ADDR);
   add_request(nreq);
@@ -436,7 +456,12 @@
 
   for (i = 0; i < max; ++i)
   {
+#ifdef INET6
+    /* still IPv4 */
+    _res.nsaddr_list[i].sin_family = AF_INET;
+#else
     _res.nsaddr_list[i].SIN_FAMILY = AFINET;
+#endif
     if (sendto(resfd, msg, len, 0, (struct SOCKADDR *)&(_res.nsaddr_list[i]),
 	sizeof(struct SOCKADDR)) == len)
     {
@@ -554,7 +579,11 @@
     if ((rptr = make_request(lp)) == NULL)
       return -1;
     rptr->type = T_PTR;
+#ifdef INET6
+    memcpy(rptr->addr.S_ADDR, numb->S_ADDR, IN6ADDRSZ);
+#else
     rptr->addr.S_ADDR = numb->S_ADDR;
+#endif
   }
   return (query_name(ipbuf, C_IN, T_PTR, rptr));
 }
@@ -846,7 +875,12 @@
   Reg1 HEADER *hptr;
   Reg2 ResRQ *rptr = NULL;
   aCache *cp = NULL;
+#ifdef INET6
+  /* still IPv4 */
+  struct sockaddr_in sin;
+#else
   struct SOCKADDR_IN sin;
+#endif
   int a, max;
   size_t rc, len = sizeof(sin);
 
@@ -888,9 +922,16 @@
 
   for (a = 0; a < max; a++)
   {
+#ifdef INET6
+    /* still IPv4 */
+    if (!_res.nsaddr_list[a].sin_addr.s_addr ||
+	!memcmp((char *)&sin.sin_addr, (char *)&_res.nsaddr_list[a].sin_addr,
+	sizeof(struct in_addr)))
+#else
     if (!_res.nsaddr_list[a].SIN_ADDR.S_ADDR ||
 	!memcmp((char *)&sin.SIN_ADDR, (char *)&_res.nsaddr_list[a].SIN_ADDR,
 	sizeof(struct IN_ADDR)))
+#endif
       break;
   }
   if (a == max)
@@ -1406,8 +1447,15 @@
   hashv = hash_number((unsigned char *)numb);
 
   cp = hashtable[hashv].num_list;
+#ifdef INET6
+  Debug((DEBUG_DNS,
+      "find_cache_number:find %s[%08x%08x%08x%08x]: hashv = %d",
+      inetntoa(*numb), numb->S_ADDR[0], numb->S_ADDR[1],
+      numb->S_ADDR[2], numb->S_ADDR[3], hashv));
+#else
   Debug((DEBUG_DNS, "find_cache_number:find %s[%08x]: hashv = %d",
       inetntoa(*numb), ntohl(numb->S_ADDR), hashv));
+#endif
 
   for (; cp; cp = cp->hnum_next)
   {

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_bsd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- s_bsd.c	12 Sep 2002 19:19:00 -0000	1.4
+++ s_bsd.c	14 Sep 2002 22:44:51 -0000	1.5
@@ -103,14 +103,13 @@
 #define IP_LOOKUP_OK ":%s NOTICE IP_LOOKUP :*** Found your hostname.\r\n"
 #define IP_LOOKUP_CACHE ":%s NOTICE IP_LOOKUP :*** Found your hostname (CACHED!).\r\n"
 #define IP_LOOKUP_FAIL ":%s NOTICE IP_LOOKUP :*** Couldn't resolve your hostname.\r\n"
+#ifdef INET6
+#define IP_LOOKUP_BAD ":%s NOTICE IP_LOOKUP :*** IP# Mismatch: %s != %s[%08x%08x%08x%08x], ignoring hostname.\r\n"
+#else
 #define IP_LOOKUP_BAD ":%s NOTICE IP_LOOKUP :*** IP# Mismatch: %s != %s[%08x], ignoring hostname.\r\n"
-
-
-
-#ifndef IN_LOOPBACKNET
-#define IN_LOOPBACKNET	0x7f
 #endif
 
+
 aClient *loc_clients[MAXCONNECTIONS];
 int highest_fd = 0, udpfd = -1, resfd = -1;
 unsigned int readcalls = 0;
@@ -251,8 +250,16 @@
   size_t len = sizeof(server);
   char ipname[20];
 
+  if (BadPtr(name))
+    name = "*";
   ad[0] = ad[1] = ad[2] = ad[3] = 0;
 
+#ifdef INET6
+  if (*name == '*')
+    sprintf_irc(ipname, "::");
+  else
+    sprintf_irc(ipname, "%s", name);
+#else
   /*
    * do it this way because building ip# from separate values for each
    * byte requires endian knowledge or some nasty messing. Also means
@@ -260,6 +267,7 @@
    */
   sscanf(name, "%d.%d.%d.%d", &ad[0], &ad[1], &ad[2], &ad[3]);
   sprintf_irc(ipname, "%d.%d.%d.%d", ad[0], ad[1], ad[2], ad[3]);
+#endif
 
   if (cptr != &me)
   {
@@ -302,6 +310,7 @@
   if (port)
   {
     server.SIN_FAMILY = AFINET;
+/* FIXME-ZOLTAN */
 #ifndef VIRTUAL_HOST
     server.SIN_ADDR.S_ADDR = INADDR_ANY;
 #else
@@ -341,7 +350,11 @@
   }
   if (cptr->fd > highest_fd)
     highest_fd = cptr->fd;
+#ifdef INET6
+  memcpy(cptr->ip.S_ADDR, server.SIN_ADDR.S_ADDR, IN6ADDRSZ);
+#else
   cptr->ip.S_ADDR = inet_addr(ipname);
+#endif
 #ifdef TESTNET
   cptr->port = ntohs(server.SIN_PORT) - 10000;
 #else
@@ -654,7 +667,11 @@
     return -1;
   }
   strcpy(sockn, inetntoa(sk.SIN_ADDR));
+#ifdef INET6
+  if (IN6_IS_ADDR_LOOPBACK(&sk.SIN_ADDR))
+#else
   if (inet_netof(sk.SIN_ADDR) == IN_LOOPBACKNET)
+#endif
   {
     cptr->hostp = NULL;
     strncpy(sockn, me.name, HOSTLEN);
@@ -706,13 +723,25 @@
 	break;
     if (!hp->h_addr_list[i])
     {
+#ifdef INET6
+      sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x%08x%08x%08x]",
+	  inetntoa(cptr->ip), hp->h_name,
+	  ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
+	  ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+#else
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x]",
 	  inetntoa(cptr->ip), hp->h_name, *((unsigned int *)hp->h_addr));
+#endif
       if (IsUserPort(cptr))
       {
 	sprintf_irc(sendbuf, IP_LOOKUP_BAD,
 	    me.name, inetntoa(cptr->ip), hp->h_name,
+#ifdef INET6
+	    ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
+	    ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+#else
 	    *((unsigned int *)hp->h_addr));
+#endif
 	write(cptr->fd, sendbuf, strlen(sendbuf));
       }
       hp = NULL;
@@ -793,8 +822,13 @@
 
   Debug((DEBUG_DNS, "ch_cl: access ok: %s[%s]", cptr->name, sockname));
 
+#ifdef INET6
+  if (IN6_IS_ADDR_LOOPBACK(&cptr->ip) || IsUnixSocket(cptr) ||
+      !memcmp(cptr->ip.s6_addr, mysk.sin6_addr.s6_addr, 8))
+#else
   if (inet_netof(cptr->ip) == IN_LOOPBACKNET || IsUnixSocket(cptr) ||
       inet_netof(cptr->ip) == inet_netof(mysk.SIN_ADDR))
+#endif
   {
     ircstp->is_loc++;
     cptr->flags |= FLAGS_LOCAL;
@@ -912,8 +946,15 @@
 	break;
     if (!hp->h_addr_list[i])
     {
+#ifdef INET6
+      sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x%08x%08x%08x]",
+	  inetntoa(cptr->ip), hp->h_name,
+	  ((unsigned long *)hp->h_addr)[0], ((unsigned long *)hp->h_addr)[1],
+	  ((unsigned long *)hp->h_addr)[2], ((unsigned long *)hp->h_addr)[3]);
+#else
       sendto_op_mask(SNO_IPMISMATCH, "IP# Mismatch: %s != %s[%08x]",
 	  inetntoa(cptr->ip), hp->h_name, *((unsigned int *)hp->h_addr));
+#endif
       hp = NULL;
     }
   }
@@ -1001,7 +1042,11 @@
   attach_conf(cptr, c_conf);
   attach_confs(cptr, name, CONF_HUB | CONF_LEAF | CONF_UWORLD);
 
+#ifdef INET6
+  if ((AND16(c_conf->ipnum.s6_addr) == 255) && !IsUnixSocket(cptr))
+#else
   if ((c_conf->ipnum.S_ADDR == INADDR_NONE) && !IsUnixSocket(cptr))
+#endif
     memcpy(&c_conf->ipnum, &cptr->ip, sizeof(struct IN_ADDR));
   if (!IsUnixSocket(cptr))
     get_sockhost(cptr, c_conf->host);
@@ -2252,9 +2297,16 @@
     nextdnscheck = 1;
     s = strchr(aconf->host, '@');
     s++;			/* should NEVER be NULL */
+
+#ifdef INET6
+    if (!inetpton(AFINET, s, aconf->ipnum.S_ADDR))
+    {
+      memset(aconf->ipnum.S_ADDR, 0x0, sizeof(struct IN_ADDR));
+#else
     if ((aconf->ipnum.S_ADDR = inet_addr(s)) == INADDR_NONE)
     {
       aconf->ipnum.S_ADDR = INADDR_ANY;
+#endif
       hp = gethost_byname(s, &lin);
       Debug((DEBUG_NOTICE, "co_sv: hp %p ac %p na %s ho %s",
 	  hp, aconf, aconf->name, s));
@@ -2469,9 +2521,15 @@
    * conf line, whether as a result of the hostname lookup or the ip#
    * being present instead. If we dont know it, then the connect fails.
    */
+#ifdef INET6
+  if (!inet_pton(AFINET, aconf->host, aconf->ipnum.S_ADDR))
+    memcpy(aconf->ipnum.S_ADDR, minus_one, IN6ADDRSZ);
+  if (AND16(aconf->ipnum.S_ADDR) == 255)
+#else
   if (isDigit(*aconf->host) && (aconf->ipnum.S_ADDR == INADDR_NONE))
     aconf->ipnum.S_ADDR = inet_addr(aconf->host);
   if (aconf->ipnum.S_ADDR == INADDR_NONE)
+#endif
   {
     hp = cptr->hostp;
     if (!hp)
@@ -2549,7 +2607,11 @@
    */
   memset(&mysk, 0, sizeof(mysk));
   mysk.SIN_FAMILY = AFINET;
+#ifdef INET6
+  memset(mysk.SIN_ADDR.S_ADDR, 0x0, sizeof(struct IN_ADDR));
+#else
   mysk.SIN_ADDR.S_ADDR = INADDR_ANY;
+#endif
 
   if (!aconf || BadPtr(aconf->host))
     return;
@@ -2557,9 +2619,16 @@
 
   if (!BadPtr(aconf->passwd) && 0 != strcmp(aconf->passwd, "*"))
   {
+#ifdef INET6
+    memcpy(mysk.SIN_ADDR.S_ADDR, minus_one, IN6ADDRSZ);
+    if (AND16(mysk.SIN_ADDR.S_ADDR) == 255)
+      memset(mysk.SIN_ADDR.S_ADDR, 0x0, sizeof(struct IN_ADDR));
+#else
     mysk.SIN_ADDR.S_ADDR = inet_addr(aconf->passwd);
     if (INADDR_NONE == mysk.SIN_ADDR.S_ADDR)
       mysk.SIN_ADDR.S_ADDR = INADDR_ANY;
+#endif
+
 #ifdef VIRTUAL_HOST
     memcpy(&vserv, &mysk, sizeof(struct SOCKADDR_IN));
 #endif

Index: s_conf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_conf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- s_conf.c	14 Sep 2002 14:42:05 -0000	1.4
+++ s_conf.c	14 Sep 2002 22:44:51 -0000	1.5
@@ -1184,16 +1184,32 @@
   ln.value.aconf = aconf;
   ln.flags = ASYNC_CONF;
 
+#ifdef INET6
+  if (inetpton(AF_INET6, s, aconf->ipnum.s6_addr))
+    ;
+#else
   if (isDigit(*s))
     aconf->ipnum.S_ADDR = inet_addr(s);
+#endif
   else if ((hp = gethost_byname(s, &ln)))
     memcpy(&(aconf->ipnum), hp->h_addr, sizeof(struct IN_ADDR));
-
+#ifdef INET6
+  else
+  {
+    memcpy(aconf->ipnum.S_ADDR, minus_one, IN6ADDRSZ);
+    goto badlookup;
+  }
+#else
   if (aconf->ipnum.S_ADDR == INADDR_NONE)
     goto badlookup;
+#endif
   return 0;
 badlookup:
+#ifdef INET6
+  if (AND16(aconf->ipnum.S_ADDR) == 255)
+#else
   if (aconf->ipnum.S_ADDR == INADDR_NONE)
+#endif
     memset(&aconf->ipnum, 0, sizeof(struct IN_ADDR));
   Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
       aconf->host, aconf->name));

Index: s_debug.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_debug.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_debug.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ s_debug.c	14 Sep 2002 22:44:51 -0000	1.2
@@ -187,6 +187,9 @@
 #ifdef	USE_SYSLOG
     'Y',
 #endif
+#ifdef INET6
+    '6',
+#endif
     '.','E','S','N','E','T','.', 
 #if CLIENT_FLOOD > 999
     (char)('0' + (CLIENT_FLOOD/1000) % 10),

Index: s_ping.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_ping.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_ping.c	12 Sep 2002 19:02:15 -0000	1.3
+++ s_ping.c	14 Sep 2002 22:44:51 -0000	1.4
@@ -284,9 +284,15 @@
     s = strchr(cptr->sockhost, '@');
     s++;			/* should never be NULL;
 				   cptr->sockhost is actually a conf->host */
+#ifdef INET6
+    if (!inetpton(AF_INET6, s, cptr->ip.S_ADDR))
+    {
+      memcpy(cptr->ip.S_ADDR, minus_one, IN6ADDRSZ);
+#else
     if ((cptr->ip.S_ADDR = inet_addr(s)) == INADDR_NONE)
     {
       cptr->ip.S_ADDR = INADDR_ANY;
+#endif
       hp = gethost_byname(s, &lin);
       Debug((DEBUG_NOTICE, "ping_sv: hp %p ac %p ho %s", hp, cptr, s));
       if (!hp)

Index: s_serv.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_serv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_serv.c	12 Sep 2002 19:02:15 -0000	1.2
+++ s_serv.c	14 Sep 2002 22:44:51 -0000	1.3
@@ -1045,7 +1045,20 @@
 	    NumServ(acptr->user->server),
 	    acptr->name, acptr->hopcount + 1, acptr->lastnick,
 	    acptr->user->username, acptr->user->host,
+#ifdef INET6
+	    /* FIXME-ZOLTAN */
+/*
+            s, inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR), 6),
+	    s, 
+	    inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[0]), 6),
+	    inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[1]), 6),
+	    inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[2]), 6),
+	    inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[3]), 6),
+*/
+	    s, "AAAAAA",
+#else
 	    s, inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR), 6),
+#endif
 	    NumNick(acptr), acptr->info);
       }
     }

Index: s_user.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_user.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_user.c	12 Sep 2002 19:19:00 -0000	1.3
+++ s_user.c	14 Sep 2002 22:44:51 -0000	1.4
@@ -730,7 +730,20 @@
       "%s NICK %s %d %d %s %s %s%s %s%s :%s",
       NumServ(user->server), nick, sptr->hopcount + 1, (int)(sptr->lastnick),
       user->username, user->host, tmpstr,
+#ifdef INET6
+      /* FIXME-ZOLTAN */
+/*   
+      inttobase64(ip_base64, ntohl(sptr->ip.S_ADDR), 6),
+     
+      inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[0]), 6),
+      inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[1]), 6),
+      inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[2]), 6),
+      inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR[3]), 6),
+*/
+      "AAAAAA",
+#else
       inttobase64(ip_base64, ntohl(sptr->ip.S_ADDR), 6),
+#endif
       NumNick(sptr), sptr->info);
   for (lp = me.serv->down; lp; lp = lp->next)
   {
@@ -1568,13 +1581,22 @@
     if (Protocol(cptr) < 10)
     {
       SetRemoteNumNick(sptr, nnp9);
+#ifdef INET6
+      memset(sptr->ip.S_ADDR, 0x0, sizeof(struct IN_ADDR));
+#else
       sptr->ip.S_ADDR = 0;
+#endif
     }
     else
     {
 #endif
       SetRemoteNumNick(sptr, parv[parc - 2]);
+#ifdef INET6
+//    if (!inetpton(AFINET, parv[parc - 3], sptr->ip.S_ADDR))
+      memcpy(sptr->ip.S_ADDR, minus_one, IN6ADDRSZ);
+#else
       sptr->ip.S_ADDR = htonl(base64toint(parv[parc - 3]));
+#endif
       /* IP# of remote client */
 #ifndef NO_PROTOCOL9
     }

Index: support.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/support.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- support.c	12 Sep 2002 19:02:15 -0000	1.2
+++ support.c	14 Sep 2002 22:44:51 -0000	1.3
@@ -126,6 +126,33 @@
   return buf;
 }
 
+#ifdef INET6
+/*
+ * inetpton(af, src, dst)
+ *
+ * This is a wrapper for inet_pton(), so we can use ipv4 addresses
+ * with an af of AF_INET6, and that it gets converted to ipv4 mapped ipv6.
+ *
+ */
+int inetpton(int af, const char *src, void *dst)
+{
+  int i;
+
+  /* an empty string should listen to all */
+  if (af == AF_INET6 && *src && !strchr(src, ':'))
+  {
+    i = inet_pton(AF_INET, src, dst);
+
+    /* ugly hack */
+    memcpy(dst + 12, dst, 4);
+    memset(dst, 0, 10);
+    memset(dst + 10, 0xff, 2);
+    return i;
+  }
+  return inet_pton(af, src, dst);
+}
+#endif
+
 #ifndef HAVE_INET_NETOF
 /*
  *    inet_netof --   return the net portion of an internet number

Index: whocmds.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/whocmds.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- whocmds.c	12 Sep 2002 19:19:00 -0000	1.3
+++ whocmds.c	14 Sep 2002 22:44:51 -0000	1.4
@@ -637,10 +637,17 @@
 	      || matchexec(acptr->info, mymask, minlen))
 	      && ((!(matchsel & WHO_FIELD_NIP))
 	      || (IsHidden(acptr) && !IsHiddenViewer(sptr))
-	      || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) !=
-	      imask.bits.S_ADDR)) || (imask.fall
+#ifdef INET6
+	      /* still IPv4 */
+	      || (((((long)acptr->ip.S_ADDR & (long)imask.mask.s_addr) !=
+	      (long)imask.bits.s_addr)) || (imask.fall
+	      && matchexec(inetntoa(acptr->ip), mymask, minlen)))))
+#else
+	      || (((((long)acptr->ip.S_ADDR & (long)imask.mask.S_ADDR) !=
+	      (long)imask.bits.S_ADDR)) || (imask.fall
 	      && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
-	    continue;
+#endif
+	      continue;
 #else
 	  if ((mask) &&
 	      ((!(matchsel & WHO_FIELD_NIC))
@@ -654,10 +661,17 @@
 	      && ((!(matchsel & WHO_FIELD_REN))
 	      || matchexec(acptr->info, mymask, minlen))
 	      && ((!(matchsel & WHO_FIELD_NIP))
-	      || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) !=
-	      imask.bits.S_ADDR)) || (imask.fall
+#ifdef INET6
+	      /* still IPv4 */
+	      || (((((long)acptr->ip.S_ADDR & (long)imask.mask.s_addr) !=
+	      (long)imask.bits.s_addr)) || (imask.fall
+	      && matchexec(inetntoa(acptr->ip), mymask, minlen)))))
+#else
+	      || (((((long)acptr->ip.S_ADDR & (long)imask.mask.S_ADDR) !=
+	      (long)imask.bits.S_ADDR)) || (imask.fall
 	      && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
-	    continue;
+#endif
+	      continue;
 #endif
 	  if (!SHOW_MORE(sptr, counter))
 	    break;
@@ -698,10 +712,17 @@
 	    || matchexec(acptr->info, mymask, minlen))
 	    && ((!(matchsel & WHO_FIELD_NIP))
 	    || (IsHidden(acptr) && !IsHiddenViewer(sptr))
-	    || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) != imask.bits.S_ADDR))
-	    || (imask.fall
+#ifdef INET6
+	    /* still IPv4 */
+	    || (((((long)acptr->ip.S_ADDR & (long)imask.mask.s_addr) !=
+	    (long)imask.bits.s_addr)) || (imask.fall
+	    && matchexec(inetntoa(acptr->ip), mymask, minlen)))))
+#else
+	    || (((((long)acptr->ip.S_ADDR & (long)imask.mask.S_ADDR) !=
+	    (long)imask.bits.S_ADDR)) || (imask.fall
 	    && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
-	  continue;
+#endif
+	    continue;
 #else
 	if ((mask) &&
 	    ((!(matchsel & WHO_FIELD_NIC))
@@ -715,10 +736,17 @@
 	    && ((!(matchsel & WHO_FIELD_REN))
 	    || matchexec(acptr->info, mymask, minlen))
 	    && ((!(matchsel & WHO_FIELD_NIP))
-	    || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) != imask.bits.S_ADDR))
-	    || (imask.fall
+#ifdef INET6
+	    /* still IPv4 */
+	    || (((((long)acptr->ip.S_ADDR & (long)imask.mask.s_addr) !=
+	    (long)imask.bits.s_addr)) || (imask.fall
+	    && matchexec(inetntoa(acptr->ip), mymask, minlen)))))
+#else
+	    || (((((long)acptr->ip.S_ADDR & (long)imask.mask.S_ADDR) !=
+	    (long)imask.bits.S_ADDR)) || (imask.fall
 	    && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
-	  continue;
+#endif
+	    continue;
 #endif
 	if (!SHOW_MORE(sptr, counter))
 	  break;

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include inet.h,1.4,1.5 match.h,1.3,1.4 patchlevel.h,1.5,1.6 support.h,1.3,1.4

From: Zolty <zo...@us...> - 2002-09-14 22:44:54

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv18553/include

Modified Files:
	inet.h match.h patchlevel.h support.h 
Log Message:
INET6.5

Index: inet.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/inet.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- inet.h	14 Sep 2002 14:42:04 -0000	1.4
+++ inet.h	14 Sep 2002 22:44:50 -0000	1.5
@@ -27,6 +27,63 @@
 #include <sys/socket.h>
 
 
+#ifdef INET6
+/*
+ * Macros y estructuras IPv6
+ */
+#define         AFINET          AF_INET6
+#define         SOCKADDR_IN     sockaddr_in6
+#define         SOCKADDR        sockaddr
+#define         SIN_FAMILY      sin6_family
+#define         SIN_PORT        sin6_port
+#define         SIN_ADDR        sin6_addr
+#define         S_ADDR          s6_addr
+#define         IN_ADDR         in6_addr
+
+# if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(bsdi)
+#  ifndef s6_laddr
+#   define s6_laddr        s6_addr32
+#  endif
+# endif
+
+/* Delimitador de campos de las lineas del ircd.conf */
+#define IRCDCONF_DELIMITER '%'
+
+/* Localhost loopback */
+#ifndef IN6_IS_ADDR_LOOPBACK
+#define IN6_IS_ADDR_LOOPBACK(a) \
+        (((const unsigned int *) (a))[0] == 0              \
+         && ((const unsigned int *) (a))[1] == 0           \
+         && ((const unsigned int *) (a))[2] == 0           \
+         && ((const unsigned int *) (a))[3] == htonl (1))
+#endif
+
+#define AND16(x) \
+	((x)[0]&(x)[1]&(x)[2]&(x)[3] \
+	&(x)[4]&(x)[5]&(x)[6]&(x)[7] \
+	&(x)[8]&(x)[9]&(x)[10]&(x)[11] \
+	&(x)[12]&(x)[13]&(x)[14]&(x)[15])
+
+#define WHOSTENTP(x) \
+	((x)[0]|(x)[1]|(x)[2]|(x)[3] \
+	|(x)[4]|(x)[5]|(x)[6]|(x)[7] \
+	|(x)[8]|(x)[9]|(x)[10]|(x)[11] \
+	|(x)[12]|(x)[13]|(x)[14]|(x)[15])
+
+static unsigned char minus_one[] =
+    { 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 0
+};
+
+
+/* Tamanios */
+#ifndef INADDRSZ
+#define INADDRSZ sizeof(struct IN_ADDR)
+#define IN6ADDRSZ sizeof(struct IN_ADDR)
+#endif
+
+
+#else /* !INET6 */
 /*
  * Macros y estructuras IPv4
  */
@@ -41,6 +98,31 @@
 
 /* Delimitador de campos de las lineas del ircd.conf */
 #define IRCDCONF_DELIMITER ':'
+
+#define WHOSTENTP(x) (x)
+
+/* Localhost loopback */
+#ifndef IN_LOOPBACKNET
+#define IN_LOOPBACKNET  0x7f	/* 127 */
+#endif
+
+/* Escuchar a todas las interfaces */
+#ifndef INADDR_ANY
+#define INADDR_ANY 0x00000000
+#endif
+
+/* Indica un error */
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+
+/* Tamanios */
+#ifndef INADDRSZ
+#define INADDRSZ sizeof(struct IN_ADDR)
+#endif
+
+#endif /* INET6 */
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff

Index: match.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/match.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- match.h	12 Sep 2002 19:02:14 -0000	1.3
+++ match.h	14 Sep 2002 22:44:51 -0000	1.4
@@ -10,8 +10,14 @@
  */
 
 struct in_mask {
+#ifdef INET6
+  /* still IPv4 */
+  struct in_addr bits;
+  struct in_addr mask;
+#else
   struct IN_ADDR bits;
   struct IN_ADDR mask;
+#endif
   int fall;
 };
 

Index: patchlevel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/patchlevel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- patchlevel.h	14 Sep 2002 14:42:05 -0000	1.5
+++ patchlevel.h	14 Sep 2002 22:44:51 -0000	1.6
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.4"
+		"+INET6.5"
 
 /*
  * Deliberate empty lines

Index: support.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/support.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- support.h	12 Sep 2002 19:02:14 -0000	1.3
+++ support.h	14 Sep 2002 22:44:51 -0000	1.4
@@ -15,6 +15,9 @@
 extern void dumpcore(const char *pattern, ...)
     __attribute__ ((format(printf, 1, 2)));
 extern char *inetntoa(struct IN_ADDR in);
+#ifdef INET6
+extern int inetpton(int af, const char *src, void *dst);
+#endif
 extern int check_if_ipmask(const char *mask);
 extern void write_log(const char *filename, const char *pattern, ...);

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.4,1.5 Ipv6.zoltan,1.8,1.9

From: Zolty <zo...@us...> - 2002-09-14 22:44:53

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv18553

Modified Files:
	CAMBIOS.Ipv6 Ipv6.zoltan 
Log Message:
INET6.5

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CAMBIOS.Ipv6	14 Sep 2002 14:42:04 -0000	1.4
+++ CAMBIOS.Ipv6	14 Sep 2002 22:44:50 -0000	1.5
@@ -1,3 +1,11 @@
+* 2002/09/15 zo...@ir...          INET6.5
+-----------------------------------------------------------------------
+En las rutinas de resolv, como no hay libreria resolv con IPv6, se hace
+con IPv4.
+En la /VERSION, sale un 6 si esta compilado con IPv6.
+Limpieza de errores y warnings al compilar con IPv6.
+Se agrega la familia de protocolo IPv6.
+
 * 2002/09/14 zo...@ir...          INET6.4
 -----------------------------------------------------------------------
 Creamos un define para la delimitacion de campos del ircd.conf ya que 

Index: Ipv6.zoltan
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Ipv6.zoltan,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Ipv6.zoltan	14 Sep 2002 14:42:04 -0000	1.8
+++ Ipv6.zoltan	14 Sep 2002 22:44:50 -0000	1.9
@@ -27,7 +27,7 @@
       INADDRANY_STR   "0.0.0.0"         "0::0"
 
    Y sustituirlos por TODO el codigo. Hay que tener en cuenta que la familia IPv6
-   soporta conexiones de tanto IPv4 como IPv6
+   soporta conexiones de tanto IPv4 como IPv6 (HECHO)
 
 4º La ip de IPv6 en formato binario, no puede estar en un int, ya que son 128 bits,
    hay que meterlo en un puntero char* o en un int[4].

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include inet.h,1.3,1.4 patchlevel.h,1.4,1.5

From: Zolty <zo...@us...> - 2002-09-14 14:42:09

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv13639/include

Modified Files:
	inet.h patchlevel.h 
Log Message:
INET6.4

Index: inet.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/inet.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inet.h	12 Sep 2002 19:18:59 -0000	1.3
+++ inet.h	14 Sep 2002 14:42:04 -0000	1.4
@@ -26,6 +26,10 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
+
+/*
+ * Macros y estructuras IPv4
+ */
 #define		AFINET		AF_INET
 #define		SOCKADDR_IN	sockaddr_in
 #define		SOCKADDR	sockaddr
@@ -35,6 +39,8 @@
 #define		S_ADDR		s_addr
 #define		IN_ADDR		in_addr
 
+/* Delimitador de campos de las lineas del ircd.conf */
+#define IRCDCONF_DELIMITER ':'
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff

Index: patchlevel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/patchlevel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- patchlevel.h	12 Sep 2002 19:10:27 -0000	1.4
+++ patchlevel.h	14 Sep 2002 14:42:05 -0000	1.5
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.3"
+		"+INET6.4"
 
 /*
  * Deliberate empty lines

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd chkconf.c,1.2,1.3 s_conf.c,1.3,1.4

From: Zolty <zo...@us...> - 2002-09-14 14:42:08

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv13639/ircd

Modified Files:
	chkconf.c s_conf.c 
Log Message:
INET6.4

Index: chkconf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/chkconf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- chkconf.c	12 Sep 2002 16:38:57 -0000	1.2
+++ chkconf.c	14 Sep 2002 14:42:05 -0000	1.3
@@ -215,7 +215,7 @@
 	*line == ' ' || *line == '\t')
       continue;
 
-    if (line[1] != ':')
+    if (line[1] != IRCDCONF_DELIMITER)
     {
       fprintf(stderr, "ERROR: Bad config line (%s)\n", line);
       continue;
@@ -543,7 +543,7 @@
     return (NULL);
 
   field = line;
-  if ((end = strchr(line, ':')) == NULL)
+  if ((end = strchr(line, IRCDCONF_DELIMITER)) == NULL)
   {
     line = NULL;
     if ((end = strchr(field, '\n')) == NULL)

Index: s_conf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_conf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_conf.c	12 Sep 2002 19:02:15 -0000	1.3
+++ s_conf.c	14 Sep 2002 14:42:05 -0000	1.4
@@ -103,12 +103,12 @@
 
   end = field = gfline;
 
-  if (fs != ':')
+  if (fs != IRCDCONF_DELIMITER)
   {
     if (*end == fs)
       ++end;
     else
-      fs = ':';
+      fs = IRCDCONF_DELIMITER;
   }
   do
   {
@@ -122,7 +122,8 @@
       ++end;
     }
   }
-  while (end && fs != ':' && *++end != ':' && *end != '\n');
+  while (end && fs != IRCDCONF_DELIMITER && *++end != IRCDCONF_DELIMITER
+      && *end != '\n');
 
   if (end == NULL)
   {
@@ -869,7 +870,7 @@
 	line[0] == ' ' || line[0] == '\t')
       continue;
     /* Could we test if it's conf line at all?      -Vesa */
-    if (line[1] != ':')
+    if (line[1] != IRCDCONF_DELIMITER)
     {
       Debug((DEBUG_ERROR, "Bad config line: %s", line));
       continue;
@@ -878,7 +879,7 @@
       free_conf(aconf);
     aconf = make_conf();
 
-    tmp = getfield(line, ':');
+    tmp = getfield(line, IRCDCONF_DELIMITER);
     if (!tmp)
       continue;
     switch (*tmp)
@@ -980,20 +981,20 @@
 
     for (;;)			/* Fake loop, that I can use break here --msa */
     {
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->host, tmp);
       if ((tmp = getfield(NULL, (aconf->status == CONF_KILL
-	  || aconf->status == CONF_IPKILL) ? '"' : ':')) == NULL)
+	  || aconf->status == CONF_IPKILL) ? '"' : IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->passwd, tmp);
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       DupString(aconf->name, tmp);
-      if ((tmp = getfield(NULL, ':')) == NULL)
+      if ((tmp = getfield(NULL, IRCDCONF_DELIMITER)) == NULL)
 	break;
       aconf->port = atoi(tmp);
-      tmp = getfield(NULL, ':');
+      tmp = getfield(NULL, IRCDCONF_DELIMITER);
       if (aconf->status & CONF_ME)
       {
 	server_port = aconf->port;

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.3,1.4 Ipv6.zoltan,1.7,1.8 Makefile.in,1.1.1.1,1.2

From: Zolty <zo...@us...> - 2002-09-14 14:42:08

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv13639

Modified Files:
	CAMBIOS.Ipv6 Ipv6.zoltan Makefile.in 
Log Message:
INET6.4

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CAMBIOS.Ipv6	12 Sep 2002 19:10:26 -0000	1.3
+++ CAMBIOS.Ipv6	14 Sep 2002 14:42:04 -0000	1.4
@@ -1,3 +1,8 @@
+* 2002/09/14 zo...@ir...          INET6.4
+-----------------------------------------------------------------------
+Creamos un define para la delimitacion de campos del ircd.conf ya que 
+el : estandar es incompatible con el IPv6.
+
 * 2002/09/12 zo...@ir...          INET6.3
 -----------------------------------------------------------------------
 Se adjunta el ircd.conf de IPv6.

Index: Ipv6.zoltan
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Ipv6.zoltan,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Ipv6.zoltan	12 Sep 2002 19:10:26 -0000	1.7
+++ Ipv6.zoltan	14 Sep 2002 14:42:04 -0000	1.8
@@ -34,7 +34,7 @@
  
 5º Definir un macro en "inet.h" para la delimitacion de los campos de las lineas
    del ircd.conf ya que como en INET6 usan ':', entonces para el ircd.conf utilizaremos
-   el '%' si el ircd se compila para INET6.
+   el '%' si el ircd se compila para INET6. (HECHO)
 
 6º Adaptar el inetntoa al IPv6 o cambiar por una funcion nueva inetntop (numerico a 
    puntero) para tanto IPv4 como IPv6.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.in	11 Sep 2002 10:09:07 -0000	1.1.1.1
+++ Makefile.in	14 Sep 2002 14:42:04 -0000	1.2
@@ -126,6 +126,6 @@
 
 # Indent all headers and source files:
 indent:
-	@test "`indent --version`" = "GNU indent 2.2.8a" || \
+	@test "`indent --version`" = "GNU indent 2.2.6" || \
 	  (echo "You need GNU indent 2.2.8a; See doc/readme.indent" && exit -1);
 	VERSION_CONTROL=none indent include/*.h ircd/*.c

[IPv6 IRC-DEV] Sobre los COMMIT's de CVS de hoy

From: ZOLTAN <ZO...@te...> - 2002-09-12 19:30:16

Me gustaria que los que puedan, bajar el ircd del CVS y probar para ver 
si se compila correctamente y funciona correctamente.

El soporte IPv6 todavia no funciona, ni siquiera existe en el codigo en 
estos momentos, y lo que he hecho hasta ahora es organizar el codigo.

Un saludo

zoltan

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd Makefile.in,1.2,1.3 channel.c,1.2,1.3 dbuf.c,1.1.1.1,1.2 m_config.c,1.1.1.1,1.2 m_watch.c,1.2,1.3 opercmds.c,1.1.1.1,1.2 s_auth.c,1.3,1.4 s_bdd.c,1.1.1.1,1.2 s_bsd.c,1.3,1.4 s_misc.c,1.1.1.1,1.2 s_user.c,1.2,1.3 whocmds.c,1.2,1.3

From: Zolty <zo...@us...> - 2002-09-12 19:19:06

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv28444/ircd

Modified Files:
	Makefile.in channel.c dbuf.c m_config.c m_watch.c opercmds.c 
	s_auth.c s_bdd.c s_bsd.c s_misc.c s_user.c whocmds.c 
Log Message:
Make indent y Make depend

A partir de ahora, antes de cada commit hacer el make indent SIEMPRE.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	12 Sep 2002 19:10:27 -0000	1.2
+++ Makefile.in	12 Sep 2002 19:18:59 -0000	1.3
@@ -227,306 +227,328 @@
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-IPcheck.o: IPcheck.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/IPcheck.h ../include/querycmds.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/s_user.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/numnicks.h ../include/send.h ../include/s_bdd.h
-bsd.o: bsd.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/ircd.h ../include/bsd.h
-channel.o: channel.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/channel.h ../include/list.h \
- ../include/parse.h ../include/send.h ../include/s_err.h \
- ../include/numeric.h ../include/ircd.h ../include/common.h \
- ../include/match.h ../include/hash.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/s_misc.h ../include/s_user.h ../include/s_conf.h \
- ../include/s_bsd.h ../include/msg.h ../include/support.h \
- ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h
-class.o: class.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/class.h ../include/s_conf.h \
- ../include/list.h ../include/s_serv.h ../include/s_bdd.h ../include/send.h \
- ../include/s_err.h ../include/numeric.h ../include/ircd.h
+IPcheck.o: IPcheck.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/IPcheck.h ../include/querycmds.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_user.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
+  ../include/send.h ../include/s_bdd.h ../include/support.h
+bsd.o: bsd.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/list.h ../include/ircd.h \
+  ../include/bsd.h
+channel.o: channel.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/channel.h ../include/list.h ../include/parse.h \
+  ../include/send.h ../include/s_err.h ../include/numeric.h \
+  ../include/ircd.h ../include/common.h ../include/s_bdd.h \
+  ../include/match.h ../include/hash.h ../include/s_serv.h \
+  ../include/s_misc.h ../include/s_user.h ../include/s_conf.h \
+  ../include/s_bsd.h ../include/msg.h ../include/support.h \
+  ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h
+class.o: class.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/class.h \
+  ../include/s_conf.h ../include/list.h ../include/s_serv.h \
+  ../include/send.h ../include/s_err.h ../include/numeric.h \
+  ../include/ircd.h
 common.o: common.c ../include/common.h ../include/sys.h \
- ../include/../config/config.h ../include/../config/setup.h \
- ../include/runmalloc.h
-crule.o: crule.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_serv.h ../include/s_bdd.h ../include/ircd.h \
- ../include/match.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/common.h ../include/crule.h
-dbuf.o: dbuf.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/dbuf.h ../include/struct.h \
- ../include/h.h ../include/s_serv.h ../include/send.h
-ircd.o: ircd.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/res.h ../include/list.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/s_serv.h ../include/s_bdd.h ../include/send.h ../include/ircd.h \
- ../include/s_conf.h ../include/class.h ../include/s_misc.h \
- ../include/parse.h ../include/match.h ../include/s_bsd.h \
- ../include/crule.h ../include/userload.h ../include/numeric.h \
- ../include/hash.h ../include/bsd.h ../include/version.h \
- ../include/numnicks.h ../include/s_bdd.h ../include/IPcheck.h
-list.o: list.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/numeric.h ../include/send.h \
- ../include/s_conf.h ../include/list.h ../include/class.h \
- ../include/match.h ../include/ircd.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/support.h ../include/s_misc.h ../include/s_bsd.h \
- ../include/res.h ../include/common.h ../include/s_user.h ../include/list.h\
- ../include/opercmds.h ../include/m_watch.h ../include/hash.h
-map.o: map.c ../include/sys.h ../include/../config/config.h ../include/numnicks.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/numeric.h ../include/send.h \
- ../include/match.h ../include/list.h ../include/s_err.h \
- ../include/ircd.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/s_misc.h ../include/map.h ../include/querycmds.h
-match.o: match.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/common.h ../include/match.h \
- ../include/ircd.h
-numnicks.o: numnicks.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/s_serv.h ../include/s_bdd.h ../include/struct.h \
- ../include/dbuf.h ../include/whowas.h ../include/common.h \
- ../include/numnicks.h ../include/ircd.h ../include/parse.h \
- ../include/s_misc.h ../include/match.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/list.h
-opercmds.o: opercmds.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/opercmds.h ../include/struct.h \
- ../include/dbuf.h ../include/whowas.h ../include/ircd.h \
- ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
- ../include/send.h ../include/s_err.h ../include/numeric.h \
- ../include/match.h ../include/s_misc.h ../include/class.h \
- ../include/s_user.h ../include/common.h ../include/msg.h \
- ../include/sprintf_irc.h ../include/userload.h ../include/parse.h \
- ../include/numnicks.h ../include/crule.h ../include/version.h \
- ../include/support.h ../include/s_serv.h ../include/s_bdd.h ../include/hash.h
-packet.o: packet.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_misc.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/list.h ../include/ircd.h \
- ../include/msg.h ../include/parse.h ../include/send.h \
- ../include/packet.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/dbuf.h
-parse.o: parse.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_serv.h ../include/s_bdd.h ../include/send.h \
- ../include/parse.h ../include/common.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/list.h ../include/msg.h \
- ../include/s_user.h ../include/channel.h ../include/s_ping.h \
- ../include/res.h ../include/map.h ../include/hash.h \
- ../include/numeric.h ../include/ircd.h ../include/s_misc.h \
- ../include/s_numeric.h ../include/numnicks.h ../include/opercmds.h \
- ../include/querycmds.h ../include/whocmds.h ../include/m_config.h \
- ../include/m_watch.h
-querycmds.o: querycmds.c ../include/sys.h \
- ../include/../config/config.h ../include/../config/setup.h \
- ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/parse.h ../include/send.h ../include/s_err.h \
- ../include/numeric.h ../include/ircd.h ../include/s_user.h \
- ../include/version.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/s_misc.h ../include/match.h \
- ../include/s_serv.h ../include/s_bdd.h ../include/msg.h ../include/channel.h \
- ../include/numnicks.h ../include/userload.h ../include/support.h \
- ../include/querycmds.h
-random.o: random.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h \
- ../include/random.h
-res.o: res.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/res.h ../include/list.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/numeric.h ../include/send.h ../include/s_misc.h \
- ../include/s_bsd.h ../include/s_conf.h ../include/ircd.h \
- ../include/s_ping.h ../include/support.h ../include/common.h \
- ../include/sprintf_irc.h ../include/s_err.h
-runmalloc.o: runmalloc.c ../include/sys.h \
- ../include/../config/config.h ../include/../config/setup.h \
- ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/send.h ../include/numeric.h ../include/s_err.h \
- ../include/ircd.h ../include/s_serv.h ../include/s_bdd.h ../include/numnicks.h
-s_auth.o: s_auth.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/res.h ../include/list.h ../include/s_serv.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/common.h ../include/send.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_misc.h ../include/support.h \
- ../include/ircd.h ../include/s_auth.h ../include/sprintf_irc.h
-s_bsd.o: s_bsd.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/res.h ../include/list.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/s_bsd.h ../include/s_conf.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/numeric.h ../include/send.h ../include/s_misc.h \
- ../include/hash.h ../include/s_err.h ../include/ircd.h \
- ../include/support.h ../include/s_auth.h ../include/class.h \
- ../include/packet.h ../include/s_ping.h ../include/channel.h \
- ../include/version.h ../include/parse.h ../include/common.h \
- ../include/bsd.h ../include/numnicks.h ../include/s_user.h \
- ../include/sprintf_irc.h ../include/querycmds.h ../include/IPcheck.h \
- ../include/m_config.h
-s_conf.o: s_conf.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_serv.h ../include/s_bdd.h ../include/opercmds.h \
- ../include/numeric.h ../include/send.h ../include/s_conf.h \
- ../include/list.h ../include/class.h ../include/s_misc.h \
- ../include/match.h ../include/common.h ../include/s_err.h \
- ../include/s_bsd.h ../include/ircd.h ../include/crule.h \
- ../include/res.h ../include/support.h ../include/parse.h \
- ../include/numnicks.h ../include/sprintf_irc.h ../include/IPcheck.h \
- ../include/hash.h ../include/s_bdd.h
-s_debug.o: s_debug.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/numeric.h ../include/hash.h \
- ../include/s_serv.h ../include/s_bdd.h ../include/send.h ../include/s_conf.h \
- ../include/list.h ../include/class.h ../include/ircd.h \
- ../include/s_bsd.h ../include/bsd.h ../include/res.h \
- ../include/channel.h ../include/numnicks.h
-s_err.o: s_err.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/numeric.h ../include/s_err.h \
- ../include/sprintf_irc.h ../include/m_watch.h
-s_misc.o: s_misc.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_serv.h ../include/s_bdd.h ../include/numeric.h \
- ../include/send.h ../include/s_conf.h ../include/list.h \
- ../include/s_misc.h ../include/common.h ../include/match.h \
- ../include/hash.h ../include/s_bsd.h ../include/res.h \
- ../include/ircd.h ../include/s_ping.h ../include/channel.h \
- ../include/s_err.h ../include/support.h ../include/userload.h \
- ../include/parse.h ../include/s_user.h ../include/numnicks.h \
- ../include/sprintf_irc.h ../include/querycmds.h ../include/IPcheck.h \
- ../include/dbuf.h ../include/m_watch.h
-s_numeric.o: s_numeric.c ../include/sys.h \
- ../include/../config/config.h ../include/../config/setup.h \
- ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/s_serv.h ../include/s_bdd.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/send.h ../include/support.h \
- ../include/parse.h ../include/numeric.h ../include/channel.h \
- ../include/ircd.h ../include/hash.h ../include/numnicks.h \
- ../include/s_numeric.h
-s_ping.o: s_ping.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/send.h ../include/s_conf.h \
- ../include/list.h ../include/match.h ../include/res.h \
- ../include/s_bsd.h ../include/s_serv.h ../include/s_bdd.h ../include/ircd.h \
- ../include/s_ping.h ../include/support.h ../include/numeric.h \
- ../include/s_user.h ../include/s_err.h ../include/common.h \
- ../include/numnicks.h
-s_serv.o: s_serv.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/ircd.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/s_misc.h ../include/sprintf_irc.h ../include/send.h \
- ../include/s_err.h ../include/numeric.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/list.h ../include/hash.h \
- ../include/common.h ../include/match.h ../include/crule.h \
- ../include/parse.h ../include/numnicks.h ../include/userload.h \
- ../include/s_user.h ../include/channel.h ../include/querycmds.h \
- ../include/IPcheck.h ../include/m_config.h  ../include/dbuf.h
-s_bdd.o: s_bdd.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/ircd.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/s_misc.h ../include/sprintf_irc.h ../include/send.h \
- ../include/s_err.h ../include/numeric.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/list.h ../include/hash.h \
- ../include/common.h ../include/match.h ../include/crule.h \
- ../include/parse.h ../include/numnicks.h ../include/userload.h \
- ../include/s_user.h ../include/channel.h ../include/querycmds.h \
- ../include/IPcheck.h ../include/dbuf.h
-s_user.o: s_user.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/common.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/numeric.h ../include/send.h ../include/s_conf.h \
- ../include/list.h ../include/s_misc.h ../include/match.h \
- ../include/hash.h ../include/s_bsd.h ../include/s_err.h \
- ../include/parse.h ../include/ircd.h ../include/s_user.h \
- ../include/support.h ../include/channel.h ../include/random.h \
- ../include/version.h ../include/msg.h ../include/userload.h \
- ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h \
- ../include/IPcheck.h ../include/m_watch.h
-send.o: send.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/s_bsd.h ../include/s_conf.h \
- ../include/list.h ../include/s_serv.h ../include/s_bdd.h ../include/send.h \
- ../include/s_misc.h ../include/common.h ../include/match.h \
- ../include/ircd.h ../include/channel.h ../include/bsd.h \
- ../include/class.h ../include/s_user.h ../include/sprintf_irc.h
-sprintf_irc.o: sprintf_irc.c ../include/sys.h \
- ../include/../config/config.h ../include/../config/setup.h \
- ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
- ../include/sprintf_irc.h
-support.o: support.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/send.h ../include/ircd.h \
- ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
- ../include/support.h ../include/sprintf_irc.h ../include/common.h
-userload.o: userload.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/send.h ../include/s_misc.h \
- ../include/userload.h ../include/ircd.h ../include/numnicks.h \
- ../include/s_serv.h ../include/s_bdd.h ../include/querycmds.h
-whocmds.o: whocmds.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/struct.h ../include/dbuf.h \
- ../include/whowas.h ../include/common.h ../include/s_serv.h ../include/s_bdd.h \
- ../include/numeric.h ../include/send.h ../include/s_conf.h \
- ../include/list.h ../include/s_misc.h ../include/match.h \
- ../include/hash.h ../include/s_bsd.h ../include/s_err.h \
- ../include/parse.h ../include/ircd.h ../include/s_user.h \
- ../include/support.h ../include/channel.h ../include/random.h \
- ../include/version.h ../include/msg.h ../include/userload.h \
- ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h \
- ../include/IPcheck.h
-whowas.o: whowas.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h \
- ../include/common.h ../include/h.h ../include/s_debug.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/numeric.h ../include/send.h ../include/s_misc.h \
- ../include/s_err.h ../include/ircd.h ../include/list.h \
- ../include/s_user.h ../include/support.h
-s_socks.o: s_socks.c ../include/sys.h ../include/../config/config.h \
- ../include/../config/setup.h ../include/runmalloc.h ../include/h.h \
- ../include/s_debug.h ../include/res.h ../include/list.h ../include/hash.h \
- ../include/struct.h ../include/dbuf.h ../include/whowas.h \
- ../include/common.h ../include/send.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_misc.h ../include/support.h \
- ../include/ircd.h ../include/s_socks.h ../include/sprintf_irc.h \
- ../include/s_bdd.h
-m_config.o: m_config.c ../include/m_config.h ../include/sys.h \
- ../include/h.h ../include/ircd.h ../include/struct.h ../include/send.h \
- ../include/s_serv.h ../include/msg.h ../include/runmalloc.h \
- ../include/s_conf.h ../include/common.h ../include/../config/config.h
-m_watch.o: m_watch.c ../include/sys.h ../include/h.h ../include/hash.h \
- ../include/ircd.h ../include/list.h ../include/msg.h ../include/numeric.h \
- ../include/s_bsd.h ../include/s_err.h ../include/s_user.h \
- ../include/send.h ../include/struct.h ../include/support.h \
- ../include/m_watch.h
+  ../config/config.h ../config/setup.h ../include/runmalloc.h
+crule.o: crule.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h \
+  ../include/ircd.h ../include/match.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/list.h ../include/common.h \
+  ../include/crule.h
+dbuf.o: dbuf.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/common.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/s_serv.h ../include/list.h ../include/send.h
+fileio.o: fileio.c ../include/fileio.h ../include/runmalloc.h
+ircd.o: ircd.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/res.h ../include/inet.h ../include/list.h \
+  ../include/struct.h ../include/whowas.h ../include/dbuf.h \
+  ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h ../include/send.h \
+  ../include/ircd.h ../include/s_conf.h ../include/class.h \
+  ../include/s_misc.h ../include/parse.h ../include/match.h \
+  ../include/s_bsd.h ../include/crule.h ../include/userload.h \
+  ../include/numeric.h ../include/hash.h ../include/bsd.h \
+  ../include/version.h ../include/numnicks.h ../include/IPcheck.h \
+  ../include/s_bdd.h
+list.o: list.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/numeric.h \
+  ../include/send.h ../include/s_conf.h ../include/list.h \
+  ../include/class.h ../include/match.h ../include/ircd.h \
+  ../include/s_serv.h ../include/support.h ../include/s_misc.h \
+  ../include/s_bsd.h ../include/res.h ../include/common.h \
+  ../include/s_user.h ../include/opercmds.h ../include/m_watch.h \
+  ../include/hash.h
+map.o: map.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/numeric.h \
+  ../include/send.h ../include/match.h ../include/list.h \
+  ../include/s_err.h ../include/ircd.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/s_misc.h ../include/querycmds.h \
+  ../include/map.h ../include/numnicks.h
+match.o: match.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/common.h \
+  ../include/match.h ../include/ircd.h
+numnicks.o: numnicks.c ../include/numnicks.h ../include/sys.h \
+  ../config/config.h ../config/setup.h ../include/runmalloc.h \
+  ../include/h.h ../include/s_debug.h ../include/s_serv.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/common.h \
+  ../include/ircd.h ../include/s_misc.h ../include/match.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h
+opercmds.o: opercmds.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/opercmds.h ../include/struct.h \
+  ../include/inet.h ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h \
+  ../zlib/zconf.h ../include/ircd.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/list.h ../include/send.h \
+  ../include/s_err.h ../include/numeric.h ../include/match.h \
+  ../include/s_misc.h ../include/class.h ../include/s_bdd.h \
+  ../include/s_user.h ../include/common.h ../include/msg.h \
+  ../include/sprintf_irc.h ../include/userload.h ../include/parse.h \
+  ../include/numnicks.h ../include/crule.h ../include/version.h \
+  ../include/support.h ../include/s_serv.h ../include/hash.h
+packet.o: packet.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_misc.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
+  ../include/ircd.h ../include/msg.h ../include/parse.h ../include/send.h \
+  ../include/packet.h ../include/s_serv.h
+parse.o: parse.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h \
+  ../include/send.h ../include/parse.h ../include/common.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
+  ../include/msg.h ../include/s_user.h ../include/channel.h \
+  ../include/s_ping.h ../include/res.h ../include/map.h \
+  ../include/m_watch.h ../include/s_bdd.h ../include/m_config.h \
+  ../include/hash.h ../include/numeric.h ../include/ircd.h \
+  ../include/s_misc.h ../include/s_numeric.h ../include/numnicks.h \
+  ../include/opercmds.h ../include/querycmds.h ../include/whocmds.h
+querycmds.o: querycmds.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/parse.h ../include/send.h ../include/s_err.h \
+  ../include/numeric.h ../include/ircd.h ../include/s_user.h \
+  ../include/version.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/list.h ../include/s_misc.h ../include/match.h \
+  ../include/s_serv.h ../include/msg.h ../include/channel.h \
+  ../include/numnicks.h ../include/userload.h ../include/support.h \
+  ../include/querycmds.h
+random.o: random.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/random.h
+res.o: res.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/res.h ../include/inet.h ../include/list.h \
+  ../include/struct.h ../include/whowas.h ../include/dbuf.h \
+  ../zlib/zlib.h ../zlib/zconf.h ../include/numeric.h ../include/send.h \
+  ../include/s_err.h ../include/s_misc.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/ircd.h ../include/s_ping.h \
+  ../include/support.h ../include/common.h ../include/sprintf_irc.h
+runmalloc.o: runmalloc.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h
+s_auth.o: s_auth.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/res.h ../include/inet.h ../include/list.h \
+  ../include/struct.h ../include/whowas.h ../include/dbuf.h \
+  ../zlib/zlib.h ../zlib/zconf.h ../include/common.h ../include/send.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/s_misc.h \
+  ../include/s_serv.h ../include/support.h ../include/ircd.h \
+  ../include/s_auth.h ../include/sprintf_irc.h
+s_bsd.o: s_bsd.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/res.h ../include/inet.h ../include/list.h \
+  ../include/struct.h ../include/whowas.h ../include/dbuf.h \
+  ../zlib/zlib.h ../zlib/zconf.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/s_serv.h ../include/numeric.h ../include/send.h \
+  ../include/s_bdd.h ../include/m_config.h ../include/s_misc.h \
+  ../include/hash.h ../include/s_err.h ../include/ircd.h \
+  ../include/support.h ../include/s_auth.h ../include/class.h \
+  ../include/packet.h ../include/s_ping.h ../include/channel.h \
+  ../include/version.h ../include/parse.h ../include/common.h \
+  ../include/bsd.h ../include/numnicks.h ../include/s_user.h \
+  ../include/sprintf_irc.h ../include/querycmds.h ../include/IPcheck.h \
+  ../include/msg.h
+s_conf.o: s_conf.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h \
+  ../include/opercmds.h ../include/numeric.h ../include/send.h \
+  ../include/s_conf.h ../include/list.h ../include/class.h \
+  ../include/s_misc.h ../include/match.h ../include/common.h \
+  ../include/s_err.h ../include/s_bsd.h ../include/ircd.h \
+  ../include/crule.h ../include/res.h ../include/s_bdd.h \
+  ../include/support.h ../include/parse.h ../include/numnicks.h \
+  ../include/sprintf_irc.h ../include/IPcheck.h ../include/hash.h \
+  ../include/fileio.h
+s_debug.o: s_debug.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/numeric.h ../include/hash.h ../include/s_serv.h \
+  ../include/send.h ../include/s_conf.h ../include/list.h \
+  ../include/class.h ../include/ircd.h ../include/s_bsd.h \
+  ../include/bsd.h ../include/res.h ../include/channel.h \
+  ../include/numnicks.h
+s_err.o: s_err.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/numeric.h ../include/s_err.h ../include/sprintf_irc.h \
+  ../include/m_watch.h
+s_misc.o: s_misc.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h \
+  ../include/numeric.h ../include/send.h ../include/s_conf.h \
+  ../include/list.h ../include/s_misc.h ../include/common.h \
+  ../include/match.h ../include/hash.h ../include/s_bsd.h \
+  ../include/res.h ../include/ircd.h ../include/s_ping.h \
+  ../include/channel.h ../include/s_err.h ../include/support.h \
+  ../include/userload.h ../include/parse.h ../include/s_user.h \
+  ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h \
+  ../include/IPcheck.h ../include/m_watch.h
+s_numeric.o: s_numeric.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/s_serv.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/list.h ../include/send.h ../include/support.h \
+  ../include/parse.h ../include/numeric.h ../include/channel.h \
+  ../include/ircd.h ../include/hash.h ../include/numnicks.h \
+  ../include/s_numeric.h
+s_ping.o: s_ping.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/send.h \
+  ../include/s_conf.h ../include/list.h ../include/match.h \
+  ../include/res.h ../include/s_bsd.h ../include/s_serv.h \
+  ../include/ircd.h ../include/s_ping.h ../include/support.h \
+  ../include/numeric.h ../include/s_user.h ../include/s_err.h \
+  ../include/common.h ../include/numnicks.h
+s_serv.o: s_serv.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/ircd.h \
+  ../include/s_serv.h ../include/s_misc.h ../include/sprintf_irc.h \
+  ../include/send.h ../include/s_err.h ../include/numeric.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
+  ../include/hash.h ../include/common.h ../include/s_bdd.h \
+  ../include/msg.h ../include/m_config.h ../include/match.h \
+  ../include/crule.h ../include/parse.h ../include/numnicks.h \
+  ../include/userload.h ../include/s_user.h ../include/channel.h \
+  ../include/querycmds.h ../include/IPcheck.h
+s_user.o: s_user.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/common.h \
+  ../include/s_serv.h ../include/numeric.h ../include/send.h \
+  ../include/s_conf.h ../include/list.h ../include/s_misc.h \
+  ../include/match.h ../include/hash.h ../include/s_bsd.h \
+  ../include/s_err.h ../include/parse.h ../include/m_watch.h \
+  ../include/s_bdd.h ../include/ircd.h ../include/s_user.h \
+  ../include/support.h ../include/channel.h ../include/random.h \
+  ../include/version.h ../include/msg.h ../include/userload.h \
+  ../include/numnicks.h ../include/sprintf_irc.h ../include/querycmds.h \
+  ../include/IPcheck.h ../include/class.h
+send.o: send.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/list.h ../include/s_serv.h \
+  ../include/send.h ../include/s_misc.h ../include/common.h \
+  ../include/match.h ../include/ircd.h ../include/channel.h \
+  ../include/bsd.h ../include/class.h ../include/s_user.h \
+  ../include/sprintf_irc.h
+sprintf_irc.o: sprintf_irc.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/sprintf_irc.h
+support.o: support.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/send.h ../include/ircd.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/inet.h \
+  ../include/list.h ../include/support.h ../include/sprintf_irc.h \
+  ../include/common.h ../include/fileio.h
+userload.o: userload.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/send.h ../include/s_misc.h ../include/userload.h \
+  ../include/ircd.h ../include/numnicks.h ../include/s_serv.h \
+  ../include/querycmds.h
+whocmds.o: whocmds.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/common.h ../include/s_serv.h ../include/numeric.h \
+  ../include/send.h ../include/s_conf.h ../include/list.h \
+  ../include/s_misc.h ../include/match.h ../include/hash.h \
+  ../include/s_bsd.h ../include/s_err.h ../include/parse.h \
+  ../include/ircd.h ../include/s_user.h ../include/support.h \
+  ../include/channel.h ../include/random.h ../include/version.h \
+  ../include/msg.h ../include/userload.h ../include/numnicks.h \
+  ../include/sprintf_irc.h ../include/querycmds.h ../include/IPcheck.h
+whowas.o: whowas.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/common.h ../include/h.h \
+  ../include/s_debug.h ../include/struct.h ../include/inet.h \
+  ../include/whowas.h ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h \
+  ../include/numeric.h ../include/send.h ../include/s_misc.h \
+  ../include/s_err.h ../include/ircd.h ../include/list.h \
+  ../include/s_user.h ../include/support.h
+s_socks.o: s_socks.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/res.h ../include/inet.h \
+  ../include/list.h ../include/struct.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/common.h \
+  ../include/send.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/s_misc.h ../include/support.h ../include/ircd.h \
+  ../include/s_socks.h ../include/sprintf_irc.h ../include/hash.h \
+  ../include/s_serv.h
+s_bdd.o: s_bdd.c ../include/sys.h ../config/config.h ../config/setup.h \
+  ../include/runmalloc.h ../include/h.h ../include/s_debug.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/ircd.h \
+  ../include/s_serv.h ../include/s_misc.h ../include/sprintf_irc.h \
+  ../include/send.h ../include/s_err.h ../include/numeric.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/list.h \
+  ../include/hash.h ../include/common.h ../include/match.h \
+  ../include/crule.h ../include/parse.h ../include/numnicks.h \
+  ../include/userload.h ../include/s_user.h ../include/channel.h \
+  ../include/querycmds.h ../include/IPcheck.h ../include/s_bdd.h \
+  ../include/msg.h ../include/support.h
+m_config.o: m_config.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/common.h ../include/ircd.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/s_serv.h \
+  ../include/msg.h ../include/s_conf.h ../include/list.h \
+  ../include/m_config.h ../include/send.h
+m_watch.o: m_watch.c ../include/sys.h ../config/config.h \
+  ../config/setup.h ../include/runmalloc.h ../include/h.h \
+  ../include/s_debug.h ../include/hash.h ../include/s_serv.h \
+  ../include/struct.h ../include/inet.h ../include/whowas.h \
+  ../include/dbuf.h ../zlib/zlib.h ../zlib/zconf.h ../include/ircd.h \
+  ../include/list.h ../include/msg.h ../include/numeric.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/s_err.h \
+  ../include/s_user.h ../include/send.h ../include/support.h \
+  ../include/m_watch.h

Index: channel.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/channel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- channel.c	12 Sep 2002 19:02:14 -0000	1.2
+++ channel.c	12 Sep 2002 19:19:00 -0000	1.3
@@ -1377,24 +1377,24 @@
 	    *cp = 0;
 	  if (opcnt >= MAXMODEPARAMS || **parv == ':' || **parv == '\0')
 	    break;
-          invalid_banmask = 0;
-          for (p = *parv; *p; p++)
-          {   
-            if ((*p != 33) && (*p != 42) && (*p != 45) && (*p != 46) &&
-              !((*p > 62) && (*p < 127)) && !((*p > 47) && (*p < 58)))
-            { 
-              sendto_one(cptr, err_str(ERR_INVALIDBANMASK), me.name, cptr->name,
-                chptr->chname, *parv);
-              invalid_banmask = 1;
-              break;
-            } 
-          }   
-          if (invalid_banmask)
-          {
-            invalid_banmask = 0;
-            break;
-          }   
-        }
+	  invalid_banmask = 0;
+	  for (p = *parv; *p; p++)
+	  {
+	    if ((*p != 33) && (*p != 42) && (*p != 45) && (*p != 46) &&
+		!((*p > 62) && (*p < 127)) && !((*p > 47) && (*p < 58)))
+	    {
+	      sendto_one(cptr, err_str(ERR_INVALIDBANMASK), me.name, cptr->name,
+		  chptr->chname, *parv);
+	      invalid_banmask = 1;
+	      break;
+	    }
+	  }
+	  if (invalid_banmask)
+	  {
+	    invalid_banmask = 0;
+	    break;
+	  }
+	}
 	if (whatt == MODE_ADD)
 	{
 	  lp = &chops[opcnt++];
@@ -4886,20 +4886,21 @@
 	  idx++;
 	}
       }
-      else {
+      else
+      {
 /*
 ** Debemos enviar @+, no +@, por bug de clientes
 */
-        if (lp->flags & CHFL_CHANOP)
-        {
-          strcat(buf, "@");
-          idx++;
-        }
-        if (lp->flags & CHFL_VOICE)
-        { 
-          strcat(buf, "+");
-          idx++;
-        }
+	if (lp->flags & CHFL_CHANOP)
+	{
+	  strcat(buf, "@");
+	  idx++;
+	}
+	if (lp->flags & CHFL_VOICE)
+	{
+	  strcat(buf, "+");
+	  idx++;
+	}
       }
 
       strcat(buf, c2ptr->name);

Index: dbuf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/dbuf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dbuf.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ dbuf.c	12 Sep 2002 19:19:00 -0000	1.2
@@ -316,10 +316,11 @@
 	else
 	{
 	  p = RunMalloc(sizeof(struct p_mburst));
-	  if (!p) {
+	  if (!p)
+	  {
 	    outofmemory();
-            assert(0);
-          }
+	    assert(0);
+	  }
 	}
 	p->next = p_microburst;
 	p->cptr = cptr;

Index: m_config.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/m_config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- m_config.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ m_config.c	12 Sep 2002 19:19:00 -0000	1.2
@@ -159,8 +159,8 @@
 	}
 	break;
 #endif
-      case FIN :
-        assert(0); /* No deberia darse nunca */
+      case FIN:
+	assert(0);		/* No deberia darse nunca */
     }
   }
   else
@@ -172,8 +172,8 @@
 	cptr->negociacion |= ZLIB_ESNET_OUT_SPECULATIVE;
 	break;
 #endif
-      case FIN :
-        assert(0); /* No deberia darse nunca */
+      case FIN:
+	assert(0);		/* No deberia darse nunca */
     }
   }
   return 0;

Index: m_watch.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/m_watch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- m_watch.c	12 Sep 2002 16:38:57 -0000	1.2
+++ m_watch.c	12 Sep 2002 19:19:00 -0000	1.3
@@ -86,7 +86,8 @@
  *
  * Avisa a los usuarios la entrada/salida de un nick.
  */
-void chequea_estado_watch(aClient *cptr, int raw,char *ip_override,char *ip_override_SeeHidden)
+void chequea_estado_watch(aClient *cptr, int raw, char *ip_override,
+    char *ip_override_SeeHidden)
 {
   Reg1 aWatch *wptr;
   Reg2 Link *lp;
@@ -98,30 +99,35 @@
 ** Ocurre cuando el usuario no completa
 ** correctamente su entrada en el IRC
 */
-  if(!IsUser(cptr)) return;
+  if (!IsUser(cptr))
+    return;
 
-  assert((!ip_override && !ip_override_SeeHidden) || (ip_override && ip_override_SeeHidden));
+  assert((!ip_override && !ip_override_SeeHidden) || (ip_override
+      && ip_override_SeeHidden));
 
   wptr = FindWatch(cptr->name);
 
   if (!wptr)
-    return;                     /* No esta en ningun notify */
+    return;			/* No esta en ningun notify */
 
 #ifdef BDD_VIP
-  if(!ip_override) {
-    if (cptr->user->virtualhost[0] == '\0') {
-      make_virtualhost(cptr, 0,0);
+  if (!ip_override)
+  {
+    if (cptr->user->virtualhost[0] == '\0')
+    {
+      make_virtualhost(cptr, 0, 0);
     }
 
-    if(!IsHidden(cptr)) { /* Optimizacion para simplificar codigo mas abajo */
-      ip_override=ip_override_SeeHidden=cptr->user->host;
+    if (!IsHidden(cptr))
+    {				/* Optimizacion para simplificar codigo mas abajo */
+      ip_override = ip_override_SeeHidden = cptr->user->host;
     }
   }
 #endif
 
   wptr->lasttime = TStime();
 
-  username=cptr->user->username;
+  username = cptr->user->username;
 
   /*
    * Mandamos el aviso a todos los usuarios
@@ -129,26 +135,32 @@
    */
   for (lp = wptr->watch; lp; lp = lp->next)
   {
-    acptr=lp->value.cptr;
-    if(ip_override) {
-      ip=ip_override;
+    acptr = lp->value.cptr;
+    if (ip_override)
+    {
+      ip = ip_override;
 #if defined(BDD_VIP)
-      if (IsHiddenViewer(acptr) || (cptr == acptr)) {
-        ip=ip_override_SeeHidden;
+      if (IsHiddenViewer(acptr) || (cptr == acptr))
+      {
+	ip = ip_override_SeeHidden;
       }
 #endif
-    } else {
+    }
+    else
+    {
 #if defined(BDD_VIP)
-      ip=cptr->user->virtualhost;
-      if (IsHiddenViewer(acptr) || (cptr == acptr)) {
-        ip=cptr->user->host;
+      ip = cptr->user->virtualhost;
+      if (IsHiddenViewer(acptr) || (cptr == acptr))
+      {
+	ip = cptr->user->host;
       }
 #else
-      ip=cptr->user->host;
+      ip = cptr->user->host;
 #endif
     }
 
-    sendto_one(lp->value.cptr, watch_str(raw), me.name,lp->value.cptr->name, cptr->name,username,ip, wptr->lasttime);
+    sendto_one(lp->value.cptr, watch_str(raw), me.name, lp->value.cptr->name,
+	cptr->name, username, ip, wptr->lasttime);
   }
 }
 

Index: opercmds.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/opercmds.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- opercmds.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ opercmds.c	12 Sep 2002 19:19:00 -0000	1.2
@@ -776,7 +776,8 @@
 	  if (db_num_serie(i))
 	  {
 	    sendto_one(sptr, ":%s %d %s %c Tabla '%c' :S=%lu NoResidente",
-		me.name, RPL_STATSDEBUG, parv[0], stat, i, (unsigned long)db_num_serie(i));
+		me.name, RPL_STATSDEBUG, parv[0], stat, i,
+		(unsigned long)db_num_serie(i));
 	  }
 	}
       }

Index: s_auth.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_auth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_auth.c	12 Sep 2002 19:02:14 -0000	1.3
+++ s_auth.c	12 Sep 2002 19:19:00 -0000	1.4
@@ -84,9 +84,9 @@
 #endif /* PROXY_PROTECTION */
     SetAccess(cptr);
 
-  cptr->flags&=~FLAGS_DOID;
+  cptr->flags &= ~FLAGS_DOID;
   return;
-  
+
 #endif
 
 

Index: s_bdd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_bdd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_bdd.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ s_bdd.c	12 Sep 2002 19:19:00 -0000	1.2
@@ -155,9 +155,9 @@
   while (*p)
   {
     v[0] = ntohl(*p);
-    p++; /* No se puede hacer a la vez porque la linea anterior puede ser una expansion de macros */
+    p++;			/* No se puede hacer a la vez porque la linea anterior puede ser una expansion de macros */
     v[1] = ntohl(*p);
-    p++; /* No se puede hacer a la vez porque la linea anterior puede ser una expansion de macros */
+    p++;			/* No se puede hacer a la vez porque la linea anterior puede ser una expansion de macros */
     tea(v, k, x);
   }
   tabla_hash_hi[que_bdd] = x[0];
@@ -879,7 +879,7 @@
  */
 static void borrar_db(unsigned char que_bdd)
 {
-  int i,n;
+  int i, n;
   struct db_reg *reg, *reg2;
 
   tabla_serie[que_bdd] = 0;
@@ -887,20 +887,24 @@
   tabla_hash_hi[que_bdd] = 0;
   tabla_hash_lo[que_bdd] = 0;
 
-  n=tabla_residente_y_len[que_bdd];
-  if(!n) return;
+  n = tabla_residente_y_len[que_bdd];
+  if (!n)
+    return;
 
-  if(tabla_datos[que_bdd]) {
+  if (tabla_datos[que_bdd])
+  {
     for (i = 0; i < n; i++)
     {
       for (reg = tabla_datos[que_bdd][i]; reg != NULL; reg = reg2)
       {
-        reg2 = reg->next;
-        RunFree(reg);
+	reg2 = reg->next;
+	RunFree(reg);
       }
     }
-  } else { /* NO tenemos memoria para esa tabla, asi que la pedimos */
-    tabla_datos[que_bdd]=RunMalloc(n*sizeof(struct db_reg *));
+  }
+  else
+  {				/* NO tenemos memoria para esa tabla, asi que la pedimos */
+    tabla_datos[que_bdd] = RunMalloc(n * sizeof(struct db_reg *));
     assert(tabla_datos[que_bdd]);
   }
 
@@ -910,7 +914,8 @@
   }
 }
 
-static void corta_si_multiples_hubs(aClient *cptr, unsigned char que_bdd, char *mensaje)
+static void corta_si_multiples_hubs(aClient *cptr, unsigned char que_bdd,
+    char *mensaje)
 {
   char buf[1024];
   Dlink *lp;
@@ -1116,7 +1121,7 @@
 ** Parche DB70
 */
 
-  if(tabla_residente_y_len[que_bdd]) 
+  if (tabla_residente_y_len[que_bdd])
     db_eliminar_registro(que_bdd, "*");
 }
 
@@ -1219,7 +1224,7 @@
   int es_hub = 0;
   char *p, *p2, *p3, *p4;
   unsigned char que_bdd = ESNET_NICKDB;
-  unsigned int mascara_bdd=0;
+  unsigned int mascara_bdd = 0;
   int cont;
   struct tabla_en_memoria mapeo;
   if (!IsServer(sptr) || parc < 5)

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_bsd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_bsd.c	12 Sep 2002 19:02:14 -0000	1.3
+++ s_bsd.c	12 Sep 2002 19:19:00 -0000	1.4
@@ -677,7 +677,7 @@
 {
   char buf[HOSTLEN + 1 + 1024];
   char host_buf[HOSTLEN + 1];
-  int num_clones=-1;
+  int num_clones = -1;
   int iline = 0;
   struct db_reg *reg;
   static char sockname[HOSTLEN + 1];

Index: s_misc.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_misc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_misc.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ s_misc.c	12 Sep 2002 19:19:00 -0000	1.2
@@ -580,7 +580,7 @@
      * Y ademas avisamos a sus contactos de su salida :)
      */
     borra_lista_watch(bcptr);
-    chequea_estado_watch(bcptr, RPL_LOGOFF,NULL,NULL);
+    chequea_estado_watch(bcptr, RPL_LOGOFF, NULL, NULL);
 
 #endif /* WATCH */
 

Index: s_user.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_user.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_user.c	12 Sep 2002 19:02:15 -0000	1.2
+++ s_user.c	12 Sep 2002 19:19:00 -0000	1.3
@@ -462,7 +462,7 @@
     aconf = sptr->confs->value.aconf;
 
 #ifndef HACER_IDENT
-    sptr->flags&=~FLAGS_DOID;
+    sptr->flags &= ~FLAGS_DOID;
 #endif
 
     clean_user_id(user->username,
@@ -728,7 +728,7 @@
   sprintf_irc(sendbuf, *tmpstr ?
       "%s NICK %s %d %d %s %s +%s %s %s%s :%s" :
       "%s NICK %s %d %d %s %s %s%s %s%s :%s",
-      NumServ(user->server), nick, sptr->hopcount + 1, (int) (sptr->lastnick),
+      NumServ(user->server), nick, sptr->hopcount + 1, (int)(sptr->lastnick),
       user->username, user->host, tmpstr,
       inttobase64(ip_base64, ntohl(sptr->ip.S_ADDR), 6),
       NumNick(sptr), sptr->info);
@@ -760,7 +760,7 @@
    * ha entrado en la red.
    * (Nuevo usuario local)
    */
-  chequea_estado_watch(sptr, RPL_LOGON,NULL,NULL);
+  chequea_estado_watch(sptr, RPL_LOGON, NULL, NULL);
 
 #endif /* WATCH */
 
@@ -872,9 +872,9 @@
   while (cont--)
   {
     v[0] = ntohl(*p);		/* 32 bits */
-    p++; /* No se puede hacer de una vez porque puede tratarse de una expansion de macros */
+    p++;			/* No se puede hacer de una vez porque puede tratarse de una expansion de macros */
     v[1] = ntohl(*p);		/* 32 bits */
-    p++; /* No se puede hacer de una vez porque puede tratarse de una expansion de macros */
+    p++;			/* No se puede hacer de una vez porque puede tratarse de una expansion de macros */
     tea(v, k, x);
   }
 
@@ -929,33 +929,38 @@
   time_t lastnick = (time_t) 0;
   int differ = 1;
 #if defined(WATCH)
-  char ip_override[HOSTLEN+10];
-  char ip_override_SeeHidden[HOSTLEN+10];
+  char ip_override[HOSTLEN + 10];
+  char ip_override_SeeHidden[HOSTLEN + 10];
 
-  if(IsUser(sptr) && (sptr->user->host)) {
+  if (IsUser(sptr) && (sptr->user->host))
+  {
 #if defined(BDD) && defined(BDD_VIP)
-    strcpy(ip_override_SeeHidden,sptr->user->host);
-    if(IsHidden(sptr)) {
-      if (sptr->user->virtualhost[0] == '\0') {
-        make_virtualhost(sptr, 0,1);
+    strcpy(ip_override_SeeHidden, sptr->user->host);
+    if (IsHidden(sptr))
+    {
+      if (sptr->user->virtualhost[0] == '\0')
+      {
+	make_virtualhost(sptr, 0, 1);
       }
-      strcpy(ip_override,sptr->user->virtualhost);
-    } else {
-      strcpy(ip_override,sptr->user->host);
+      strcpy(ip_override, sptr->user->virtualhost);
+    }
+    else
+    {
+      strcpy(ip_override, sptr->user->host);
     }
 #else
-    strcpy(ip_override,sptr->user->host);
+    strcpy(ip_override, sptr->user->host);
 #endif
   }
 
-  ClearWatch(sptr); /* Nos curamos en salud */
+  ClearWatch(sptr);		/* Nos curamos en salud */
 #endif
 
 /*
 ** No dejamos que un usuario cambie de nick varias veces ANTES
 ** de haber completado su entrada en la red.
 */
-  if(MyConnect(sptr) && (!IsRegistered(sptr)) && (sptr->cookie != 0) &&
+  if (MyConnect(sptr) && (!IsRegistered(sptr)) && (sptr->cookie != 0) &&
       (sptr->cookie != COOKIE_VERIFIED))
   {
     return 0;
@@ -1590,7 +1595,7 @@
      * ha entrado en la red.
      * (Nuevo usuario remoto)
      */
-    chequea_estado_watch(sptr, RPL_LOGON,NULL,NULL);
+    chequea_estado_watch(sptr, RPL_LOGON, NULL, NULL);
 
 #endif /* WATCH */
 
@@ -1697,7 +1702,8 @@
 	 * (Cambio de nick local y remoto)
 	 */
 	if (!nick_equivalentes)
-	  chequea_estado_watch(sptr, RPL_LOGOFF,ip_override,ip_override_SeeHidden);
+	  chequea_estado_watch(sptr, RPL_LOGOFF, ip_override,
+	      ip_override_SeeHidden);
 #endif /* WATCH */
 
 #if defined(BDD)
@@ -1887,7 +1893,7 @@
 #if defined(BDD_VIP)		/* Al cambiar de nick a otro se
 				 * regenera la ip virtual SIEMPRE */
       if (IsHidden(sptr))
-	make_virtualhost(sptr, 1,0);
+	make_virtualhost(sptr, 1, 0);
       else
 	sptr->user->virtualhost[0] = '\0';
 #endif /* defined(BDD_VIP) */
@@ -1901,21 +1907,28 @@
    * ha entrado (ha puesto el nick).
    * (Cambio de nick local y remoto).
    */
-  if (IsUser(sptr) && !nick_equivalentes) {
+  if (IsUser(sptr) && !nick_equivalentes)
+  {
 #ifdef BDD
-    if (!MyUser(sptr)) {       /* Para nicks remotos, no enviamos el */
-                               /* WATCH para nicks en las tablas 'v' */
-                               /* o 'v' y lo marcamos para enviarlo  */
-                               /* despues desde m_umode              */
+    if (!MyUser(sptr))
+    {				/* Para nicks remotos, no enviamos el */
+      /* WATCH para nicks en las tablas 'v' */
+      /* o 'v' y lo marcamos para enviarlo  */
+      /* despues desde m_umode              */
       if (!db_buscar_registro(BDD_IPVIRTUALDB, sptr->name) &&
-        !db_buscar_registro(BDD_IPVIRTUAL2DB, sptr->name)) {
-          chequea_estado_watch(sptr, RPL_LOGON,NULL,NULL);
-      } else {
-        SetWatch(sptr); 
+	  !db_buscar_registro(BDD_IPVIRTUAL2DB, sptr->name))
+      {
+	chequea_estado_watch(sptr, RPL_LOGON, NULL, NULL);
       }
-    } else {
+      else
+      {
+	SetWatch(sptr);
+      }
+    }
+    else
+    {
 #endif /* BDD */
-      chequea_estado_watch(sptr, RPL_LOGON,NULL,NULL);
+      chequea_estado_watch(sptr, RPL_LOGON, NULL, NULL);
     }
   }
 #endif /* WATCH */
@@ -3675,7 +3688,7 @@
 #if defined(BDD) && defined(WATCH)
   if (IsWatch(sptr))
   {
-    chequea_estado_watch(sptr, RPL_LOGON,NULL,NULL);
+    chequea_estado_watch(sptr, RPL_LOGON, NULL, NULL);
     ClearWatch(sptr);
   }
 #endif
@@ -4131,7 +4144,7 @@
     return "<Que_Pasa?>";	/* esto no deberia salir nunca */
 
   if (sptr->user->virtualhost[0] == '\0')
-    make_virtualhost(sptr, 0,0);
+    make_virtualhost(sptr, 0, 0);
   return sptr->user->virtualhost;
 }
 
@@ -4154,7 +4167,7 @@
   else
   {
     if (sptr->user->virtualhost[0] == '\0')
-      make_virtualhost(sptr, 0,0);
+      make_virtualhost(sptr, 0, 0);
     return sptr->user->virtualhost;
   }
 }
@@ -4165,7 +4178,7 @@
  * crea la ip virtual
  *
  */
-void make_virtualhost(aClient *acptr, int mostrar,int simular_registrado)
+void make_virtualhost(aClient *acptr, int mostrar, int simular_registrado)
 {
   struct db_reg *reg;
   unsigned int v[2], k[2], x[2];
@@ -4535,7 +4548,7 @@
      * Avisamos a sus contactos que el nick
      * ha salido (ha cambiado de nick).
      */
-    chequea_estado_watch(acptr, RPL_LOGOFF,NULL,NULL);
+    chequea_estado_watch(acptr, RPL_LOGOFF, NULL, NULL);
 
 #endif /* WATCH */
   }
@@ -4550,7 +4563,7 @@
    * Avisamos a sus contactos que el nick
    * ha entrado (ha cambiado de nick).
    */
-  chequea_estado_watch(acptr, RPL_LOGON,NULL,NULL);
+  chequea_estado_watch(acptr, RPL_LOGON, NULL, NULL);
 
 #endif /* WATCH */
 

Index: whocmds.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/whocmds.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- whocmds.c	12 Sep 2002 19:02:15 -0000	1.2
+++ whocmds.c	12 Sep 2002 19:19:00 -0000	1.3
@@ -283,13 +283,16 @@
       *(p1++) = '*';
     }
 
-    if (chptr && is_zombie(acptr, chptr)) {
-      *(p1++)='!';
-    } else {
+    if (chptr && is_zombie(acptr, chptr))
+    {
+      *(p1++) = '!';
+    }
+    else
+    {
       if (chptr && is_chan_op(acptr, chptr))
-        *(p1++) = '@';
+	*(p1++) = '@';
       if (chptr && has_voice(acptr, chptr))
-        *(p1++) = '+';
+	*(p1++) = '+';
     }
 
     if (IsDeaf(acptr))
@@ -889,14 +892,17 @@
 	      }
 	      if (IsDeaf(acptr))
 		*(buf + len++) = '-';
-              if(is_zombie(acptr, chptr)) {
-                *(buf + len++) = '!';
-              } else {
-	        if (is_chan_op(acptr, chptr))
-	    	  *(buf + len++) = '@';
-	        if (has_voice(acptr, chptr))
+	      if (is_zombie(acptr, chptr))
+	      {
+		*(buf + len++) = '!';
+	      }
+	      else
+	      {
+		if (is_chan_op(acptr, chptr))
+		  *(buf + len++) = '@';
+		if (has_voice(acptr, chptr))
 		  *(buf + len++) = '+';
-              }
+	      }
 	      if (len)
 		*(buf + len) = '\0';
 	      strcpy(buf + len, chptr->chname);

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include channel.h,1.1.1.1,1.2 inet.h,1.2,1.3 m_watch.h,1.1.1.1,1.2 numeric.h,1.1.1.1,1.2 s_bsd.h,1.3,1.4 s_user.h,1.1.1.1,1.2

From: Zolty <zo...@us...> - 2002-09-12 19:19:02

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv28444/include

Modified Files:
	channel.h inet.h m_watch.h numeric.h s_bsd.h s_user.h 
Log Message:
Make indent y Make depend

A partir de ahora, antes de cada commit hacer el make indent SIEMPRE.


Index: channel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/channel.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- channel.h	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ channel.h	12 Sep 2002 19:18:59 -0000	1.2
@@ -35,7 +35,7 @@
 #define CHANNELLEN	64
 
 #define MAXBANS		75
-#define MAXBANLENGTH	2560 /* Este valor debe ajustarse si se cambia el anterior */
+#define MAXBANLENGTH	2560	/* Este valor debe ajustarse si se cambia el anterior */
 
 #define KICKLEN                160
 

Index: inet.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/inet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inet.h	12 Sep 2002 19:02:14 -0000	1.2
+++ inet.h	12 Sep 2002 19:18:59 -0000	1.3
@@ -30,7 +30,7 @@
 #define		SOCKADDR_IN	sockaddr_in
 #define		SOCKADDR	sockaddr
 #define		SIN_FAMILY	sin_family
-#define		SIN_PORT	sin_port   
+#define		SIN_PORT	sin_port
 #define		SIN_ADDR	sin_addr
 #define		S_ADDR		s_addr
 #define		IN_ADDR		in_addr

Index: m_watch.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/m_watch.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- m_watch.h	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ m_watch.h	12 Sep 2002 19:18:59 -0000	1.2
@@ -22,7 +22,8 @@
 
 #ifdef WATCH
 extern int m_watch(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-extern void chequea_estado_watch(aClient *cptr, int raw,char *ip_override,char *ip_override_SeeHidden);
+extern void chequea_estado_watch(aClient *cptr, int raw, char *ip_override,
+    char *ip_override_SeeHidden);
 extern int borra_lista_watch(aClient *cptr);
 #endif /* WATCH */
 

Index: numeric.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/numeric.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- numeric.h	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ numeric.h	12 Sep 2002 19:18:59 -0000	1.2
@@ -77,7 +77,7 @@
 
 /*      ERR_LENGTHTRUNCATED  419          Aircd */
 
-#define ERR_INVALIDBANMASK   420       /* Hispano extension */
+#define ERR_INVALIDBANMASK   420	/* Hispano extension */
 #define ERR_UNKNOWNCOMMAND   421
 #define ERR_NOMOTD	     422
 #define ERR_NOADMININFO	     423

Index: s_bsd.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/s_bsd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- s_bsd.h	12 Sep 2002 19:02:14 -0000	1.3
+++ s_bsd.h	12 Sep 2002 19:18:59 -0000	1.4
@@ -204,7 +204,7 @@
 #define HMODE_HIDDENVIEWER   0x00000080	/* Ip Oculta */
 #define HMODE_NICKSUSPENDED  0x00000100	/* Nick Suspendido */
 #define HMODE_MSGONLYREG     0x00000200	/* Solo recibir mensajes de usuarios con +r */
-#define HMODE_ISWATCH        0x00000800 /* Se enviara WATCH para este nick */
+#define HMODE_ISWATCH        0x00000800	/* Se enviara WATCH para este nick */
 
 /* Modos hispano  a propagar */
 #define SEND_HMODES \

Index: s_user.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/s_user.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_user.h	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ s_user.h	12 Sep 2002 19:18:59 -0000	1.2
@@ -76,7 +76,7 @@
 extern int m_ghost(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 #ifdef BDD_VIP
 extern char *get_virtualhost(aClient *sptr);
-void make_virtualhost(aClient *acptr, int mostrar,int simular_registrado);
+void make_virtualhost(aClient *acptr, int mostrar, int simular_registrado);
 extern char *get_visiblehost(aClient *sptr, aClient *acptr);
 #endif
 #endif

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.2,1.3 Ipv6.zoltan,1.6,1.7

From: Zolty <zo...@us...> - 2002-09-12 19:10:33

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv25417

Modified Files:
	CAMBIOS.Ipv6 Ipv6.zoltan 
Log Message:
INET6.3

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CAMBIOS.Ipv6	12 Sep 2002 19:02:13 -0000	1.2
+++ CAMBIOS.Ipv6	12 Sep 2002 19:10:26 -0000	1.3
@@ -1,3 +1,7 @@
+* 2002/09/12 zo...@ir...          INET6.3
+-----------------------------------------------------------------------
+Se adjunta el ircd.conf de IPv6.
+
 * 2002/09/12 zo...@ir...          INET6.2
 ----------------------------------------------------------------------- 
 Creamos en inet.h macros de la familia de protocolos IP (solo IPv4) y

Index: Ipv6.zoltan
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Ipv6.zoltan,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Ipv6.zoltan	12 Sep 2002 19:02:13 -0000	1.6
+++ Ipv6.zoltan	12 Sep 2002 19:10:26 -0000	1.7
@@ -57,7 +57,7 @@
 11º Idem con las ips virtuales, que en vez de 6 + 6 de entropia, han de ser 22 + ¿6?
     de entropia. Para toda la red si hay al menos 1 ircd con IPv6 activado.
 
-12º Crear un ejemplo-ipv6.conf.
+12º Crear un ejemplo-ipv6.conf. (HECHO)
 
 13º Poner la pregunta en el make config.

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd Makefile.in,1.1.1.1,1.2

From: Zolty <zo...@us...> - 2002-09-12 19:10:33

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv25417/ircd

Modified Files:
	Makefile.in 
Log Message:
INET6.3

Index: Makefile.in
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.in	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ Makefile.in	12 Sep 2002 19:10:27 -0000	1.2
@@ -122,6 +122,7 @@
 	@${RM} /tmp/ircd.tag
 	${INSTALL} -s -m 700 -o ${IRCDOWN} -g ${IRCDGRP} chkconf ${BINDIR}
 	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ../doc/ejemplo.conf ${DPATH}
+	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ../doc/ejemplo-ipv6.conf ${DPATH}
 	( cd ${DPATH}; \
 	  ${TOUCH} ${MPATH}; \
 	  ${TOUCH} ${RPATH}; \

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/doc ejemplo-ipv6.conf,NONE,1.1

From: Zolty <zo...@us...> - 2002-09-12 19:10:32

Update of /cvsroot/irc-dev/ipv6/doc
In directory usw-pr-cvs1:/tmp/cvs-serv25417/doc

Added Files:
	ejemplo-ipv6.conf 
Log Message:
INET6.3

--- NEW FILE: ejemplo-ipv6.conf ---
# $Id: ejemplo-ipv6.conf,v 1.1 2002/09/12 19:10:26 zolty Exp $

# ircd.conf Fichero de configuracion para el IRCd de IRC-Hispano
#
# Escrito por Niels <ni...@un...>, basado en el fichero example.conf
# original, en el codigo del servidor, y la experiencia de la vida real :)
#
# Agradecimientos y creditos para: Run, Trillian, Cym, Morrissey, Chaos,
#                                  Xorath, WildThang, Mmmm, SeKs, Ghostwolf
#                                  y todo el resto de Administradores e
#                                  IRCops de Undernet, y los programadores
#                                  del IRCd de Undernet.
#
# Traduccion y adaptacion por Ruben Cardenal <ni...@ir...>
#
# Adaptado a IPv6 por Toni Garcia <zo...@ir...>

# En este fichero se hara una descripcion de las caracteristicas mas
# usuales de configuracion del IRCD de IRC-Hispano y, como tal, la
# configuracion mostrada en este documento podria ser la de un servidor
# de clientes cualquiera de la red.
#
# Las diferentes partes de configuracion se distinguen porque comienzan
# siempre por una letra, y las opciones de cada parte, van separadas
# por dos puntos.
#
# Hay que hacer algunas puntualizaciones previamente. Una de ellas, es la
# diferencia entre "hostname" y "nombre del servidor". Un nodo puede tener
# de FQDN (Full Qualified Domain Name), por ejemplo esto:
# s1-iRC.mesena.mad.es.intelideas.com, y el ircd que corre en esa maquina
# tiene como nombre de servidor "centauri.irc-hispano.org". El nombre del
# servidor es algo meramente descriptivo.

# Empezaremos con la informacion del propio servidor
# M%<nombre servidor>%<ip virtual>%<descripcion>%<puerto>%<numeric>
#
# El <nombre servidor> ya lo hemos visto antes: Un nombre descriptivo
# en la red para nuestro servidor.
# El campo <ip virtual> no se suele usar, por lo que con dejarlo vacio
# o poner un "*" servira. Y en IPv6, tambien vale poner "::" para que
# escuche todas las interfaces. Esta pensado por si en el make config
# se ha seleccionado "virtual hosting", la direccion especificada en
# ese campo sera la usada por el servidor.
#
# El <puerto> es el puerto que quedara a la escucha para que otros
# servidores se conecten al tuyo.
# En cuanto al <numeric>, si el servidor esta en red con otros, no
# debe haber otros con el mismo, y su valor no se puede actualizar 
# con un REHASH.

# M%devel.irc-hispano.org%%Servidor de Desarrollo%4400%1
M%devel.irc-hispano.org%%Servidor de Desarrollo%4400%1 

#
# Podemos ver la informacion administrativa de un servidor con el
# comando ADMIN. Por convenio, se suele poner siempre al menos una
# direccion de e-mail para contactar con el administrador.
# A%<linea 1>%<linea 2>%<linea 3>

A%Servidor de Desarrollo%IRC-Hispano Devel Team%Contacto <de...@ir...>

#
# Todas las conexiones de un servidor estan asociadas con una cierta "clase
# de conexion", sean entrantes o salientes (iniciadas por el servidor), ya
# sean de clientes o servidores.
#
# Estas lineas Y se dan a modo de ejemplo pues, en la practica, se pueden
# usar los numeros de clase que a uno le de la gana :)
# Y%<clase>%<freq ping>%<freq conex>%<max links>%<tamaño sendq>

# Clases de servidores: 90 = todos los enlaces a los que no conectaras;
# igual en las clases 80 y/o 70.
# 50 = servidor de clientes (leaf). Solo usado si tu servidor es un hub.

Y%90:90%300%1%1700000
Y%80:90%300%1%1700000
Y%70:90%300%1%1700000
Y%50%90%300%10%1700000

# Clases de clientes. 10 = locales; 2 = todos los .net y .com que no 
# esten en Europa; 1 = todos los demas.

Y%10%90%0%100%160000
Y%2%90%0%5%80000
Y%1%90%0%400%160000

# Esos numeros de clase, son "historicos", y como dijimos antes, se pueden
# usar otros sin problema.

#
# Para permitir conectar a los clientes, necesitan autorizacion. Esta
# se puede otorgar basandose en una mascara de hosts, una mascara de
# direcciones, y especificando una clave opcional.
#
# Con un uso inteligente de las clases y el campo de <max links> de
# las lineas Y% se puede permitir entrar a un dominio especifico, pero
# rechazar el resto de dominios del mismo nivel, como si fuera creando
# una especie de linea K% "inversa".
# I%<Mascara IP o indicacion de forzar a resolver>%<password opcional>%<hostmask>%%<clase>

# Para cada cliente que conecta, su IP es conocida, y se hace una
# consulta de dns inverso a dicha IP para obtener el/los(todos) hostname(s).
# Cada hostname que pertenece a esa IP se compara con <hostmask>, y
# la linea I% se usa cuando cualquiera de ellos encaja; el cliente
# entonces se mostrara con ese hostname en concreto. Si ninguno de
# los hostnames encajan, entonces la IP se compara contra el campo
# <Mascara IP...>, y si esta concuerda, la linea I% se usa a pesar
# de todo y el cliente mostrara el primer (principal) host si existe.
# Si la IP no resuelve, el cliente mostrara la notacion decimal de la IP.
# Hay un caso especial para los sockets de los dominios UNIX y las
# conexiones a traves del host local (localhost); en este caso, el 
# campo <Mascara IP...> se compara con el nombre del servidor (de
# tal suerte que no se hace contra ninguna representacion de una IP).
# El nombre del servidor es el devuelto en la respuesta del numeric
# 002, por ejemplo:
# 002 Your host is 2.undernet.org[jolan.ppro], running version ...
# Entonces, lo que se usa para comparar es "jolan.ppro".
# Por lo tanto, los sockets de dominio unix, y las conexiones al
# localhost, tendrian que satisfacer esta linea I%
# I%jolan.ppro%%foobar%%1
# Por ultimo, las lineas I% con los campos <Mascara IP....> o 
# <hostmask> vacios, son ignoradas.

# Esta es la configuracion basica que deja entrar a cualquier IP al
# servidor.
# Al usar dos lineas diferentes, multiples conexiones desde la misma
# IP solo son posibles desde hosts que tengan mapeos DNS directos
# e inversos validos.

I%*@*%2%Unresolved%%1
I%Resolved%%*@*%%1

# Si no deseas en el servidor usuarios sin DNS inverso, simplemente
# usa esta linea:
# I%NotMatchingCrap%%*@*%%1

# Aqui, se dejaria entrar solo a usuarios de telefonica:
I%Resolved%%*@*.ttd.es%%2
I%Resolved%%*@*.telefonica-data.net%%2
I%Resolved%%*@*.rima-tde.net%%2

# Otro ejemplo
# Ahora se listan los dominios .com/.net que se desean permitir...
# Esto, es menos trabajoso que hacerlo de la otra manera: poniendo
# lineas K: para cada ISP de los USA.

I%Resolved%%*@*.wirehub.net%%1
I%Resolved%%*@*.planete.net%%1
I%Resolved%%*@*.ivg.com%%1
I%Resolved%%*@*.ib.com%%1
I%Resolved%%*@*.ibm.net%%1
I%Resolved%%*@*.hydro.com%%1
I%Resolved%%*@*.NL.net%%1

# Nosotros mismos. Esto nos asegura poder entrar, independientemente
# de lo lleno que este el servidor
I%*@2001:3df8:2:*%%*@*.ttd.es%%10

# Se puede poner un numero (0..9) en el campo del password, lo que
# hara que el ircd solo acepte un cliente cuando el numero total de
# conexiones a la red desde la misma IP no exceda de ese numero.
# El siguiente ejemplo aceptaria al menos una conexion por IP desde
# "*.ttd.es" y al menos dos conexiones desde cuentas de acceso
# a internet por modem que tengan "*.dial??.*" como hostmask:
# I%Resolved%1%*@*.ttd.es%%1
# I%Resolved%2%*@*.dial??.*%%1

# Hay que tener en cuenta que cuando el ircd lee las lineas de configuracion
# lo hace en orden inverso a como estan listadas aqui. Por tanto, en
# las lineas I% se deben poner primero las mas generales, y poner al
# final las mas especificas.

#
# Es posible mostrar un MOTD (Message of the Day), a un cliente que
# conecta dependiendo de su origen.
# T%<hostmask>%<path al fichero del motd>
# T%*.ttd.es%/usr/ircd/motd.ttd.migracion.txt

#
# Una de las caracteristicas mas atractivas del IRCd es "Uworld", un
# programa conectado a la red como servidor. Esto le permite realizar
# cualquier cambio de modo, para de esta manera permitir, por ejemplo
# que los opers puedan desbloquear un canal que ha sufrido un take-over.
# Solo hay un pequeño problema: el protocolo del TimeStamp (TS) hace
# que eso no sea posible. Por esto, hay una opcion de configuracion
# para permitir esos cambios desde cierto servidor.
#
# Nota: (1) Estas lineas son puestas por cada administrador de un
# servidor en IRC-Hispano; (2) Las lineas deben de ser exactamente
# las mismas en cada servidor, o los resultados seran impredecibles;
#
# Desde el ircu2.10.05 es posible jupear nicks. Estos nicks han de ser
# añadidos a las lineas U%
# Por convenio, se añaden estos nicks a las U% y no se debe hacerlo
# con otros. Para esto, el IRCD de IRC-Hispano cuenta con la posibilidad
# de impedir el uso de nicks usando la BDD. Habras de compilar el IRCD
# con soporte BDD (por defecto, se hace asi) para poder hacer uso de esa
# caracteristica.

# U%<nombre servidor>%<nick1>,...,<nickN>%*
# U%deep.space%NiCK,CHAN,Memo,oper,COM1,COM2,COM3,COM4,LPT1,LPT2,AUX%*

#
# Cuando se tiene un servidor corriendo, normalmente hay personas o
# rangos de usuarios a los que no se quiere permitir acceso al servidor.
#
# Con este proposito, el ircd tiene "kill lines" (lineas K%).
# K%<host/mascara IP>%"<razon opcional>"%<mascara username>
#
# Es posible, asimismo, usar un fichero como el comentario para el ban.
# Se entiende por ban el hecho de no poder entrar al servidor, es analogo
# a la terminologia "ban de un canal".
# K%<host/mascara IP>%!<path al fichero>%<mascara username>
#
# El motivo por defecto es "You are banned from this server"
# Notese que las lineas K% son locales al servidor; si se banea a una
# persona o a un dominio entero de un servidor, aun pueden entrar al
# IRC por otro servidor que no les haya puesto (aun?) una linea K%

# Ejemplos...

# Con un simple comentario, usando comillas:
# K%*.ono.com%Por favor, use el servidor de su ISP%*
# K%*.arrakis.es%Por favor, use el servidor de su ISP%*

# Con un fichero, anteponiendo un "!" antes del nombre del fichero.
# El fichero puede contener, por ejemplo, una razon, un enlace a las
# normas del servidor y una direccion de contacto.
# K%*.jp%!kline/openproxy.txt%*luser

#
# Las "kill lines" basadas en IP, se designan con una "k" minuscula.
# El uso es el mismo que el de las K% con la diferencia de que se
# aplican a todos los host, incluso si una IP tiene un dns inverso
# correcto.
# k%192.168.*%!klines/intranet.txt%*


#
# Si deseas dar acceso a gente que tiene una kline, puedes utilizar
# las lineas E% ("Exception lines") que son excepciones a las prohibiciones
# de acceso de las lineas K%. Los campos son AND, han de cumplirse todas las
# condiciones para que el usuario pueda saltarse la k-line.
# E%<Mascara IP/host>%<clave opcional>%<mascara username>%<puerto opcional>
#
# La mascara ip/host y la mascara username son campos obligatorios, e indica
# las mascaras que han de tener los usuarios con kline que queremos que entren
# a la red.
#
# E%*.arrakis.es%%root%
# E%user243.dialup.ono.com%%*%

# La clave, de existir, es la que los usuarios tendran que especificar como clave
# del servidor para poder saltarse la k-line.
#
# E%*.ono.com%plisplas%*%

# El puerto, de existir, es el puerto por el que tendran que conectar los usuarios 
# para poder saltarse la k-line. Tiene que existir el puerto que especificas (P-lines).
#
# E%192.168.0.15%%*%6669
# E%2001:3f8e:1::23:a1%%*%6669


#
# Una forma mas flexible de restringir el acceso a tu servidor es
# usando las "lineas de restriccion". Estas le dicen al servidor
# que lanze un programa (externo), y dependiendo de su resultado, se
# deja entrar o no al cliente que intenta conectar. El programa debe
# devolver "Y" o "N <razon>" en stdout. El uso de las lineas R% se
# desaconseja y es casi inexistente. Necesita un define en tiempo de
# compilacion, consume CPU, y es probable que se elimine en futuras
# versiones del ircd.
# R%<host/mascara IP>%<nombre programa>%<mascara username>

#
# Es probable que quieras que tu servidor se conecte a otros servidores
# de forma que tus usuarios tengan otros usuarios con quien chatear.
# Los servidores de IRC se conectan unos a otros formando una red con
# topologia de estrella o arbol. No se permiten los bucles.
#
# En una red, se distinguen dos clases de servidores: "hub" y "leaf".
# Los lead se conectan a los hub, y los hub se conectan entre ellos.
# Claro esta, muchos servidores no se pueden clasificar directamente
# en una de esas categorias. Existe un sistema predefinido de decision
# para los enlaces de los servidores de ircd para decidir que enlaces
# permitir, cuales se dejan establecer a mano, y cuales denegar (a
# la fuerza).
#
# Las clases de conexion (lineas Y%) y las lineas de conexionx (tambien
# conocidas como lineas C/N) definen a que servidores se puede conectar
# un servidor (C), y que servidores pueden conectar a este (N). Notese que se
# definen por parejas; no funcionan si una esta presente y falta la otra.
#
# C%<host remoto o IP>%<clave>%<nombre servidor remoto>%<puerto>%<clase>
# N%<host remoto o IP>%<clave>%<nombre servidor remoto>%<hostmask>%<class>
#
# Si se desea usar ident, se ha de poner "username@" al nombre del host
# o la direccion IP (el primer campo).
# Si no se especifica el <puerto>, el servidor no intentara establecer
# automaticamente una conexion con ese servidor (sin autoconexion) en
# el intervalo especificado en su clase Y correspondiente.
#
# El campo (opcional) de <hostmask> le indica al servidor que se identifique
# a si mismo con una mascara de host separada por puntos, en la que se
# quita el nombre del servidor y se reemplaza con "*.".
# Por ejemplo, si hostmask == 2 y el nombre del servidor local es
# "irc.sub.domain.com", se enviaria como "*.domain.com". Esto permite
# que sea mas facil el rutado y enlace de nuevos servidores.

# Un ejemplo:
C%1.2.3.4%clave%test.devel.irc-hispano.org%4400%90
N%1.2.3.4%clave%test.devel.irc-hispano.org%%90

# Si tu servidor arranca en una red mas grande, es probable que se te
# asignen uno o dos servidores a los que tu servidor se debe conectar.
# Si estos servidores a su vez se conectan a otros servidores que el
# tuyo (lo que es probable), necesitas definir el servidor al que te
# conectas con permiso para hacer de hub
# H%<mascara permitida>%%<nombre servidor>
H%*.*%%test.devel.irc-hispano.org

#
# Por supuesto, tambien existe el caso contrario: obligar a un servidor
# a ser un leaf. Las lineas L siguen la ley de Murphy: si las usas, hay
# grandes probabilidades de que el enrutado falle.
# L%<mascara no permitida opcional>%%<mascara server>%<max alcance opcional>
# Por tanto, no se deben usar.

#
# Para un sistema de decision de enrutado avanzado y en tiempo real se
# pueden usar las lineas D% (del ingles Disallow, "no permitir"). Para
# mas informacion, consultar el fichero doc/readme.crules.
# D%<mascara server a la que el ircd rehusara conectar>%%<regla> 
# d%<mascara server a la que el ircd no autoconecctara>::<regla>
D%*.america.irc-hispano.org%%connected(*.america.irc-hispano.org)
d%*.asia.irc-hispano.org%%connected(taipei.asia.*)

# Para los servidores leaf, se recomienda esta linea d:
# d%*%%directcon(*)

#
# Y llegamos a la parte de los "IRC Operatos" (IRCops). El estatus de
# oper (no confudir con el de helper, dado por la base de datos distribuida
# y/o los bots de servicio) concede privilegios especiales a un usario, como
# la capacidad de poder desconectar el servidor de otro, conectarlo a otro
# y de expulsar (kill) a usuarios del IRC.
# Se podrian escribir paginas y paginas acerca de esto. Resumamos con que
# solo se debe conceder estatus de IRCop a usuarios de confianza, y que es
# el administrador del servidor el responsable de las acciones de estos.
#
# Hay dos clases de IRCops: "locales" y "globales". Los locales puede hacer
# squit, connetc y kill (pero solo localmente). Su flag +o no se propaga
# al resto de servidores de la red

# Dependiendo del make config, a los IRCops locales se les puede denegar
# o permitir el uso de REHASH, RESTART, DIE y GLINE (solo localmente).
# Los IRCops locales se denotan con una "o" minuscula.
# O%<host/mascara IP>%<clave encriptada>%<nick>%%<clase>
# o%<host/mascara IP>%<clave encriptada>%<nick>%%<clase>

O%*@*.ttd.es%VRKLDrQKn0jLs%nikolas%%10

# La clase de conexion es opcional, pero dejandolo vacio hace que las lineas
# O% se asocien con la clase 0, que normalmente solo acepta una conexion
# a la vez. Si se quiere que los usuarios que vayan a ser IRCops tengan
# mas de una conexion por linea O, usa una clase de conexion que permita
# mas de una conexion.
# Por ejemplo (usando la clase 10 como se muestra abajo):
# Y%10%90%0%100%160000
#
# En IRC-Hispano, con la presencia de la BDD y las ventajas que aporta, el
# uso de o-lines está en extincion.


# Usando las lineas de puerto (lineas P:) es posible especificar
# puertos (tanto AF_UNIX como AF_INET & AF_INET6) en los que el ircd 
escuchara
# conexiones.
# El puerto por convenio es el 6667, y se usan tambien, por convenio
# los puertos 6660-6669 para conexiones de clientes.
#
# Esto es solo un convenio, no hay politicas oficiales de la IANA
# ni del IEFT.
#
# Un apunte: el comando /UPING usa el puerto 7007/udp. Si tu servidor
# esta situado tras un firewall, deberas abrir ese puerto.
#

# La sintaxis es asi:
# P%<mascara del host o path>%%%<numero de puerto para el cliente>

P%%%%6667
P%%%%6668
P%*.es%%%6666
P%/tmp/.ircd%%%6667

# En el path, se especifica donde se creara el socket UNIX de escucha del
# servidor.


#
# Por ultimo, las lineas F, que es para configurar las propiedades de
# del negociado de los enlaces entre los servidores.
# F%<propiedades TX>%<propiedades RX>%<nombre servidor>
# Puedes conseguir mas informacion sobre la negociacion en la siguiente web
# http://www.argo.es/~jcea/irc/negociacion.htm
#
# Por defecto, no se necesita especificar una configuracion, ya que
# se activan automaticamente, pero siempre hay casos que una configuracion
# manual sera mejor que una automatica, por ejemplo, enlace entre 2 nodos
# por red local, que no necesitaran tener compresion ZLIB por el gran ancho
# de banda y asi disminuir el consumo de CPU.
#
# Las propiedades TX son las propiedades que nos llegan por REQ.
# Las propiedades RX son las propiedades que solicitamos por NACK.
# Las propiedades se definen con una letra, y si tiene la letra mayuscula la
# propiedad se activa y, en caso contrario, se desactiva.
#
# En estos momentos solo esta soportada la propiedad Z/z que corresponde a la
# compresion ZLIB en los enlaces.

# Ejemplos:
# Activar ZLIB en el enlace con america.irc-hispano.org
# F%Z%Z%america.irc-hispano.org

# Desactivar ZLIB en el enlace con black.hole
# F%z%z%black.hole



# Y aqui termina el fichero de ejemplo de configuracion del ircd
# Si tienes dudas, vista http://www.irc-dev.net, o entra en el canal
# #irc-dev de IRC-Hispano, y nos las planteas :-)

# Si tienes interes en linkar tu servidor a la red IRC-Hispano, vista
# http://www.irc-hispano.org/admin/admision.html, y en caso de alguna
# duda contacta con in...@ir... para mas informacion.

# Las actualizaciones de este ircd se pueden encontrar via CVS y por
# descarga directa en http://devel.irc-hispano.org

#
# Buena suerte con el resto!
#
#       -- IRC-Hispano Devel Team.

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include patchlevel.h,1.3,1.4

From: Zolty <zo...@us...> - 2002-09-12 19:10:32

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv25417/include

Modified Files:
	patchlevel.h 
Log Message:
INET6.3

Index: patchlevel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/patchlevel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- patchlevel.h	12 Sep 2002 19:02:14 -0000	1.3
+++ patchlevel.h	12 Sep 2002 19:10:27 -0000	1.4
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.2"
+		"+INET6.3"
 
 /*
  * Deliberate empty lines

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/ircd IPcheck.c,1.2,1.3 channel.c,1.1.1.1,1.2 ircd.c,1.2,1.3 list.c,1.1.1.1,1.2 match.c,1.1.1.1,1.2 res.c,1.2,1.3 s_auth.c,1.2,1.3 s_bsd.c,1.2,1.3 s_conf.c,1.2,1.3 s_ping.c,1.2,1.3 s_serv.c,1.1.1.1,1.2 s_socks.c,1.2,1.3 s_user.c,1.1.1.1,1.2 support.c,1.1.1.1,1.2 whocmds.c,1.1.1.1,1.2

From: Zolty <zo...@us...> - 2002-09-12 19:02:18

Update of /cvsroot/irc-dev/ipv6/ircd
In directory usw-pr-cvs1:/tmp/cvs-serv23000/ircd

Modified Files:
	IPcheck.c channel.c ircd.c list.c match.c res.c s_auth.c 
	s_bsd.c s_conf.c s_ping.c s_serv.c s_socks.c s_user.c 
	support.c whocmds.c 
Log Message:
INET6.2

Index: IPcheck.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/IPcheck.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- IPcheck.c	12 Sep 2002 16:38:57 -0000	1.2
+++ IPcheck.c	12 Sep 2002 19:02:14 -0000	1.3
@@ -48,7 +48,7 @@
  * the channels he/she was on.
  */
 struct ip_targets_st {
-  struct in_addr ip;
+  struct IN_ADDR ip;
   unsigned char free_targets;
   unsigned char targets[MAXTARGETS];
 };
@@ -56,7 +56,7 @@
 /* We keep one IPregistry for each IP number (for both, remote and local clients) */
 struct IPregistry {
   union {
-    struct in_addr ip;		/* The IP number of the registry entry. */
+    struct IN_ADDR ip;		/* The IP number of the registry entry. */
     struct ip_targets_st *ptr;	/* The IP number of the registry entry, and a list of targets */
   } ip_targets;
 
@@ -93,12 +93,15 @@
 static struct IPregistry_vector IPregistry_hashtable[HASHTABSIZE];
 
 /*
- * Calculate a `hash' value between 0 and HASHTABSIZE, from the internet address `in_addr'.
+ * Calculate a `hash' value between 0 and HASHTABSIZE, from the internet address `IN_ADDR'.
  * Apply it immedeately to the table, effectively hiding the table itself.
  */
-#define CALCULATE_HASH(in_addr) \
+/*
+ * CALCULATE_HASH for IPv4 address
+ */
+#define CALCULATE_HASH(IN_ADDR) \
   struct IPregistry_vector *hash; \
-  do { register unsigned int ip = (in_addr).s_addr; \
+  do { register unsigned int ip = (IN_ADDR).S_ADDR; \
        hash = &IPregistry_hashtable[((ip >> 14) + (ip >> 7) + ip) & (HASHTABSIZE - 1)]; } while(0)
 
 /*
@@ -122,7 +125,7 @@
 #error "That doesn't fit in 4 bits, does it?"
 #endif
 
-/* IP(entry) returns the `struct in_addr' of the IPregistry. */
+/* IP(entry) returns the `struct IN_ADDR' of the IPregistry. */
 #define IP(entry) (HAS_TARGETS(entry) ? (entry)->ip_targets.ptr->ip : (entry)->ip_targets.ip)
 #define FREE_TARGETS(entry) (HAS_TARGETS(entry) ? (entry)->ip_targets.ptr->free_targets : (entry)->free_targets)
 
@@ -141,20 +144,20 @@
 }
 
 static struct IPregistry *IPregistry_find(struct IPregistry_vector *iprv,
-    struct in_addr ip)
+    struct IN_ADDR ip)
 {
   if (iprv->length > 0)
   {
     struct IPregistry *i, *end = &iprv->vector[iprv->length];
     for (i = &iprv->vector[0]; i < end; ++i)
-      if (IP(i).s_addr == ip.s_addr)
+      if (IP(i).S_ADDR == ip.S_ADDR)
 	return i;
   }
   return NULL;
 }
 
 static struct IPregistry *IPregistry_find_with_expire(struct IPregistry_vector
-    *iprv, struct in_addr ip)
+    *iprv, struct IN_ADDR ip)
 {
   struct IPregistry *last = &iprv->vector[iprv->length - 1];	/* length always > 0 because searched element always exists */
   struct IPregistry *curr;
@@ -162,7 +165,7 @@
 
   for (curr = &iprv->vector[0]; curr < last;)
   {
-    if (IP(curr).s_addr == ip.s_addr)
+    if (IP(curr).S_ADDR == ip.S_ADDR)
       /* `curr' is element we looked for */
       retval = curr;
     else if (curr->connected == 0)
@@ -187,7 +190,7 @@
       else if (CONNECTED_SINCE(curr) > 120U && HAS_TARGETS(curr))
       {
 	/* Expire storage of targets */
-	struct in_addr ip1 = curr->ip_targets.ptr->ip;
+	struct IN_ADDR ip1 = curr->ip_targets.ptr->ip;
 	curr->free_targets = curr->ip_targets.ptr->free_targets;
 	RunFree(curr->ip_targets.ptr);
 	curr->ip_targets.ip = ip1;
@@ -197,7 +200,7 @@
     ++curr;
   }
   /* Now check the last element in the list (curr == last) */
-  if (IP(curr).s_addr == ip.s_addr)
+  if (IP(curr).S_ADDR == ip.S_ADDR)
     /* `curr' is element we looked for */
     retval = curr;
   else if (curr->connected == 0)
@@ -219,7 +222,7 @@
     else if (CONNECTED_SINCE(curr) > 120U && HAS_TARGETS(curr))
     {
       /* Expire storage of targets */
-      struct in_addr ip1 = curr->ip_targets.ptr->ip;
+      struct IN_ADDR ip1 = curr->ip_targets.ptr->ip;
       curr->free_targets = curr->ip_targets.ptr->free_targets;
       RunFree(curr->ip_targets.ptr);
       curr->ip_targets.ip = ip1;
@@ -266,7 +269,7 @@
  * IPcheck_local_connect
  *
  * Event:
- *   A new connection was accept()-ed with IP number `cptr->ip.s_addr'.
+ *   A new connection was accept()-ed with IP number `cptr->ip.S_ADDR'.
  *
  * Action:
  *   Update the IPcheck registry.
@@ -370,7 +373,7 @@
  * IPcheck_remote_connect
  *
  * Event:
- *   A remote client connected to Undernet, with IP number `cptr->ip.s_addr'
+ *   A remote client connected to Undernet, with IP number `cptr->ip.S_ADDR'
  *   and hostname `hostname'.
  *
  * Action:

Index: channel.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/channel.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- channel.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ channel.c	12 Sep 2002 19:02:14 -0000	1.2
@@ -167,7 +167,7 @@
  * Create a string of form "foo!bar@123.456.789.123" given foo, bar and the
  * IP-number as the parameters.  If NULL, they become "*".
  */
-static char *make_nick_user_ip(char *nick, char *name, struct in_addr ip)
+static char *make_nick_user_ip(char *nick, char *name, struct IN_ADDR ip)
 {
   static char ipbuf[NICKLEN + USERLEN + 16 + 3];
   sprintf_irc(ipbuf, "%s!%s@%s", nick, name, inetntoa(ip));

Index: ircd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/ircd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ircd.c	12 Sep 2002 16:38:57 -0000	1.2
+++ ircd.c	12 Sep 2002 19:02:14 -0000	1.3
@@ -701,11 +701,11 @@
 	      argv[0], p, h_errno);
 	  return -1;
 	}
-	if (hep->h_addrtype == AF_INET && hep->h_addr_list[0] &&
+	if (hep->h_addrtype == AFINET && hep->h_addr_list[0] &&
 	    !hep->h_addr_list[1])
 	{
-	  memcpy(&vserv.sin_addr, hep->h_addr_list[0], sizeof(struct in_addr));
-	  vserv.sin_family = AF_INET;
+	  memcpy(&vserv.SIN_ADDR, hep->h_addr_list[0], sizeof(struct IN_ADDR));
+	  vserv.SIN_FAMILY = AFINET;
 	}
 	else
 	{

Index: list.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/list.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- list.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ list.c	12 Sep 2002 19:02:14 -0000	1.2
@@ -359,7 +359,7 @@
 #ifdef	DEBUGMODE
   aconfs.inuse++;
 #endif
-  memset(&aconf->ipnum, 0, sizeof(struct in_addr));
+  memset(&aconf->ipnum, 0, sizeof(struct IN_ADDR));
   aconf->next = NULL;
   aconf->host = aconf->passwd = aconf->name = NULL;
   aconf->status = CONF_ILLEGAL;

Index: match.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/match.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- match.c	11 Sep 2002 10:09:08 -0000	1.1.1.1
+++ match.c	12 Sep 2002 19:02:14 -0000	1.2
@@ -1006,8 +1006,8 @@
   }
   while (*m++);
 
-  imask->bits.s_addr = htonl(bits);
-  imask->mask.s_addr = htonl(filt);
+  imask->bits.S_ADDR = htonl(bits);
+  imask->mask.S_ADDR = htonl(filt);
   imask->fall = unco;
   return ((bits & ~filt) ? -1 : 0);
 

Index: res.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/res.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- res.c	12 Sep 2002 16:38:57 -0000	1.2
+++ res.c	12 Sep 2002 19:02:14 -0000	1.3
@@ -39,8 +39,8 @@
 #define RES_MAXALIASES	35
 
 #define ALIASBLEN ((RES_MAXALIASES + 1) * sizeof(char *))
-#define ADDRSBLEN ((RES_MAXADDRS + 1) * sizeof(struct in_addr *))
-#define ADDRSDLEN (RES_MAXADDRS * sizeof(struct in_addr))
+#define ADDRSBLEN ((RES_MAXADDRS + 1) * sizeof(struct IN_ADDR *))
+#define ADDRSDLEN (RES_MAXADDRS * sizeof(struct IN_ADDR))
 #define ALIASDLEN (MAXPACKET)
 #define MAXGETHOSTLEN (ALIASBLEN + ADDRSBLEN + ADDRSDLEN + ALIASDLEN)
 
@@ -72,10 +72,10 @@
  *          | NULL                          | contains `char *'s
  *          |-------------------------------|
  *          | h_addr_list pointer array     | Max size: ADDRSBLEN;
- *          | NULL                          | contains `struct in_addr *'s
+ *          | NULL                          | contains `struct IN_ADDR *'s
  *          |-------------------------------|
  *          | h_addr_list addresses         | Max size: ADDRSDLEN;
- *          |                               | contains `struct in_addr's
+ *          |                               | contains `struct IN_ADDR's
  *          |-------------------------------|
  *          | storage for hostname strings  | Max size: ALIASDLEN;
  *          +-------------------------------+ contains `char's
@@ -97,7 +97,7 @@
  *                strings area and is terminated with a NULL.  The first alias
  *                is stored directly after the h_name.
  *  h_addr_list - contains a pointer to the start of h_addr_list pointer array.
- *                This array contains pointers to in_addr structures in the
+ *                This array contains pointers to IN_ADDR structures in the
  *                h_addr_list addresses area and is terminated with a NULL.
  *
  *  Filling the buffer this way allows for proper alignment of the h_addr_list
@@ -129,7 +129,7 @@
   char resend;			/* send flag. 0 == dont resend */
   time_t sentat;
   time_t timeout;
-  struct in_addr addr;
+  struct IN_ADDR addr;
   char *name;
   struct reslist *next;
   Link cinfo;
@@ -160,13 +160,13 @@
 static void rem_cache(aCache *);
 static void rem_request(ResRQ *);
 static int do_query_name(Link *, char *, ResRQ *);
-static int do_query_number(Link *, struct in_addr *, ResRQ *);
+static int do_query_number(Link *, struct IN_ADDR *, ResRQ *);
 static void resend_query(ResRQ *);
 static int proc_answer(ResRQ *, HEADER *, unsigned char *, unsigned char *);
 static int query_name(char *, int, int, ResRQ *);
 static aCache *make_cache(ResRQ *);
 static aCache *find_cache_name(char *);
-static aCache *find_cache_number(ResRQ *, struct in_addr *);
+static aCache *find_cache_number(ResRQ *, struct IN_ADDR *);
 static int add_request(ResRQ *);
 static ResRQ *make_request(Link *);
 static int send_res_msg(char *, int, int);
@@ -215,14 +215,14 @@
   if (!_res.nscount)
   {
     _res.nscount = 1;
-    _res.nsaddr_list[0].sin_addr.s_addr = inet_addr("127.0.0.1");
+    _res.nsaddr_list[0].SIN_ADDR.S_ADDR = inet_addr("127.0.0.1");
   }
 #ifdef DEBUGMODE
   _res.options |= RES_DEBUG;
 #endif
 
   alarm(2);
-  fd = socket(AF_INET, SOCK_DGRAM, 0);
+  fd = socket(AFINET, SOCK_DGRAM, 0);
   alarm(0);
   if (fd < 0)
   {
@@ -233,7 +233,7 @@
        * socket at initialization time, it's pointless to continue.
        */
       alarm(2);
-      if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+      if ((fd = socket(AFINET, SOCK_DGRAM, 0)) < 0)
       {
 	alarm(0);
 	Debug((DEBUG_ERROR, "init_resolver: socket: No more sockets"));
@@ -318,10 +318,10 @@
   else
     memset(&nreq->cinfo, 0, sizeof(Link));
   nreq->timeout = 4;		/* start at 4 and exponential inc. */
-  nreq->addr.s_addr = INADDR_NONE;
+  nreq->addr.S_ADDR = INADDR_NONE;
 
-  nreq->he.h.h_addrtype = AF_INET;
-  nreq->he.h.h_length = sizeof(struct in_addr);
+  nreq->he.h.h_addrtype = AFINET;
+  nreq->he.h.h_length = sizeof(struct IN_ADDR);
   add_request(nreq);
   return nreq;
 }
@@ -436,9 +436,9 @@
 
   for (i = 0; i < max; ++i)
   {
-    _res.nsaddr_list[i].sin_family = AF_INET;
-    if (sendto(resfd, msg, len, 0, (struct sockaddr *)&(_res.nsaddr_list[i]),
-	sizeof(struct sockaddr)) == len)
+    _res.nsaddr_list[i].SIN_FAMILY = AFINET;
+    if (sendto(resfd, msg, len, 0, (struct SOCKADDR *)&(_res.nsaddr_list[i]),
+	sizeof(struct SOCKADDR)) == len)
     {
       reinfo.re_sent++;
       sent++;
@@ -493,7 +493,7 @@
   return NULL;
 }
 
-struct hostent *gethost_byaddr(struct in_addr *addr, Link *lp)
+struct hostent *gethost_byaddr(struct IN_ADDR *addr, Link *lp)
 {
   aCache *cp;
 
@@ -540,10 +540,10 @@
 /*
  * Use this to do reverse IP# lookups.
  */
-static int do_query_number(Link *lp, struct in_addr *numb, ResRQ *rptr)
+static int do_query_number(Link *lp, struct IN_ADDR *numb, ResRQ *rptr)
 {
   char ipbuf[32];
-  Reg2 unsigned char *cp = (unsigned char *)&numb->s_addr;
+  Reg2 unsigned char *cp = (unsigned char *)&numb->S_ADDR;
 
   sprintf_irc(ipbuf, "%u.%u.%u.%u.in-addr.arpa.",
       (unsigned int)(cp[3]), (unsigned int)(cp[2]),
@@ -554,7 +554,7 @@
     if ((rptr = make_request(lp)) == NULL)
       return -1;
     rptr->type = T_PTR;
-    rptr->addr.s_addr = numb->s_addr;
+    rptr->addr.S_ADDR = numb->S_ADDR;
   }
   return (query_name(ipbuf, C_IN, T_PTR, rptr));
 }
@@ -677,7 +677,7 @@
   }
   /* make 'a' point to the first available empty address slot */
   a = (char *)hp->h_addr_list + ADDRSBLEN +
-      (addr_count * sizeof(struct in_addr));
+      (addr_count * sizeof(struct IN_ADDR));
 
   /* find the end of the alias list */
   alias = hp->h_aliases;
@@ -766,15 +766,15 @@
     {
       case T_A:
 	/* check for invalid dlen or too many addresses */
-	if (dlen != sizeof(struct in_addr) || ++addr_count >= RES_MAXADDRS)
+	if (dlen != sizeof(struct IN_ADDR) || ++addr_count >= RES_MAXADDRS)
 	  break;
 	if (ans == 1)
-	  hp->h_addrtype = (addr_class == C_IN) ? AF_INET : AF_UNSPEC;
+	  hp->h_addrtype = (addr_class == C_IN) ? AFINET : AF_UNSPEC;
 
-	memcpy(a, cp, sizeof(struct in_addr));
+	memcpy(a, cp, sizeof(struct IN_ADDR));
 	*addr++ = a;
 	*addr = 0;
-	a += sizeof(struct in_addr);
+	a += sizeof(struct IN_ADDR);
 
 	if (!hp->h_name)
 	{
@@ -784,7 +784,7 @@
 	}
 	cp += dlen;
 	Debug((DEBUG_DNS, "got ip # %s for %s",
-	    inetntoa(*((struct in_addr *)hp->h_addr_list[addr_count - 1])),
+	    inetntoa(*((struct IN_ADDR *)hp->h_addr_list[addr_count - 1])),
 	    hostbuf));
 	ans++;
 	break;
@@ -846,12 +846,12 @@
   Reg1 HEADER *hptr;
   Reg2 ResRQ *rptr = NULL;
   aCache *cp = NULL;
-  struct sockaddr_in sin;
+  struct SOCKADDR_IN sin;
   int a, max;
   size_t rc, len = sizeof(sin);
 
   alarm(4);
-  rc = recvfrom(resfd, buf, sizeof(buf), 0, (struct sockaddr *)&sin, &len);
+  rc = recvfrom(resfd, buf, sizeof(buf), 0, (struct SOCKADDR *)&sin, &len);
   alarm(0);
 
   if (rc <= sizeof(HEADER))
@@ -888,9 +888,9 @@
 
   for (a = 0; a < max; a++)
   {
-    if (!_res.nsaddr_list[a].sin_addr.s_addr ||
-	!memcmp((char *)&sin.sin_addr, (char *)&_res.nsaddr_list[a].sin_addr,
-	sizeof(struct in_addr)))
+    if (!_res.nsaddr_list[a].SIN_ADDR.S_ADDR ||
+	!memcmp((char *)&sin.SIN_ADDR, (char *)&_res.nsaddr_list[a].SIN_ADDR,
+	sizeof(struct IN_ADDR)))
       break;
   }
   if (a == max)
@@ -1334,7 +1334,7 @@
   {
     for (j = 0; (t = cp->he.h.h_addr_list[j]); j++)
     {
-      if (!memcmp(t, s, sizeof(struct in_addr)))
+      if (!memcmp(t, s, sizeof(struct IN_ADDR)))
 	break;
     }
     if (!t)
@@ -1398,7 +1398,7 @@
 /*
  * Find a cache entry by ip# and update its expire time
  */
-static aCache *find_cache_number(ResRQ *rptr, struct in_addr *numb)
+static aCache *find_cache_number(ResRQ *rptr, struct IN_ADDR *numb)
 {
   Reg1 aCache *cp;
   Reg2 int hashv, i;
@@ -1407,14 +1407,14 @@
 
   cp = hashtable[hashv].num_list;
   Debug((DEBUG_DNS, "find_cache_number:find %s[%08x]: hashv = %d",
-      inetntoa(*numb), ntohl(numb->s_addr), hashv));
+      inetntoa(*numb), ntohl(numb->S_ADDR), hashv));
 
   for (; cp; cp = cp->hnum_next)
   {
     for (i = 0; cp->he.h.h_addr_list[i]; ++i)
     {
       if (!memcmp(cp->he.h.h_addr_list[i], (char *)numb,
-	  sizeof(struct in_addr)))
+	  sizeof(struct IN_ADDR)))
       {
 	cainfo.ca_nu_hits++;
 	update_list(rptr, cp);
@@ -1439,7 +1439,7 @@
     for (i = 1; cp->he.h.h_addr_list[i]; ++i)
     {
       if (!memcmp(cp->he.h.h_addr_list[i], (char *)numb,
-	  sizeof(struct in_addr)))
+	  sizeof(struct IN_ADDR)))
       {
 	cainfo.ca_nu_hits++;
 	update_list(rptr, cp);
@@ -1467,7 +1467,7 @@
    */
   for (i = 0; hp->h_addr_list[i]; ++i)
   {
-    if ((cp = find_cache_number(rptr, (struct in_addr *)hp->h_addr_list[i])))
+    if ((cp = find_cache_number(rptr, (struct IN_ADDR *)hp->h_addr_list[i])))
       return cp;
   }
 
@@ -1548,7 +1548,7 @@
   hashv = hash_number((unsigned char *)hp->h_addr_list[0]);
 
   Debug((DEBUG_DNS, "rem_cache: h_addr %s hashv %d next %p first %p",
-      inetntoa(*((struct in_addr *)hp->h_addr_list[0])), hashv,
+      inetntoa(*((struct IN_ADDR *)hp->h_addr_list[0])), hashv,
       ocp->hnum_next, hashtable[hashv].num_list));
   for (cp = &hashtable[hashv].num_list; *cp; cp = &((*cp)->hnum_next))
   {
@@ -1620,13 +1620,13 @@
       h = &cp->he.h;
       sendto_one(sptr, "NOTICE %s :Ex %d ttl %d host %s(%s)",
 	  parv[0], (int)(cp->expireat - now), (int)cp->ttl,
-	  h->h_name, inetntoa(*((struct in_addr *)h->h_addr_list[0])));
+	  h->h_name, inetntoa(*((struct IN_ADDR *)h->h_addr_list[0])));
       for (i = 0; h->h_aliases[i]; i++)
 	sendto_one(sptr, "NOTICE %s : %s = %s (CN)",
 	    parv[0], h->h_name, h->h_aliases[i]);
       for (i = 1; h->h_addr_list[i]; i++)
 	sendto_one(sptr, "NOTICE %s : %s = %s (IP)", parv[0],
-	    h->h_name, inetntoa(*((struct in_addr *)h->h_addr_list[i])));
+	    h->h_name, inetntoa(*((struct IN_ADDR *)h->h_addr_list[i])));
     }
     return 0;
   }
@@ -1657,7 +1657,7 @@
     for (i = 0; h->h_addr_list[i]; i++)
     {
       im += sizeof(char *);
-      im += sizeof(struct in_addr);
+      im += sizeof(struct IN_ADDR);
     }
     im += sizeof(char *);
     for (i = 0; h->h_aliases[i]; i++)

Index: s_auth.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_auth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_auth.c	12 Sep 2002 16:38:57 -0000	1.2
+++ s_auth.c	12 Sep 2002 19:02:14 -0000	1.3
@@ -70,7 +70,7 @@
  */
 void start_auth(aClient *cptr)
 {
-  struct sockaddr_in sock;
+  struct SOCKADDR_IN sock;
   int err;
 
 #ifndef HACER_IDENT
@@ -100,7 +100,7 @@
   }
 
   alarm(2);
-  cptr->authfd = socket(AF_INET, SOCK_STREAM, 0);
+  cptr->authfd = socket(AFINET, SOCK_STREAM, 0);
   err = errno;
   alarm(0);
 
@@ -131,7 +131,7 @@
   set_non_blocking(cptr->authfd, cptr);
 
 #ifdef VIRTUAL_HOST
-  if (bind(cptr->authfd, (struct sockaddr *)&vserv, sizeof(vserv)) == -1)
+  if (bind(cptr->authfd, (struct SOCKADDR *)&vserv, sizeof(vserv)) == -1)
   {
     report_error("binding auth stream socket %s: %s", cptr);
     close(cptr->authfd);
@@ -139,13 +139,13 @@
     return;
   }
 #endif
-  memcpy(&sock.sin_addr, &cptr->ip, sizeof(struct in_addr));
+  memcpy(&sock.SIN_ADDR, &cptr->ip, sizeof(struct IN_ADDR));
 
-  sock.sin_port = htons(113);
-  sock.sin_family = AF_INET;
+  sock.SIN_PORT = htons(113);
+  sock.SIN_FAMILY = AFINET;
 
   alarm((unsigned)4);
-  if (connect(cptr->authfd, (struct sockaddr *)&sock,
+  if (connect(cptr->authfd, (struct SOCKADDR *)&sock,
       sizeof(sock)) == -1 && errno != EINPROGRESS)
   {
     ircstp->is_abad++;
@@ -187,15 +187,15 @@
  */
 void send_authports(aClient *cptr)
 {
-  struct sockaddr_in us, them;
+  struct SOCKADDR_IN us, them;
   char authbuf[32];
   size_t ulen, tlen;
 
   Debug((DEBUG_NOTICE, "write_authports(%p) fd %d authfd %d stat %d",
       cptr, cptr->fd, cptr->authfd, cptr->status));
   tlen = ulen = sizeof(us);
-  if (getsockname(cptr->fd, (struct sockaddr *)&us, &ulen) ||
-      getpeername(cptr->fd, (struct sockaddr *)&them, &tlen))
+  if (getsockname(cptr->fd, (struct SOCKADDR *)&us, &ulen) ||
+      getpeername(cptr->fd, (struct SOCKADDR *)&them, &tlen))
   {
 #ifdef	USE_SYSLOG
     syslog(LOG_ERR, "auth get{sock,peer}name error for %s:%m",
@@ -204,11 +204,11 @@
     goto authsenderr;
   }
 
-  sprintf_irc(authbuf, "%u , %u\r\n", (unsigned int)ntohs(them.sin_port),
-      (unsigned int)ntohs(us.sin_port));
+  sprintf_irc(authbuf, "%u , %u\r\n", (unsigned int)ntohs(them.SIN_PORT),
+      (unsigned int)ntohs(us.SIN_PORT));
 
   Debug((DEBUG_SEND, "sending [%s] to auth port %s.113",
-      authbuf, inetntoa(them.sin_addr)));
+      authbuf, inetntoa(them.SIN_ADDR)));
   if (write(cptr->authfd, authbuf, strlen(authbuf)) != (int)strlen(authbuf))
   {
   authsenderr:

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_bsd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_bsd.c	12 Sep 2002 16:38:57 -0000	1.2
+++ s_bsd.c	12 Sep 2002 19:02:14 -0000	1.3
@@ -114,15 +114,15 @@
 aClient *loc_clients[MAXCONNECTIONS];
 int highest_fd = 0, udpfd = -1, resfd = -1;
 unsigned int readcalls = 0;
-static struct sockaddr_in mysk;
+static struct SOCKADDR_IN mysk;
 static void polludp();
 
-static struct sockaddr *connect_inet(aConfItem *, aClient *, int *);
+static struct SOCKADDR *connect_inet(aConfItem *, aClient *, int *);
 static int completed_connection(aClient *);
 static int check_init(aClient *, char *);
 static void do_dns_async(), set_sock_opts(int, aClient *);
 #ifdef	UNIXPORT
-static struct sockaddr *connect_unix(aConfItem *, aClient *, int *);
+static struct SOCKADDR *connect_unix(aConfItem *, aClient *, int *);
 static void add_unixconnection(aClient *, int);
 static char unixpath[256];
 #endif
@@ -132,7 +132,7 @@
 static aClient *poll_cptr[MAXCONNECTIONS + 1];
 #endif /* USE_POLL */
 #ifdef VIRTUAL_HOST
-struct sockaddr_in vserv;
+struct SOCKADDR_IN vserv;
 #endif
 static int running_in_background;
 
@@ -239,14 +239,14 @@
 /*
  * inetport
  *
- * Create a socket in the AF_INET domain, bind it to the port given in
+ * Create a socket in the AFINET domain, bind it to the port given in
  * 'port' and listen to it.  Connections are accepted to this socket
  * depending on the IP# mask given by 'name'.  Returns the fd of the
  * socket created or -1 on error.
  */
 int inetport(aClient *cptr, char *name, unsigned short int port)
 {
-  static struct sockaddr_in server;
+  static struct SOCKADDR_IN server;
   int ad[4], opt;
   size_t len = sizeof(server);
   char ipname[20];
@@ -272,7 +272,7 @@
   if (cptr->fd == -1)
   {
     alarm(2);
-    cptr->fd = socket(AF_INET, SOCK_STREAM, 0);
+    cptr->fd = socket(AFINET, SOCK_STREAM, 0);
     alarm(0);
     if (cptr->fd < 0 && errno == EAGAIN)
     {
@@ -301,25 +301,25 @@
    */
   if (port)
   {
-    server.sin_family = AF_INET;
+    server.SIN_FAMILY = AFINET;
 #ifndef VIRTUAL_HOST
-    server.sin_addr.s_addr = INADDR_ANY;
+    server.SIN_ADDR.S_ADDR = INADDR_ANY;
 #else
-    server.sin_addr = vserv.sin_addr;
+    server.SIN_ADDR = vserv.SIN_ADDR;
 #endif
 #ifdef TESTNET
-    server.sin_port = htons(port + 10000);
+    server.SIN_PORT = htons(port + 10000);
 #else
-    server.sin_port = htons(port);
+    server.SIN_PORT = htons(port);
 #endif
-    if (bind(cptr->fd, (struct sockaddr *)&server, sizeof(server)) == -1)
+    if (bind(cptr->fd, (struct SOCKADDR *)&server, sizeof(server)) == -1)
     {
       report_error("binding stream socket %s: %s", cptr);
       close(cptr->fd);
       return -1;
     }
   }
-  if (getsockname(cptr->fd, (struct sockaddr *)&server, &len))
+  if (getsockname(cptr->fd, (struct SOCKADDR *)&server, &len))
   {
     report_error("getsockname failed for %s: %s", cptr);
     close(cptr->fd);
@@ -332,20 +332,20 @@
 
 #ifdef TESTNET
     sprintf_irc(buf, rpl_str(RPL_MYPORTIS), me.name, "*",
-	ntohs(server.sin_port) - 10000);
+	ntohs(server.SIN_PORT) - 10000);
 #else
     sprintf_irc(buf, rpl_str(RPL_MYPORTIS), me.name, "*",
-	ntohs(server.sin_port));
+	ntohs(server.SIN_PORT));
 #endif
     write(1, buf, strlen(buf));
   }
   if (cptr->fd > highest_fd)
     highest_fd = cptr->fd;
-  cptr->ip.s_addr = inet_addr(ipname);
+  cptr->ip.S_ADDR = inet_addr(ipname);
 #ifdef TESTNET
-  cptr->port = ntohs(server.sin_port) - 10000;
+  cptr->port = ntohs(server.SIN_PORT) - 10000;
 #else
-  cptr->port = ntohs(server.sin_port);
+  cptr->port = ntohs(server.SIN_PORT);
 #endif
   listen(cptr->fd, 128);	/* Use listen port backlog of 128 */
   loc_clients[cptr->fd] = cptr;
@@ -412,7 +412,7 @@
   errno = 0;
   get_sockhost(cptr, unixpath);
 
-  if (bind(cptr->fd, (struct sockaddr *)&un, strlen(unixpath) + 2) == -1)
+  if (bind(cptr->fd, (struct SOCKADDR *)&un, strlen(unixpath) + 2) == -1)
   {
     report_error("error binding unix socket %s: %s", cptr);
     close(cptr->fd);
@@ -629,8 +629,8 @@
  */
 static int check_init(aClient *cptr, char *sockn)
 {
-  struct sockaddr_in sk;
-  size_t len = sizeof(struct sockaddr_in);
+  struct SOCKADDR_IN sk;
+  size_t len = sizeof(struct SOCKADDR_IN);
   sockn[HOSTLEN] = 0;
 
 #ifdef	UNIXPORT
@@ -646,24 +646,24 @@
   if (isatty(cptr->fd))
   {
     strncpy(sockn, me.name, HOSTLEN);
-    memset(&sk, 0, sizeof(struct sockaddr_in));
+    memset(&sk, 0, sizeof(struct SOCKADDR_IN));
   }
-  else if (getpeername(cptr->fd, (struct sockaddr *)&sk, &len) == -1)
+  else if (getpeername(cptr->fd, (struct SOCKADDR *)&sk, &len) == -1)
   {
     report_error("connect failure: %s %s", cptr);
     return -1;
   }
-  strcpy(sockn, inetntoa(sk.sin_addr));
-  if (inet_netof(sk.sin_addr) == IN_LOOPBACKNET)
+  strcpy(sockn, inetntoa(sk.SIN_ADDR));
+  if (inet_netof(sk.SIN_ADDR) == IN_LOOPBACKNET)
   {
     cptr->hostp = NULL;
     strncpy(sockn, me.name, HOSTLEN);
   }
-  memcpy(&cptr->ip, &sk.sin_addr, sizeof(struct in_addr));
+  memcpy(&cptr->ip, &sk.SIN_ADDR, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-  cptr->port = ntohs(sk.sin_port) - 10000;
+  cptr->port = ntohs(sk.SIN_PORT) - 10000;
 #else
-  cptr->port = ntohs(sk.sin_port);
+  cptr->port = ntohs(sk.SIN_PORT);
 #endif
 
   return 0;
@@ -702,7 +702,7 @@
   if (hp)
   {
     for (i = 0; hp->h_addr_list[i]; i++)
-      if (!memcmp(hp->h_addr_list[i], &cptr->ip, sizeof(struct in_addr)))
+      if (!memcmp(hp->h_addr_list[i], &cptr->ip, sizeof(struct IN_ADDR)))
 	break;
     if (!hp->h_addr_list[i])
     {
@@ -794,7 +794,7 @@
   Debug((DEBUG_DNS, "ch_cl: access ok: %s[%s]", cptr->name, sockname));
 
   if (inet_netof(cptr->ip) == IN_LOOPBACKNET || IsUnixSocket(cptr) ||
-      inet_netof(cptr->ip) == inet_netof(mysk.sin_addr))
+      inet_netof(cptr->ip) == inet_netof(mysk.SIN_ADDR))
   {
     ircstp->is_loc++;
     cptr->flags |= FLAGS_LOCAL;
@@ -908,7 +908,7 @@
   if (hp)
   {
     for (i = 0; hp->h_addr_list[i]; i++)
-      if (!memcmp(hp->h_addr_list[i], &cptr->ip, sizeof(struct in_addr)))
+      if (!memcmp(hp->h_addr_list[i], &cptr->ip, sizeof(struct IN_ADDR)))
 	break;
     if (!hp->h_addr_list[i])
     {
@@ -1001,8 +1001,8 @@
   attach_conf(cptr, c_conf);
   attach_confs(cptr, name, CONF_HUB | CONF_LEAF | CONF_UWORLD);
 
-  if ((c_conf->ipnum.s_addr == INADDR_NONE) && !IsUnixSocket(cptr))
-    memcpy(&c_conf->ipnum, &cptr->ip, sizeof(struct in_addr));
+  if ((c_conf->ipnum.S_ADDR == INADDR_NONE) && !IsUnixSocket(cptr))
+    memcpy(&c_conf->ipnum, &cptr->ip, sizeof(struct IN_ADDR));
   if (!IsUnixSocket(cptr))
     get_sockhost(cptr, c_conf->host);
 
@@ -1377,10 +1377,10 @@
   else
   {
     Reg1 char *s, *t;
-    struct sockaddr_in addr;
-    size_t len = sizeof(struct sockaddr_in);
+    struct SOCKADDR_IN addr;
+    size_t len = sizeof(struct SOCKADDR_IN);
 
-    if (getpeername(fd, (struct sockaddr *)&addr, &len) == -1)
+    if (getpeername(fd, (struct SOCKADDR *)&addr, &len) == -1)
     {
       report_error("Failed in connecting to %s: %s", cptr);
     add_con_refuse:
@@ -1397,12 +1397,12 @@
      * Copy ascii address to 'sockhost' just in case. Then we
      * have something valid to put into error messages...
      */
-    get_sockhost(acptr, inetntoa(addr.sin_addr));
-    memcpy(&acptr->ip, &addr.sin_addr, sizeof(struct in_addr));
+    get_sockhost(acptr, inetntoa(addr.SIN_ADDR));
+    memcpy(&acptr->ip, &addr.SIN_ADDR, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-    acptr->port = ntohs(addr.sin_port) - 10000;
+    acptr->port = ntohs(addr.SIN_PORT) - 10000;
 #else
-    acptr->port = ntohs(addr.sin_port);
+    acptr->port = ntohs(addr.SIN_PORT);
 #endif
 
     /*
@@ -1424,7 +1424,7 @@
     lin.flags = ASYNC_CLIENT;
     lin.value.cptr = acptr;
 #ifdef NODNS
-    if (!strcmp("127.0.0.1", inetntoa(addr.sin_addr)))
+    if (!strcmp("127.0.0.1", inetntoa(addr.SIN_ADDR)))
     {
       static struct hostent lhe = { "localhost", NULL, 0, 0, NULL };
       acptr->hostp = &lhe;
@@ -1438,7 +1438,7 @@
     else
     {
 #endif
-      Debug((DEBUG_DNS, "lookup %s", inetntoa(addr.sin_addr)));
+      Debug((DEBUG_DNS, "lookup %s", inetntoa(addr.SIN_ADDR)));
       acptr->hostp = gethost_byaddr(&acptr->ip, &lin);
       if (!acptr->hostp)
       {
@@ -1531,7 +1531,7 @@
   loc_clients[fd] = acptr;
   acptr->acpt = cptr;
   SetUnixSock(acptr);
-  memcpy(&acptr->ip, &me.ip, sizeof(struct in_addr));
+  memcpy(&acptr->ip, &me.ip, sizeof(struct IN_ADDR));
 
   Count_newunknown(nrof);
   add_client_to_list(acptr);
@@ -2046,11 +2046,11 @@
       }
 #if defined(USE_SYSLOG) && defined(SYSLOG_CONNECTS)
       {				/* get an early log of all connections   --dl */
-	static struct sockaddr_in peer;
+	static struct SOCKADDR_IN peer;
 	static int len;
 	len = sizeof(peer);
-	getpeername(fd, (struct sockaddr *)&peer, &len);
-	syslog(LOG_DEBUG, "Conn: %s", inetntoa(peer.sin_addr));
+	getpeername(fd, (struct SOCKADDR *)&peer, &len);
+	syslog(LOG_DEBUG, "Conn: %s", inetntoa(peer.SIN_ADDR));
       }
 #endif
       ircstp->is_ac++;
@@ -2192,7 +2192,7 @@
  */
 int connect_server(aConfItem *aconf, aClient *by, struct hostent *hp)
 {
-  Reg1 struct sockaddr *svp;
+  Reg1 struct SOCKADDR *svp;
   Reg2 aClient *cptr, *c2ptr;
   Reg3 char *s;
   int errtmp, len;
@@ -2239,7 +2239,7 @@
    * If we dont know the IP# for this host and itis a hostname and
    * not a ip# string, then try and find the appropriate host record.
    */
-  if ((!aconf->ipnum.s_addr)
+  if ((!aconf->ipnum.S_ADDR)
 #ifdef UNIXPORT
       && ((aconf->host[2]) != '/')	/* needed for Unix domain -- dl */
 #endif
@@ -2252,15 +2252,15 @@
     nextdnscheck = 1;
     s = strchr(aconf->host, '@');
     s++;			/* should NEVER be NULL */
-    if ((aconf->ipnum.s_addr = inet_addr(s)) == INADDR_NONE)
+    if ((aconf->ipnum.S_ADDR = inet_addr(s)) == INADDR_NONE)
     {
-      aconf->ipnum.s_addr = INADDR_ANY;
+      aconf->ipnum.S_ADDR = INADDR_ANY;
       hp = gethost_byname(s, &lin);
       Debug((DEBUG_NOTICE, "co_sv: hp %p ac %p na %s ho %s",
 	  hp, aconf, aconf->name, s));
       if (!hp)
 	return 0;
-      memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+      memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct IN_ADDR));
     }
   }
   cptr = make_client(NULL, STAT_UNKNOWN);
@@ -2403,9 +2403,9 @@
   return 0;
 }
 
-static struct sockaddr *connect_inet(aConfItem *aconf, aClient *cptr, int *lenp)
+static struct SOCKADDR *connect_inet(aConfItem *aconf, aClient *cptr, int *lenp)
 {
-  static struct sockaddr_in server;
+  static struct SOCKADDR_IN server;
   Reg3 struct hostent *hp;
 
   /*
@@ -2413,7 +2413,7 @@
    * with it so if it fails its useless.
    */
   alarm(2);
-  cptr->fd = socket(AF_INET, SOCK_STREAM, 0);
+  cptr->fd = socket(AFINET, SOCK_STREAM, 0);
   alarm(0);
   if (cptr->fd == -1 && errno == EAGAIN)
   {
@@ -2431,14 +2431,14 @@
     sendto_ops("No more connections allowed (%s)", cptr->name);
     return NULL;
   }
-  mysk.sin_port = 0;
+  mysk.SIN_PORT = 0;
 
   memset(&server, 0, sizeof(server));
-  server.sin_family = AF_INET;
+  server.SIN_FAMILY = AFINET;
   get_sockhost(cptr, aconf->host);
 
 #ifdef VIRTUAL_HOST
-  mysk.sin_addr = vserv.sin_addr;
+  mysk.SIN_ADDR = vserv.SIN_ADDR;
 #endif
 
   /*
@@ -2457,7 +2457,7 @@
    * explicitly bind it, it will default to IN_ADDR_ANY and we lose
    * due to the other server not allowing our base IP --smg
    */
-  if (bind(cptr->fd, (struct sockaddr *)&mysk, sizeof(mysk)) == -1)
+  if (bind(cptr->fd, (struct SOCKADDR *)&mysk, sizeof(mysk)) == -1)
   {
     report_error("error binding to local port for %s: %s", cptr);
     return NULL;
@@ -2469,9 +2469,9 @@
    * conf line, whether as a result of the hostname lookup or the ip#
    * being present instead. If we dont know it, then the connect fails.
    */
-  if (isDigit(*aconf->host) && (aconf->ipnum.s_addr == INADDR_NONE))
-    aconf->ipnum.s_addr = inet_addr(aconf->host);
-  if (aconf->ipnum.s_addr == INADDR_NONE)
+  if (isDigit(*aconf->host) && (aconf->ipnum.S_ADDR == INADDR_NONE))
+    aconf->ipnum.S_ADDR = inet_addr(aconf->host);
+  if (aconf->ipnum.S_ADDR == INADDR_NONE)
   {
     hp = cptr->hostp;
     if (!hp)
@@ -2479,17 +2479,17 @@
       Debug((DEBUG_FATAL, "%s: unknown host", aconf->host));
       return NULL;
     }
-    memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+    memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct IN_ADDR));
   }
-  memcpy(&server.sin_addr, &aconf->ipnum, sizeof(struct in_addr));
-  memcpy(&cptr->ip, &aconf->ipnum, sizeof(struct in_addr));
+  memcpy(&server.SIN_ADDR, &aconf->ipnum, sizeof(struct IN_ADDR));
+  memcpy(&cptr->ip, &aconf->ipnum, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-  server.sin_port = htons(((aconf->port > 0) ? aconf->port : portnum) + 10000);
+  server.SIN_PORT = htons(((aconf->port > 0) ? aconf->port : portnum) + 10000);
 #else
-  server.sin_port = htons(((aconf->port > 0) ? aconf->port : portnum));
+  server.SIN_PORT = htons(((aconf->port > 0) ? aconf->port : portnum));
 #endif
   *lenp = sizeof(server);
-  return (struct sockaddr *)&server;
+  return (struct SOCKADDR *)&server;
 }
 
 #ifdef	UNIXPORT
@@ -2499,7 +2499,7 @@
  * Build a socket structure for cptr so that it can connet to the unix
  * socket defined by the conf structure aconf.
  */
-static struct sockaddr *connect_unix(aConfItem *aconf, aClient *cptr, int *lenp)
+static struct SOCKADDR *connect_unix(aConfItem *aconf, aClient *cptr, int *lenp)
 {
   static struct sockaddr_un sock;
 
@@ -2531,7 +2531,7 @@
   *lenp = strlen(sock.sun_path) + 2;
 
   SetUnixSock(cptr);
-  return (struct sockaddr *)&sock;
+  return (struct SOCKADDR *)&sock;
 }
 
 #endif
@@ -2548,8 +2548,8 @@
    * Setup local socket structure to use for binding to.
    */
   memset(&mysk, 0, sizeof(mysk));
-  mysk.sin_family = AF_INET;
-  mysk.sin_addr.s_addr = INADDR_ANY;
+  mysk.SIN_FAMILY = AFINET;
+  mysk.SIN_ADDR.S_ADDR = INADDR_ANY;
 
   if (!aconf || BadPtr(aconf->host))
     return;
@@ -2557,11 +2557,11 @@
 
   if (!BadPtr(aconf->passwd) && 0 != strcmp(aconf->passwd, "*"))
   {
-    mysk.sin_addr.s_addr = inet_addr(aconf->passwd);
-    if (INADDR_NONE == mysk.sin_addr.s_addr)
-      mysk.sin_addr.s_addr = INADDR_ANY;
+    mysk.SIN_ADDR.S_ADDR = inet_addr(aconf->passwd);
+    if (INADDR_NONE == mysk.SIN_ADDR.S_ADDR)
+      mysk.SIN_ADDR.S_ADDR = INADDR_ANY;
 #ifdef VIRTUAL_HOST
-    memcpy(&vserv, &mysk, sizeof(struct sockaddr_in));
+    memcpy(&vserv, &mysk, sizeof(struct SOCKADDR_IN));
 #endif
   }
   Debug((DEBUG_DEBUG, "local name is %s", get_client_name(&me, TRUE)));
@@ -2572,23 +2572,23 @@
  */
 int setup_ping(void)
 {
-  struct sockaddr_in from;
+  struct SOCKADDR_IN from;
   int on = 1;
 
   memset(&from, 0, sizeof(from));
 #ifdef VIRTUAL_HOST
-  from.sin_addr = vserv.sin_addr;
+  from.SIN_ADDR = vserv.SIN_ADDR;
 #else
-  from.sin_addr.s_addr = htonl(INADDR_ANY);
+  from.SIN_ADDR.S_ADDR = htonl(INADDR_ANY);
 #endif
 #ifdef TESTNET
-  from.sin_port = htons(atoi(UDP_PORT) + 10000);
+  from.SIN_PORT = htons(atoi(UDP_PORT) + 10000);
 #else
-  from.sin_port = htons(atoi(UDP_PORT));
+  from.SIN_PORT = htons(atoi(UDP_PORT));
 #endif
-  from.sin_family = AF_INET;
+  from.SIN_FAMILY = AFINET;
 
-  if ((udpfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+  if ((udpfd = socket(AFINET, SOCK_DGRAM, 0)) == -1)
   {
     Debug((DEBUG_ERROR, "socket udp : %s", strerror(errno)));
     return -1;
@@ -2606,10 +2606,10 @@
   }
   on = 0;
   setsockopt(udpfd, SOL_SOCKET, SO_BROADCAST, (char *)&on, sizeof(on));
-  if (bind(udpfd, (struct sockaddr *)&from, sizeof(from)) == -1)
+  if (bind(udpfd, (struct SOCKADDR *)&from, sizeof(from)) == -1)
   {
 #ifdef	USE_SYSLOG
-    syslog(LOG_ERR, "bind udp.%d fd %d : %m", from.sin_port, udpfd);
+    syslog(LOG_ERR, "bind udp.%d fd %d : %m", from.SIN_PORT, udpfd);
 #endif
     Debug((DEBUG_ERROR, "bind : %s", strerror(errno)));
     close(udpfd);
@@ -2632,7 +2632,7 @@
 static void polludp(void)
 {
   Reg1 char *s;
-  struct sockaddr_in from;
+  struct SOCKADDR_IN from;
   int n;
   size_t fromlen = sizeof(from);
   static time_t last = 0;
@@ -2650,7 +2650,7 @@
   }
   Debug((DEBUG_DEBUG, "udp poll"));
 
-  n = recvfrom(udpfd, readbuf, mlen, 0, (struct sockaddr *)&from, &fromlen);
+  n = recvfrom(udpfd, readbuf, mlen, 0, (struct SOCKADDR *)&from, &fromlen);
   if (now == last)
     if (++cnt > 14)
       return;
@@ -2681,7 +2681,7 @@
   strcpy(s, version);
   s += strlen(s);
   sendto(udpfd, readbuf, s - readbuf, 0,
-      (struct sockaddr *)&from, sizeof(from));
+      (struct SOCKADDR *)&from, sizeof(from));
   return;
 }
 
@@ -2742,7 +2742,7 @@
       aconf = ln.value.aconf;
       if (hp && aconf)
       {
-	memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+	memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct IN_ADDR));
 	connect_server(aconf, NULL, hp);
       }
       else
@@ -2754,7 +2754,7 @@
       del_queries((char *)cptr);
       if (hp)
       {
-	memcpy(&cptr->ip, hp->h_addr, sizeof(struct in_addr));
+	memcpy(&cptr->ip, hp->h_addr, sizeof(struct IN_ADDR));
 	if (ping_server(cptr) == -1)
 	  end_ping(cptr);
       }
@@ -2767,7 +2767,7 @@
     case ASYNC_CONF:
       aconf = ln.value.aconf;
       if (hp && aconf)
-	memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+	memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct IN_ADDR));
       break;
     default:
       break;

Index: s_conf.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_conf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_conf.c	12 Sep 2002 16:38:57 -0000	1.2
+++ s_conf.c	12 Sep 2002 19:02:15 -0000	1.3
@@ -290,7 +290,7 @@
       {
 	for (i = highest_fd; i >= 0; i--)
 	  if (loc_clients[i] && MyUser(loc_clients[i]) &&
-	      loc_clients[i]->ip.s_addr == cptr->ip.s_addr)
+	      loc_clients[i]->ip.S_ADDR == cptr->ip.S_ADDR)
 	    return ACR_TOO_MANY_FROM_IP;	/* Already got one with that ip# */
       }
 #endif
@@ -581,7 +581,7 @@
       continue;
     }
     *s = '@';
-    if (!memcmp(&tmp->ipnum, ip, sizeof(struct in_addr)))
+    if (!memcmp(&tmp->ipnum, ip, sizeof(struct IN_ADDR)))
       return tmp;
   }
   return NULL;
@@ -1184,16 +1184,16 @@
   ln.flags = ASYNC_CONF;
 
   if (isDigit(*s))
-    aconf->ipnum.s_addr = inet_addr(s);
+    aconf->ipnum.S_ADDR = inet_addr(s);
   else if ((hp = gethost_byname(s, &ln)))
-    memcpy(&(aconf->ipnum), hp->h_addr, sizeof(struct in_addr));
+    memcpy(&(aconf->ipnum), hp->h_addr, sizeof(struct IN_ADDR));
 
-  if (aconf->ipnum.s_addr == INADDR_NONE)
+  if (aconf->ipnum.S_ADDR == INADDR_NONE)
     goto badlookup;
   return 0;
 badlookup:
-  if (aconf->ipnum.s_addr == INADDR_NONE)
-    memset(&aconf->ipnum, 0, sizeof(struct in_addr));
+  if (aconf->ipnum.S_ADDR == INADDR_NONE)
+    memset(&aconf->ipnum, 0, sizeof(struct IN_ADDR));
   Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
       aconf->host, aconf->name));
   return -1;

Index: s_ping.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_ping.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_ping.c	12 Sep 2002 16:38:57 -0000	1.2
+++ s_ping.c	12 Sep 2002 19:02:15 -0000	1.3
@@ -94,20 +94,20 @@
  */
 int start_ping(aClient *cptr)
 {
-  struct sockaddr_in remote_addr;
+  struct SOCKADDR_IN remote_addr;
 
   Debug((DEBUG_NOTICE, "start_ping(%p) status %d", cptr, cptr->status));
 
   if (!(cptr->acpt))
     return -1;
 
-  memcpy(&remote_addr.sin_addr, &cptr->ip, sizeof(struct in_addr));
+  memcpy(&remote_addr.SIN_ADDR, &cptr->ip, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-  remote_addr.sin_port = htons(cptr->port + 10000);
+  remote_addr.SIN_PORT = htons(cptr->port + 10000);
 #else
-  remote_addr.sin_port = htons(cptr->port);
+  remote_addr.SIN_PORT = htons(cptr->port);
 #endif
-  remote_addr.sin_family = AF_INET;
+  remote_addr.SIN_FAMILY = AFINET;
 
   if (MyUser(cptr->acpt) || Protocol(cptr->acpt->from) < 10)
   {
@@ -137,16 +137,16 @@
  */
 void send_ping(aClient *cptr)
 {
-  struct sockaddr_in remote_addr;
+  struct SOCKADDR_IN remote_addr;
   struct timeval tv;
 
-  memcpy(&remote_addr.sin_addr, &cptr->ip, sizeof(struct in_addr));
+  memcpy(&remote_addr.SIN_ADDR, &cptr->ip, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-  remote_addr.sin_port = htons(cptr->port + 10000);
+  remote_addr.SIN_PORT = htons(cptr->port + 10000);
 #else
-  remote_addr.sin_port = htons(cptr->port);
+  remote_addr.SIN_PORT = htons(cptr->port);
 #endif
-  remote_addr.sin_family = AF_INET;
+  remote_addr.SIN_FAMILY = AFINET;
 
   gettimeofday(&tv, NULL);
 #if defined(__sun__) || (__GLIBC__ >= 2) || defined(__NetBSD__)
@@ -157,10 +157,10 @@
 
   Debug((DEBUG_SEND, "send_ping: sending [%s %s] to %s.%d on %d",
       (char *)cptr->confs, (char *)cptr->confs + 12,
-      inetntoa(remote_addr.sin_addr), ntohs(remote_addr.sin_port), cptr->fd));
+      inetntoa(remote_addr.SIN_ADDR), ntohs(remote_addr.SIN_PORT), cptr->fd));
 
   if (sendto(cptr->fd, (char *)cptr->confs, 1024, 0,
-      (struct sockaddr *)&remote_addr, sizeof(struct sockaddr_in)) != 1024)
+      (struct SOCKADDR *)&remote_addr, sizeof(struct SOCKADDR_IN)) != 1024)
   {
 #ifdef DEBUGMODE
     int err = errno;
@@ -196,25 +196,25 @@
  */
 void read_ping(aClient *cptr)
 {
-  size_t addr_len = sizeof(struct sockaddr_in);
-  struct sockaddr_in remote_addr;
+  size_t addr_len = sizeof(struct SOCKADDR_IN);
+  struct SOCKADDR_IN remote_addr;
   struct timeval tv;
   int len;
   unsigned long int pingtime;
   char *s;
 
-  memcpy(&remote_addr.sin_addr, &cptr->ip, sizeof(struct in_addr));
+  memcpy(&remote_addr.SIN_ADDR, &cptr->ip, sizeof(struct IN_ADDR));
 #ifdef TESTNET
-  remote_addr.sin_port = htons(cptr->port + 10000);
+  remote_addr.SIN_PORT = htons(cptr->port + 10000);
 #else
-  remote_addr.sin_port = htons(cptr->port);
+  remote_addr.SIN_PORT = htons(cptr->port);
 #endif
-  remote_addr.sin_family = AF_INET;
+  remote_addr.SIN_FAMILY = AFINET;
 
   gettimeofday(&tv, NULL);
 
   if ((len = recvfrom(cptr->fd, (char *)cptr->confs, UPINGBUFSIZE, 0,
-      (struct sockaddr *)&remote_addr, &addr_len)) == -1)
+      (struct SOCKADDR *)&remote_addr, &addr_len)) == -1)
   {
     int err = errno;
     if (MyUser(cptr->acpt)
@@ -265,7 +265,7 @@
 
 int ping_server(aClient *cptr)
 {
-  if ((!cptr->ip.s_addr)
+  if ((!cptr->ip.S_ADDR)
 #ifdef UNIXPORT
       && ((cptr->sockhost[2]) != '/')
 #endif
@@ -284,14 +284,14 @@
     s = strchr(cptr->sockhost, '@');
     s++;			/* should never be NULL;
 				   cptr->sockhost is actually a conf->host */
-    if ((cptr->ip.s_addr = inet_addr(s)) == INADDR_NONE)
+    if ((cptr->ip.S_ADDR = inet_addr(s)) == INADDR_NONE)
     {
-      cptr->ip.s_addr = INADDR_ANY;
+      cptr->ip.S_ADDR = INADDR_ANY;
       hp = gethost_byname(s, &lin);
       Debug((DEBUG_NOTICE, "ping_sv: hp %p ac %p ho %s", hp, cptr, s));
       if (!hp)
 	return 0;
-      memcpy(&cptr->ip, hp->h_addr, sizeof(struct in_addr));
+      memcpy(&cptr->ip, hp->h_addr, sizeof(struct IN_ADDR));
     }
   }
 
@@ -412,7 +412,7 @@
     port = atoi(UDP_PORT);
 
   alarm(2);
-  if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+  if ((fd = socket(AFINET, SOCK_DGRAM, 0)) == -1)
   {
     int err = errno;
     alarm(0);
@@ -489,7 +489,7 @@
   strcpy(cptr->sockhost, aconf->host);
   cptr->acpt = sptr;
   SetAskedPing(sptr);
-  memcpy(&cptr->ip, &aconf->ipnum, sizeof(struct in_addr));
+  memcpy(&cptr->ip, &aconf->ipnum, sizeof(struct IN_ADDR));
   strcpy(cptr->name, aconf->name);
   cptr->firsttime = 0;
 

Index: s_serv.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_serv.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_serv.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ s_serv.c	12 Sep 2002 19:02:15 -0000	1.2
@@ -1045,7 +1045,7 @@
 	    NumServ(acptr->user->server),
 	    acptr->name, acptr->hopcount + 1, acptr->lastnick,
 	    acptr->user->username, acptr->user->host,
-	    s, inttobase64(xxx_buf, ntohl(acptr->ip.s_addr), 6),
+	    s, inttobase64(xxx_buf, ntohl(acptr->ip.S_ADDR), 6),
 	    NumNick(acptr), acptr->info);
       }
     }

Index: s_socks.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_socks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_socks.c	12 Sep 2002 16:38:57 -0000	1.2
+++ s_socks.c	12 Sep 2002 19:02:15 -0000	1.3
@@ -108,7 +108,7 @@
  */
 void start_socks(aClient *cptr)
 {
-  struct sockaddr_in sock;
+  struct SOCKADDR_IN sock;
   int err;
   char text[1024];
   int cache;
@@ -141,7 +141,7 @@
       cptr, cptr->fd, cptr->status));
 
   alarm(2);
-  cptr->socksfd = socket(AF_INET, SOCK_STREAM, 0);
+  cptr->socksfd = socket(AFINET, SOCK_STREAM, 0);
   err = errno;
   alarm(0);
   if (cptr->socksfd < 0 && err == EAGAIN)
@@ -172,21 +172,21 @@
   set_non_blocking(cptr->socksfd, cptr);
 
 #ifdef VIRTUAL_HOST
-  if (bind(cptr->socksfd, (struct sockaddr *)&vserv, sizeof(vserv)) == -1)
+  if (bind(cptr->socksfd, (struct SOCKADDR *)&vserv, sizeof(vserv)) == -1)
   {
     report_error("binding socks stream socket %s: %s", cptr);
     close(cptr->fd);
     return;
   }
 #endif
-  memcpy(&sock.sin_addr, &cptr->ip, sizeof(struct in_addr));
+  memcpy(&sock.SIN_ADDR, &cptr->ip, sizeof(struct IN_ADDR));
 
-  sock.sin_port = htons(1080);
-  sock.sin_family = AF_INET;
+  sock.SIN_PORT = htons(1080);
+  sock.SIN_FAMILY = AFINET;
   sprintf_irc(text, PROXY_START, me.name);
   write(cptr->fd, text, strlen(text));
   alarm((unsigned)4);
-  if (connect(cptr->socksfd, (struct sockaddr *)&sock,
+  if (connect(cptr->socksfd, (struct SOCKADDR *)&sock,
       sizeof(sock)) == -1 && errno != EINPROGRESS)
   {
     ircstp->is_abad++;
@@ -219,7 +219,7 @@
  */
 void send_socksports(aClient *cptr)
 {
-  struct sockaddr_in us, them;
+  struct SOCKADDR_IN us, them;
   char socksbuf[255], *uname;
   size_t ulen, tlen;
   struct socks4 *sk;
@@ -228,8 +228,8 @@
   Debug((DEBUG_NOTICE, "write_socksports(%p) fd %d socksfd %d stat %d",
       cptr, cptr->fd, cptr->socksfd, cptr->status));
   tlen = ulen = sizeof(us);
-  if (getsockname(cptr->fd, (struct sockaddr *)&us, &ulen) ||
-      getpeername(cptr->fd, (struct sockaddr *)&them, &tlen))
+  if (getsockname(cptr->fd, (struct SOCKADDR *)&us, &ulen) ||
+      getpeername(cptr->fd, (struct SOCKADDR *)&them, &tlen))
   {
 #ifdef	USE_SYSLOG
     syslog(LOG_ERR, "socks get{sock,peer}name error for %s:%m",
@@ -243,13 +243,13 @@
 
   sk->vn = 4;
   sk->cd = 1;
-  sk->dstport = us.sin_port;
-  sk->dstip = us.sin_addr.s_addr;
+  sk->dstport = us.SIN_PORT;
+  sk->dstip = us.SIN_ADDR.S_ADDR;
 /* Ningun nombre de usuario */
   *uname = '\0';
 
   Debug((DEBUG_SEND, "sending connection request to socks port %s.1080",
-      inetntoa(them.sin_addr)));
+      inetntoa(them.SIN_ADDR)));
   if (write(cptr->socksfd, socksbuf, sizeof(struct socks4) + strlen(uname) + 1)
       != (int)(sizeof(struct socks4) + strlen(uname) + 1))
   {

Index: s_user.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/s_user.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- s_user.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ s_user.c	12 Sep 2002 19:02:15 -0000	1.2
@@ -693,7 +693,7 @@
       "%s NICK %s %d %d %s %s %s%s %s%s :%s",
       NumServ(user->server), nick, sptr->hopcount + 1, sptr->lastnick,
       user->username, user->host, tmpstr,
-      inttobase64(ip_base64, ntohl(sptr->ip.s_addr), 6),
+      inttobase64(ip_base64, ntohl(sptr->ip.S_ADDR), 6),
       NumNick(sptr), sptr->info);
 
 #else /* Remove the following when all servers are 2.10 */
@@ -730,7 +730,7 @@
       "%s NICK %s %d %d %s %s %s%s %s%s :%s",
       NumServ(user->server), nick, sptr->hopcount + 1, (int) (sptr->lastnick),
       user->username, user->host, tmpstr,
-      inttobase64(ip_base64, ntohl(sptr->ip.s_addr), 6),
+      inttobase64(ip_base64, ntohl(sptr->ip.S_ADDR), 6),
       NumNick(sptr), sptr->info);
   for (lp = me.serv->down; lp; lp = lp->next)
   {
@@ -1563,13 +1563,13 @@
     if (Protocol(cptr) < 10)
     {
       SetRemoteNumNick(sptr, nnp9);
-      sptr->ip.s_addr = 0;
+      sptr->ip.S_ADDR = 0;
     }
     else
     {
 #endif
       SetRemoteNumNick(sptr, parv[parc - 2]);
-      sptr->ip.s_addr = htonl(base64toint(parv[parc - 3]));
+      sptr->ip.S_ADDR = htonl(base64toint(parv[parc - 3]));
       /* IP# of remote client */
 #ifndef NO_PROTOCOL9
     }
@@ -4241,7 +4241,7 @@
     k[1] = base64toint(clave + 6);
 
     v[0] = (k[0] & 0xffff0000) + ts;
-    v[1] = ntohl((unsigned long)acptr->ip.s_addr);
+    v[1] = ntohl((unsigned long)acptr->ip.S_ADDR);
 
     tea(v, k, x);
 

Index: support.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/support.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- support.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ support.c	12 Sep 2002 19:02:15 -0000	1.2
@@ -111,10 +111,10 @@
  *                -argv 11/90.
  * inet_ntoa --   Its broken on some Ultrix/Dynix too. -avalon
  */
-char *inetntoa(struct in_addr in)
+char *inetntoa(struct IN_ADDR in)
 {
   static char buf[16];
-  Reg1 unsigned char *s = (unsigned char *)&in.s_addr;
+  Reg1 unsigned char *s = (unsigned char *)&in.S_ADDR;
   Reg2 unsigned char a, b, c, d;
 
   a = *s++;
@@ -131,7 +131,7 @@
  *    inet_netof --   return the net portion of an internet number
  *                    argv 11/90
  */
-int inet_netof(struct in_addr in)
+int inet_netof(struct IN_ADDR in)
 {
   int addr = in.s_net;
 

Index: whocmds.c
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/ircd/whocmds.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- whocmds.c	11 Sep 2002 10:09:09 -0000	1.1.1.1
+++ whocmds.c	12 Sep 2002 19:02:15 -0000	1.2
@@ -634,8 +634,8 @@
 	      || matchexec(acptr->info, mymask, minlen))
 	      && ((!(matchsel & WHO_FIELD_NIP))
 	      || (IsHidden(acptr) && !IsHiddenViewer(sptr))
-	      || ((((acptr->ip.s_addr & imask.mask.s_addr) !=
-	      imask.bits.s_addr)) || (imask.fall
+	      || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) !=
+	      imask.bits.S_ADDR)) || (imask.fall
 	      && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
 	    continue;
 #else
@@ -651,8 +651,8 @@
 	      && ((!(matchsel & WHO_FIELD_REN))
 	      || matchexec(acptr->info, mymask, minlen))
 	      && ((!(matchsel & WHO_FIELD_NIP))
-	      || ((((acptr->ip.s_addr & imask.mask.s_addr) !=
-	      imask.bits.s_addr)) || (imask.fall
+	      || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) !=
+	      imask.bits.S_ADDR)) || (imask.fall
 	      && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
 	    continue;
 #endif
@@ -695,7 +695,7 @@
 	    || matchexec(acptr->info, mymask, minlen))
 	    && ((!(matchsel & WHO_FIELD_NIP))
 	    || (IsHidden(acptr) && !IsHiddenViewer(sptr))
-	    || ((((acptr->ip.s_addr & imask.mask.s_addr) != imask.bits.s_addr))
+	    || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) != imask.bits.S_ADDR))
 	    || (imask.fall
 	    && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
 	  continue;
@@ -712,7 +712,7 @@
 	    && ((!(matchsel & WHO_FIELD_REN))
 	    || matchexec(acptr->info, mymask, minlen))
 	    && ((!(matchsel & WHO_FIELD_NIP))
-	    || ((((acptr->ip.s_addr & imask.mask.s_addr) != imask.bits.s_addr))
+	    || ((((acptr->ip.S_ADDR & imask.mask.S_ADDR) != imask.bits.S_ADDR))
 	    || (imask.fall
 	    && matchexec(inet_ntoa(acptr->ip), mymask, minlen)))))
 	  continue;

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6/include inet.h,1.1,1.2 match.h,1.2,1.3 patchlevel.h,1.2,1.3 res.h,1.2,1.3 s_bsd.h,1.2,1.3 s_conf.h,1.2,1.3 struct.h,1.2,1.3 support.h,1.2,1.3

From: Zolty <zo...@us...> - 2002-09-12 19:02:17

Update of /cvsroot/irc-dev/ipv6/include
In directory usw-pr-cvs1:/tmp/cvs-serv23000/include

Modified Files:
	inet.h match.h patchlevel.h res.h s_bsd.h s_conf.h struct.h 
	support.h 
Log Message:
INET6.2

Index: inet.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/inet.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inet.h	12 Sep 2002 16:38:57 -0000	1.1
+++ inet.h	12 Sep 2002 19:02:14 -0000	1.2
@@ -26,6 +26,15 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
+#define		AFINET		AF_INET
+#define		SOCKADDR_IN	sockaddr_in
+#define		SOCKADDR	sockaddr
+#define		SIN_FAMILY	sin_family
+#define		SIN_PORT	sin_port   
+#define		SIN_ADDR	sin_addr
+#define		S_ADDR		s_addr
+#define		IN_ADDR		in_addr
+
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff

Index: match.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/match.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- match.h	12 Sep 2002 16:38:57 -0000	1.2
+++ match.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -10,8 +10,8 @@
  */
 
 struct in_mask {
-  struct in_addr bits;
-  struct in_addr mask;
+  struct IN_ADDR bits;
+  struct IN_ADDR mask;
   int fall;
 };
 

Index: patchlevel.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/patchlevel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- patchlevel.h	12 Sep 2002 16:38:57 -0000	1.2
+++ patchlevel.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.1"
+		"+INET6.2"
 
 /*
  * Deliberate empty lines

Index: res.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/res.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- res.h	12 Sep 2002 16:38:57 -0000	1.2
+++ res.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -22,7 +22,7 @@
 extern void del_queries(char *cp);
 extern void add_local_domain(char *hname, int size);
 extern struct hostent *gethost_byname(char *name, Link *lp);
-extern struct hostent *gethost_byaddr(struct in_addr *addr, Link *lp);
+extern struct hostent *gethost_byaddr(struct IN_ADDR *addr, Link *lp);
 extern struct hostent *get_res(char *lp);
 extern time_t expire_cache(void);
 extern void flush_cache(void);

Index: s_bsd.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/s_bsd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_bsd.h	12 Sep 2002 16:38:57 -0000	1.2
+++ s_bsd.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -189,7 +189,7 @@
 extern unsigned int readcalls;
 extern aClient *loc_clients[MAXCONNECTIONS];
 #ifdef VIRTUAL_HOST
-extern struct sockaddr_in vserv;
+extern struct SOCKADDR_IN vserv;
 #endif
 
 #if defined(BDD)

Index: s_conf.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/s_conf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- s_conf.h	12 Sep 2002 16:38:57 -0000	1.2
+++ s_conf.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -56,7 +56,7 @@
 struct ConfItem {
   unsigned int status;		/* If CONF_ILLEGAL, delete when no clients */
   unsigned int clients;		/* Number of *LOCAL* clients using this */
-  struct in_addr ipnum;		/* ip number of host field */
+  struct IN_ADDR ipnum;		/* ip number of host field */
   char *host;
   char *passwd;
   char *name;

Index: struct.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/struct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- struct.h	12 Sep 2002 16:38:57 -0000	1.2
+++ struct.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -22,7 +22,7 @@
 #ifndef STRUCT_H
 #define STRUCT_H
 
-#include "inet.h"		/* Needed for struct in_addr */
+#include "inet.h"		/* Needed for struct IN_ADDR */
 #include "whowas.h"		/* Needed for whowas struct */
 
 #ifndef INCLUDED_dbuf_h
@@ -95,7 +95,7 @@
   int fd;			/* >= 0, for local clients */
   unsigned int hopcount;	/* number of servers to this 0 = local */
   short status;			/* Client type */
-  struct in_addr ip;		/* Real ip# - NOT defined for remote servers! */
+  struct IN_ADDR ip;		/* Real ip# - NOT defined for remote servers! */
   char name[HOSTLEN + 1];	/* Unique name of the client, nick or host */
   char username[USERLEN + 1];	/* username here now for auth stuff */
   char info[REALLEN + 1];	/* Free form additional client information */

Index: support.h
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/include/support.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- support.h	12 Sep 2002 16:38:57 -0000	1.2
+++ support.h	12 Sep 2002 19:02:14 -0000	1.3
@@ -14,7 +14,7 @@
 #endif
 extern void dumpcore(const char *pattern, ...)
     __attribute__ ((format(printf, 1, 2)));
-extern char *inetntoa(struct in_addr in);
+extern char *inetntoa(struct IN_ADDR in);
 extern int check_if_ipmask(const char *mask);
 extern void write_log(const char *filename, const char *pattern, ...);

[IPv6 IRC-DEV] Modulo Hispano-IPv6 ipv6 CAMBIOS.Ipv6,1.1,1.2 Ipv6.zoltan,1.5,1.6

From: Zolty <zo...@us...> - 2002-09-12 19:02:16

Update of /cvsroot/irc-dev/ipv6
In directory usw-pr-cvs1:/tmp/cvs-serv23000

Modified Files:
	CAMBIOS.Ipv6 Ipv6.zoltan 
Log Message:
INET6.2

Index: CAMBIOS.Ipv6
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/CAMBIOS.Ipv6,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CAMBIOS.Ipv6	12 Sep 2002 16:38:57 -0000	1.1
+++ CAMBIOS.Ipv6	12 Sep 2002 19:02:13 -0000	1.2
@@ -1,3 +1,8 @@
+* 2002/09/12 zo...@ir...          INET6.2
+----------------------------------------------------------------------- 
+Creamos en inet.h macros de la familia de protocolos IP (solo IPv4) y
+lo cambiamos por todo el codigo.
+ 
 * 2002/09/12 zo...@ir...          INET6.1
 -----------------------------------------------------------------------
 Creacion del archivo "inet.h" y movidos los includes que hagan referencia

Index: Ipv6.zoltan
===================================================================
RCS file: /cvsroot/irc-dev/ipv6/Ipv6.zoltan,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Ipv6.zoltan	12 Sep 2002 16:38:57 -0000	1.5
+++ Ipv6.zoltan	12 Sep 2002 19:02:13 -0000	1.6
@@ -11,6 +11,7 @@
      sys/socket.h
      arpa/inet.h
    Y poner el include "inet.h" en los *.c que hagan falta y hacer un "make depend".
+   (HECHO)
 
 3º Crear defines para las familias:

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 2 3 4 > >> (Page 3 of 4)

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (49)	Oct (6)	Nov (5)	Dec (2)
2003	Jan (8)	Feb (11)	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec
2004	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec