[IPv6 IRC-DEV] [CVS] Module ipv6: Change committed

[Toni G. <zo...@us...>]

CVSROOT    : /cvsroot/irc-dev
Module     : ipv6
Commit time: 2002-12-17 10:41:08 UTC

Modified files:
     CAMBIOS.Ipv6 include/patchlevel.h ircd/IPcheck.c ircd/s_bsd.c
     ircd/s_socks.c

Log message:

INET 6.13

---------------------- diff included ----------------------
Index: ipv6/CAMBIOS.Ipv6
diff -u ipv6/CAMBIOS.Ipv6:1.12 ipv6/CAMBIOS.Ipv6:1.13
--- ipv6/CAMBIOS.Ipv6:1.12	Sat Nov  9 06:52:54 2002
+++ ipv6/CAMBIOS.Ipv6	Tue Dec 17 02:40:57 2002
@@ -1,3 +1,8 @@
+* 2002/12/17 zo...@ir...          INET6.13
+-----------------------------------------------------------------------
+Compila con VIRTUAL_HOST y PROXY_PROTECTION activados y desactivados :)
+Ya solo queda por arreglar el de VIP, que hay que desactivar.
+
 * 2002/11/09 zo...@ir...          INET6.12
 -----------------------------------------------------------------------
 Actualizacion IRCD hasta el u2.10.H.06.13.
Index: ipv6/include/patchlevel.h
diff -u ipv6/include/patchlevel.h:1.13 ipv6/include/patchlevel.h:1.14
--- ipv6/include/patchlevel.h:1.13	Sat Nov  9 06:52:54 2002
+++ ipv6/include/patchlevel.h	Tue Dec 17 02:40:58 2002
@@ -49,7 +49,7 @@
 		\
 		\
 		\
-		"+INET6.12"
+		"+INET6.13"
 
 /*
  * Deliberate empty lines
Index: ipv6/ircd/IPcheck.c
diff -u ipv6/ircd/IPcheck.c:1.5 ipv6/ircd/IPcheck.c:1.6
--- ipv6/ircd/IPcheck.c:1.5	Mon Sep 16 05:22:13 2002
+++ ipv6/ircd/IPcheck.c	Tue Dec 17 02:40:58 2002
@@ -37,8 +37,7 @@
 #include "support.h"
 #endif
 
-#ifndef INET6
-RCSTAG_CC("$Id: IPcheck.c,v 1.5 2002/09/16 12:22:13 zolty Exp $");
+RCSTAG_CC("$Id: IPcheck.c,v 1.6 2002/12/17 10:40:58 zolty Exp $");
 
 extern aClient me;
 extern time_t now;
@@ -97,7 +96,7 @@
  * 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
+#ifdef INET61
 /*
  * CALCULATE_HASH for IPv6 address
  */
@@ -670,4 +669,3 @@
 }
 
 #endif
-#endif /* !INET6 */
Index: ipv6/ircd/s_bsd.c
diff -u ipv6/ircd/s_bsd.c:1.6 ipv6/ircd/s_bsd.c:1.7
--- ipv6/ircd/s_bsd.c:1.6	Mon Sep 16 05:22:13 2002
+++ ipv6/ircd/s_bsd.c	Tue Dec 17 02:40:58 2002
@@ -97,7 +97,7 @@
 #include "msg.h"
 #endif
 
-RCSTAG_CC("$Id: s_bsd.c,v 1.6 2002/09/16 12:22:13 zolty Exp $");
+RCSTAG_CC("$Id: s_bsd.c,v 1.7 2002/12/17 10:40:58 zolty Exp $");
 
 #define IP_LOOKUP_START ":%s NOTICE IP_LOOKUP :*** Looking up your hostname...\r\n"
 #define IP_LOOKUP_OK ":%s NOTICE IP_LOOKUP :*** Found your hostname.\r\n"
@@ -310,10 +310,13 @@
   if (port)
   {
     server.SIN_FAMILY = AFINET;
-/* FIXME-ZOLTAN */
 #ifndef VIRTUAL_HOST
-    server.SIN_ADDR.S_ADDR = INADDR_ANY;
+#ifdef INET6
+  memset(server.SIN_ADDR.S_ADDR, 0x0, sizeof(struct IN_ADDR));
 #else
+    server.SIN_ADDR.S_ADDR = INADDR_ANY;
+#endif
+#else /* VIRTUAL_HOST */
     server.SIN_ADDR = vserv.SIN_ADDR;
 #endif
 #ifdef TESTNET
@@ -2647,9 +2650,19 @@
 
   memset(&from, 0, sizeof(from));
 #ifdef VIRTUAL_HOST
+#ifdef INET6
+  memset(from.SIN_ADDR.S_ADDR, 0x0, sizeof(struct IN_ADDR));
+ /* provisional, tiene que ser una copia */
+ /* FIXME-ZOLTAN */
+#else
   from.SIN_ADDR = vserv.SIN_ADDR;
+#endif
+#else /* VIRTUALHOST */
+#ifdef INET6
+  memset(from.SIN_ADDR.S_ADDR, 0x0, sizeof(struct IN_ADDR));
 #else
   from.SIN_ADDR.S_ADDR = htonl(INADDR_ANY);
+#endif
 #endif
 #ifdef TESTNET
   from.SIN_PORT = htons(atoi(UDP_PORT) + 10000);
Index: ipv6/ircd/s_socks.c
diff -u ipv6/ircd/s_socks.c:1.3 ipv6/ircd/s_socks.c:1.4
--- ipv6/ircd/s_socks.c:1.3	Thu Sep 12 12:02:15 2002
+++ ipv6/ircd/s_socks.c	Tue Dec 17 02:40:58 2002
@@ -60,7 +60,7 @@
 
 #ifdef PROXY_PROTECTION
 
-RCSTAG_CC("$Id: s_socks.c,v 1.3 2002/09/12 19:02:15 zolty Exp $");
+RCSTAG_CC("$Id: s_socks.c,v 1.4 2002/12/17 10:40:58 zolty Exp $");
 
 #define PROXY_START ":%s NOTICE SOCKS4 :*** Checking WinGate/SocksProxy security...\r\n"
 #define PROXY_PASS ":%s NOTICE SOCKS4 :*** Proxy test passed.\r\n"
@@ -244,7 +244,12 @@
   sk->vn = 4;
   sk->cd = 1;
   sk->dstport = us.SIN_PORT;
+#ifdef INET6
+
+#else
   sk->dstip = us.SIN_ADDR.S_ADDR;
+#endif
+
 /* Ningun nombre de usuario */
   *uname = '\0';
 
----------------------- End of diff -----------------------