From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 20 Jul 2012 11:37:43 +0000 (-0600)
Subject: Silence IOS 15.1 unknown capabilities messages.
X-Git-Tag: sourceformat-review-1~170
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=43f3d687fdb6fd87b416101decca42c4c3c181da;p=thirdparty%2Fsquid.git

Silence IOS 15.1 unknown capabilities messages.

Its nice to know when new capabilities are added.
But we don't need to report after being informed about them.

TODO: reduce the message to once every thousand or so.
  But be careful to identify what different type numbers exist.
---

diff --git a/src/wccp2.cc b/src/wccp2.cc
index 521fee239d..4996e071be 100644
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -331,6 +331,8 @@ static struct wccp2_capability_element_t wccp2_capability_element;
 #define WCCP2_CAPABILITY_FORWARDING_METHOD	0x01
 #define WCCP2_CAPABILITY_ASSIGNMENT_METHOD	0x02
 #define WCCP2_CAPABILITY_RETURN_METHOD		0x03
+// 0x04 ?? - advertised by a 4507 (ios v15.1) Cisco switch
+// 0x05 ?? - advertised by a 4507 (ios v15.1) Cisco switch
 
 /* capability values */
 #define WCCP2_METHOD_GRE		0x00000001
@@ -1384,6 +1386,10 @@ wccp2HandleUdp(int sock, void *not_used)
 
                 break;
 
+            case 4:
+            case 5:
+                break; // ignore silently for now
+
             default:
                 debugs(80, 1, "Unknown capability type in WCCPv2 Packet (" << ntohs(router_capability_element->capability_type) << ").");
             }