--------------------- PatchSet 6026 Date: 2007/10/28 10:12:13 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: NetBIOS is now officially obsolete and is never expected to support IPv6. - reverts IN_ADDR back to IPv4-only in_addr in all NetBIOS code. Ref: http://lists.samba.org/archive/samba-technical/2007-March/052210.html Members: helpers/basic_auth/MSNT/rfcnb-priv.h:1.1.30.1->1.1.30.2 helpers/basic_auth/MSNT/rfcnb-util.c:1.1.30.3->1.1.30.4 helpers/basic_auth/MSNT/rfcnb-util.h:1.1.30.1->1.1.30.2 helpers/basic_auth/MSNT/session.c:1.1.30.3->1.1.30.4 helpers/ntlm_auth/SMB/smbval/rfcnb-priv.h:1.1.30.1->1.1.30.2 helpers/ntlm_auth/SMB/smbval/rfcnb-util.c:1.2.8.3->1.2.8.4 helpers/ntlm_auth/SMB/smbval/rfcnb-util.h:1.1.30.1->1.1.30.2 helpers/ntlm_auth/SMB/smbval/session.c:1.2.8.2->1.2.8.3 include/config.h:1.7.4.19->1.7.4.20 src/wccp2.cc:1.13.2.12->1.13.2.13 Index: squid3/helpers/basic_auth/MSNT/rfcnb-priv.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/MSNT/rfcnb-priv.h,v retrieving revision 1.1.30.1 retrieving revision 1.1.30.2 diff -u -r1.1.30.1 -r1.1.30.2 --- squid3/helpers/basic_auth/MSNT/rfcnb-priv.h 19 Apr 2005 10:57:53 -0000 1.1.30.1 +++ squid3/helpers/basic_auth/MSNT/rfcnb-priv.h 28 Oct 2007 10:12:13 -0000 1.1.30.2 @@ -55,7 +55,7 @@ struct redirect_addr { - struct IN_ADDR ip_addr; + struct in_addr ip_addr; int port; redirect_ptr next; Index: squid3/helpers/basic_auth/MSNT/rfcnb-util.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/MSNT/rfcnb-util.c,v retrieving revision 1.1.30.3 retrieving revision 1.1.30.4 diff -u -r1.1.30.3 -r1.1.30.4 --- squid3/helpers/basic_auth/MSNT/rfcnb-util.c 13 Jun 2007 08:23:25 -0000 1.1.30.3 +++ squid3/helpers/basic_auth/MSNT/rfcnb-util.c 28 Oct 2007 10:12:13 -0000 1.1.30.4 @@ -345,7 +345,7 @@ /* Resolve a name into an address */ int -RFCNB_Name_To_IP(char *host, struct IN_ADDR *Dest_IP) +RFCNB_Name_To_IP(char *host, struct in_addr *Dest_IP) { int addr; /* Assumes IP4, 32 bit network addresses */ struct hostent *hp; @@ -395,7 +395,7 @@ * Not sure how to handle socket options etc. */ int -RFCNB_IP_Connect(struct IN_ADDR Dest_IP, int port) +RFCNB_IP_Connect(struct in_addr Dest_IP, int port) { struct sockaddr_in Socket; int fd; @@ -437,7 +437,7 @@ char *Called_Name, char *Calling_Name, BOOL * redirect, - struct IN_ADDR *Dest_IP, + struct in_addr *Dest_IP, int *port) { char *sess_pkt; @@ -537,7 +537,7 @@ *redirect = TRUE; /* Copy port and ip addr */ - memcpy(Dest_IP, (resp + RFCNB_Pkt_IP_Offset), sizeof(struct IN_ADDR)); + memcpy(Dest_IP, (resp + RFCNB_Pkt_IP_Offset), sizeof(struct in_addr)); *port = SVAL(resp, RFCNB_Pkt_Port_Offset); return (0); Index: squid3/helpers/basic_auth/MSNT/rfcnb-util.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/MSNT/rfcnb-util.h,v retrieving revision 1.1.30.1 retrieving revision 1.1.30.2 diff -u -r1.1.30.1 -r1.1.30.2 --- squid3/helpers/basic_auth/MSNT/rfcnb-util.h 19 Apr 2005 10:57:53 -0000 1.1.30.1 +++ squid3/helpers/basic_auth/MSNT/rfcnb-util.h 28 Oct 2007 10:12:13 -0000 1.1.30.2 @@ -35,17 +35,17 @@ void RFCNB_Print_Pkt(FILE * fd, char *dirn, struct RFCNB_Pkt *pkt, int len); -int RFCNB_Name_To_IP(char *host, struct IN_ADDR *Dest_IP); +int RFCNB_Name_To_IP(char *host, struct in_addr *Dest_IP); int RFCNB_Close(int socket); -int RFCNB_IP_Connect(struct IN_ADDR Dest_IP, int port); +int RFCNB_IP_Connect(struct in_addr Dest_IP, int port); int RFCNB_Session_Req(RFCNB_Con * con, char *Called_Name, char *Calling_Name, BOOL * redirect, - struct IN_ADDR *Dest_IP, + struct in_addr *Dest_IP, int *port); void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt); Index: squid3/helpers/basic_auth/MSNT/session.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/MSNT/session.c,v retrieving revision 1.1.30.3 retrieving revision 1.1.30.4 diff -u -r1.1.30.3 -r1.1.30.4 --- squid3/helpers/basic_auth/MSNT/session.c 4 Aug 2007 00:20:50 -0000 1.1.30.3 +++ squid3/helpers/basic_auth/MSNT/session.c 28 Oct 2007 10:12:13 -0000 1.1.30.4 @@ -56,7 +56,7 @@ int port) { struct RFCNB_Con *con; - struct IN_ADDR Dest_IP; + struct in_addr Dest_IP; int Client; BOOL redirect; struct redirect_addr *redir_addr; Index: squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-priv.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-priv.h,v retrieving revision 1.1.30.1 retrieving revision 1.1.30.2 diff -u -r1.1.30.1 -r1.1.30.2 --- squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-priv.h 19 Apr 2005 10:57:54 -0000 1.1.30.1 +++ squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-priv.h 28 Oct 2007 10:12:13 -0000 1.1.30.2 @@ -59,7 +59,7 @@ struct redirect_addr { - struct IN_ADDR ip_addr; + struct in_addr ip_addr; int port; redirect_ptr next; Index: squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c,v retrieving revision 1.2.8.3 retrieving revision 1.2.8.4 diff -u -r1.2.8.3 -r1.2.8.4 --- squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c 13 Jun 2007 08:31:20 -0000 1.2.8.3 +++ squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c 28 Oct 2007 10:12:13 -0000 1.2.8.4 @@ -320,7 +320,7 @@ /* Resolve a name into an address */ int -RFCNB_Name_To_IP(char *host, struct IN_ADDR *Dest_IP) +RFCNB_Name_To_IP(char *host, struct in_addr *Dest_IP) { int addr; /* Assumes IP4, 32 bit network addresses */ struct hostent *hp; @@ -370,7 +370,7 @@ * Not sure how to handle socket options etc. */ int -RFCNB_IP_Connect(struct IN_ADDR Dest_IP, int port) +RFCNB_IP_Connect(struct in_addr Dest_IP, int port) { struct sockaddr_in Socket; int fd; @@ -412,7 +412,7 @@ char *Called_Name, char *Calling_Name, BOOL * redirect, - struct IN_ADDR *Dest_IP, + struct in_addr *Dest_IP, int *port) { char *sess_pkt; @@ -512,7 +512,7 @@ *redirect = TRUE; /* Copy port and ip addr */ - memcpy(Dest_IP, (resp + RFCNB_Pkt_IP_Offset), sizeof(struct IN_ADDR)); + memcpy(Dest_IP, (resp + RFCNB_Pkt_IP_Offset), sizeof(struct in_addr)); *port = SVAL(resp, RFCNB_Pkt_Port_Offset); return (0); Index: squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.h,v retrieving revision 1.1.30.1 retrieving revision 1.1.30.2 diff -u -r1.1.30.1 -r1.1.30.2 --- squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.h 19 Apr 2005 10:57:54 -0000 1.1.30.1 +++ squid3/helpers/ntlm_auth/SMB/smbval/rfcnb-util.h 28 Oct 2007 10:12:14 -0000 1.1.30.2 @@ -38,15 +38,15 @@ void RFCNB_Print_Pkt(FILE * fd, char *dirn, struct RFCNB_Pkt *pkt, int len); -int RFCNB_Name_To_IP(char *host, struct IN_ADDR *Dest_IP); +int RFCNB_Name_To_IP(char *host, struct in_addr *Dest_IP); int RFCNB_Close(int socket); -int RFCNB_IP_Connect(struct IN_ADDR Dest_IP, int port); +int RFCNB_IP_Connect(struct in_addr Dest_IP, int port); int RFCNB_Session_Req(struct RFCNB_Con *con, char *Called_Name, char *Calling_Name, BOOL * redirect, - struct IN_ADDR *Dest_IP, + struct in_addr *Dest_IP, int *port); Index: squid3/helpers/ntlm_auth/SMB/smbval/session.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/SMB/smbval/session.c,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.3 diff -u -r1.2.8.2 -r1.2.8.3 --- squid3/helpers/ntlm_auth/SMB/smbval/session.c 4 Aug 2007 00:20:50 -0000 1.2.8.2 +++ squid3/helpers/ntlm_auth/SMB/smbval/session.c 28 Oct 2007 10:12:14 -0000 1.2.8.3 @@ -77,7 +77,7 @@ int port) { struct RFCNB_Con *con; - struct IN_ADDR Dest_IP; + struct in_addr Dest_IP; int Client; BOOL redirect; struct redirect_addr *redir_addr; Index: squid3/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/config.h,v retrieving revision 1.7.4.19 retrieving revision 1.7.4.20 diff -u -r1.7.4.19 -r1.7.4.20 --- squid3/include/config.h 21 Sep 2007 12:34:14 -0000 1.7.4.19 +++ squid3/include/config.h 28 Oct 2007 10:12:14 -0000 1.7.4.20 @@ -1,5 +1,5 @@ /* - * $Id: config.h,v 1.7.4.19 2007/09/21 12:34:14 amosjeffries Exp $ + * $Id: config.h,v 1.7.4.20 2007/10/28 10:12:14 amosjeffries Exp $ * * AUTHOR: Duane Wessels * @@ -193,14 +193,6 @@ #define FD_SETSIZE SQUID_MAXFD #endif - - -/* - * This is hack to allow compiling IPv6-IPv4 version, - * not disturbing branches others than squid3-ipv6 - */ -#define IN_ADDR in_addr - /* Typedefs for missing entries on a system */ #include "squid_types.h" Index: squid3/src/wccp2.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/wccp2.cc,v retrieving revision 1.13.2.12 retrieving revision 1.13.2.13 diff -u -r1.13.2.12 -r1.13.2.13 --- squid3/src/wccp2.cc 25 Aug 2007 02:11:47 -0000 1.13.2.12 +++ squid3/src/wccp2.cc 28 Oct 2007 10:12:14 -0000 1.13.2.13 @@ -1,6 +1,6 @@ /* - * $Id: wccp2.cc,v 1.13.2.12 2007/08/25 02:11:47 amosjeffries Exp $ + * $Id: wccp2.cc,v 1.13.2.13 2007/10/28 10:12:14 amosjeffries Exp $ * * DEBUG: section 80 WCCP Support * AUTHOR: Steven Wilton @@ -39,6 +39,7 @@ #include "Parsing.h" #include "Store.h" #include "SwapDir.h" +#include "IPAddress.h" #if USE_WCCPv2 #include