---------------------
PatchSet 5491 
Date: 2007/08/25 02:11:46
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix typo in WCCP startup checks.
Add checks to WCCPv2 startup.

Members: 
	src/wccp.cc:1.10.2.14->1.10.2.15 
	src/wccp2.cc:1.13.2.11->1.13.2.12 

Index: squid3/src/wccp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/wccp.cc,v
retrieving revision 1.10.2.14
retrieving revision 1.10.2.15
diff -u -r1.10.2.14 -r1.10.2.15
--- squid3/src/wccp.cc	8 Aug 2007 23:20:54 -0000	1.10.2.14
+++ squid3/src/wccp.cc	25 Aug 2007 02:11:46 -0000	1.10.2.15
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wccp.cc,v 1.10.2.14 2007/08/08 23:20:54 amosjeffries Exp $
+ * $Id: wccp.cc,v 1.10.2.15 2007/08/25 02:11:46 amosjeffries Exp $
  *
  * DEBUG: section 80    WCCP Support
  * AUTHOR: Glenn Chisholm
@@ -139,8 +139,13 @@
         return;
     }
 
-    if (Config.Wccp.router.IsIPv4()) {
-        debugs(1, 1, "WCCP Disabled. IPv4 required.");
+    if ( !Config.Wccp.router.SetIPv4() ) {
+        debugs(1, 1, "WCCPv1 Disabled. Router " << Config.Wccp.router << " is not IPv4.");
+        return;
+    }
+
+    if ( !Config.Wccp.address.SetIPv4() ) {
+        debugs(1, 1, "WCCPv1 Disabled. Local address " << Config.Wccp.address << " is not IPv4.");
         return;
     }
 
Index: squid3/src/wccp2.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/wccp2.cc,v
retrieving revision 1.13.2.11
retrieving revision 1.13.2.12
diff -u -r1.13.2.11 -r1.13.2.12
--- squid3/src/wccp2.cc	8 Aug 2007 23:20:54 -0000	1.13.2.11
+++ squid3/src/wccp2.cc	25 Aug 2007 02:11:47 -0000	1.13.2.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wccp2.cc,v 1.13.2.11 2007/08/08 23:20:54 amosjeffries Exp $
+ * $Id: wccp2.cc,v 1.13.2.12 2007/08/25 02:11:47 amosjeffries Exp $
  *
  * DEBUG: section 80    WCCP Support
  * AUTHOR: Steven Wilton
@@ -976,6 +976,11 @@
         return;
     }
 
+    if( !Config.Wccp2.address.SetIPv4() ) {
+        debugs(80, 0, "WCCPv2 Disabled. " << Config.Wccp2.address << " is not an IPv4 address.");
+        return;
+    }
+
     Config.Wccp2.address.SetPort(WCCP_PORT);
     theWccp2Connection = comm_open(SOCK_DGRAM,
                                    0,