WCCP sysctl variable -- ok deraadt@ niklas@

2 files changed, 9 insertions, 3 deletions

diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 27c6f00d41a..840ef9236c3 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.17 2001/06/27 03:49:53 angelos Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.18 2002/04/03 20:35:58 angelos Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -108,9 +108,14 @@ int ngre = 0;
 /*
  * We can control the acceptance of GRE and MobileIP packets by
  * altering the sysctl net.inet.gre.allow and net.inet.mobileip.allow values
- * respectively. Zero means drop them, all else is acceptance.
+ * respectively. Zero means drop them, all else is acceptance.  We can also
+ * control acceptance of WCCPv1-style GRE packets through the
+ * net.inet.gre.wccp value, but be aware it depends upon normal GRE being
+ * allowed as well.
+ * 
  */
 int gre_allow = 0;
+int gre_wccp = 0;
 int ip_mobile_allow = 0;
 
 static void gre_compute_route(struct gre_softc *sc);
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 502d090a169..b6a3d8ec95d 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.h,v 1.5 2002/03/14 01:27:09 millert Exp $ */
+/*      $OpenBSD: if_gre.h,v 1.6 2002/04/03 20:35:58 angelos Exp $ */
 /*	$NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */
 
 /*
@@ -141,6 +141,7 @@ struct mobip_h {
 extern	struct gre_softc *gre;
 extern	int ngre;
 extern  int gre_allow;   
+extern  int gre_wccp;
 extern  int ip_mobile_allow;
 
 void	greattach(int);