From b9d9b335707727e0e3679b1d7023e17d318eec5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sat, 6 Nov 2010 02:44:15 +0200
Subject: auth-snmp: Procurve 1810G P2.1 has BRIDGE-MIB fixed

Don't enable the workaroudn if new enough firmware is detected.
---
 squark-auth-snmp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/squark-auth-snmp.c b/squark-auth-snmp.c
index b425e70..f3761dd 100644
--- a/squark-auth-snmp.c
+++ b/squark-auth-snmp.c
@@ -902,8 +902,13 @@ static int auth_handle_switch_info_reply(int oper, netsnmp_session *s, int reqid
 	if (blob_pull_matching(&b, BLOB_OID(HP_ICF_OID_hpEtherSwitch))) {
 		/* Hewlett-Packard ProCurve Switches */
 		switch (blob_pull_oid(&b)) {
-		case 104: /* 1810G-24 */
-			si->flags |= SWITCHF_BRIDGE_MIB_HAS_VLAN;
+		case 104: /* 1810G-24 with <P1.18 is useless
+			   *                P1.19-P1.20 has BRIDGE-MIB bug
+			   *                P2.x+ seem to work more or less */
+			if (si->system_version &&
+			    si->system_version[0] == 'P' &&
+			    si->system_version[1] <= '1')
+			    si->flags |= SWITCHF_BRIDGE_MIB_HAS_VLAN;
 			break;
 		}
 	}
-- 
cgit v1.2.3