From zeek@radius2.cdsinet.net  Fri Dec 12 09:35:46 2003
Return-Path: <zeek@radius2.cdsinet.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F1B4F16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Dec 2003 09:35:46 -0800 (PST)
Received: from radius2.cdsinet.net (radius2.cdsinet.net [65.167.168.13])
	by mx1.FreeBSD.org (Postfix) with SMTP id EC30F43D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Dec 2003 09:35:45 -0800 (PST)
	(envelope-from zeek@radius2.cdsinet.net)
Received: (qmail 78359 invoked by uid 1000); 12 Dec 2003 17:35:50 -0000
Message-Id: <20031212173550.78358.qmail@radius2.cdsinet.net>
Date: 12 Dec 2003 17:35:50 -0000
From: John Narron <jnarron@cdsinet.net>
Reply-To: John Narron <jnarron@cdsinet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: No WCCPv2 support in gre
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60183
>Category:       kern
>Synopsis:       [gre] [patch] No WCCPv2 support in gre
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 12 09:40:18 PST 2003
>Closed-Date:    Mon Feb 11 21:13:25 UTC 2008
>Last-Modified:  Mon Feb 11 21:13:25 UTC 2008
>Originator:     John Narron
>Release:        FreeBSD 5.1-RELEASE-p11 i386
>Organization:
CDS/CDSinet, LLC
>Environment:
System: FreeBSD radius2.cdsinet.net 5.1-RELEASE-p11 FreeBSD 5.1-RELEASE-p11 #14: Thu Dec 11 16:16:13 CST 2003 zeek@radius2.cdsinet.net:/usr/obj/usr/src/sys/RADIUS i386


>Description:
	The gre driver has support for WCCP, but lacks WCCPv2 support.  WCCPv2 packets, when arriving on a gre device, appear as IPv0 packets.

>How-To-Repeat:
	Can't repeat something that isn't supported now can we?
>Fix:

	Attached is a patch to check if m->m_data+hlen is a IPv4 header.  If so its assumed the packet is WCCPv1, otherwise its WCCPv2 and hlen is incremented by 4.


--- ip_gre.c    Fri Dec 12 16:50:49 2003
+++ ip_gre.c.wccpv2     Fri Dec 12 16:58:13 2003
@@ -172,8 +172,26 @@
 
                switch (ntohs(gip->gi_ptype)) { /* ethertypes */
                case ETHERTYPE_IP: /* shouldn't need a schednetisr(), as */
+                       isr = NETISR_IP;
+                       break;
                case WCCP_PROTOCOL_TYPE: /* we are in ip_input */
-                       isr = NETISR_IP;        
+                       isr = NETISR_IP;
+                       /*
+                        * jnarron@cdsinet.net
+                        * WCCPv1 and WCCPv2 packet encapsulations differ by 4 octets
+                        * WCCPv2 adds:
+                        *       octet 0: Flags
+                        *   octet 1: Service ID
+                        *   octet 2: Reserved?
+                        *   octet 3: Primary bucket index
+                        *
+                        * So far I haven't found any use for those 4 octets, so for now
+                        * we just strip them out and move on.
+                        */ 
+
+                       if(!((*(m->m_data + hlen)) & 0x40))
+                               hlen += 4;
+
                        break;
 #ifdef NETATALK
                case ETHERTYPE_ATALK:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->sobomax 
Responsible-Changed-By: arved 
Responsible-Changed-When: Mon Sep 6 14:28:21 GMT 2004 
Responsible-Changed-Why:  
WCCPv2 support was committed to current by sobomax. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60183 

From: Volker <volker@vwsoft.com>
To: bug-followup@FreeBSD.org, jnarron@cdsinet.net
Cc:  
Subject: Re: kern/60183: [gre] [patch] No WCCPv2 support in gre
Date: Mon, 11 Feb 2008 11:54:54 +0100

 > WCCPv2 support was committed to current by sobomax.
 
 Support for WCCPv2 has been added for RELENG_5 (and up) Jan 2004, file
 sys/netinet/ip_gre.c rev 1.14 (according to CVS log).
 
 Can we close this PR?

From: Volker <volker@vwsoft.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/60183: [gre] [patch] No WCCPv2 support in gre
Date: Mon, 11 Feb 2008 12:16:46 +0100

 Mail to submitter bounces:
 X-Postfix; host barracuda.cdsinet.net[65.167.175.8] said:
 550 cuda_nsu unknown user <jnarron@cdsinet.net> (in reply to RCPT TO
 command)
State-Changed-From-To: open->closed 
State-Changed-By: remko 
State-Changed-When: Mon Feb 11 21:13:24 UTC 2008 
State-Changed-Why:  
Volker reports: submitters mail bounces closing the ticket. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60183 
>Unformatted:
