[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

[Zolty <zo...@us...>]

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, ...);