Author: adrian.chadd
Date: Tue May 19 00:49:28 2009
New Revision: 14053
Modified:
branches/LUSCA_HEAD/src/client_db.c
branches/LUSCA_HEAD/src/snmp_core.c
Log:
Disable the client db snmp stuff as a prelude to converting the client db
code
over to using an IPv4/IPv6 radix tree instead of a hash.
Modified: branches/LUSCA_HEAD/src/client_db.c
==============================================================================
--- branches/LUSCA_HEAD/src/client_db.c (original)
+++ branches/LUSCA_HEAD/src/client_db.c Tue May 19 00:49:28 2009
@@ -306,6 +306,13 @@
clientdbGC(NULL);
}
+/*
+ * XXX this has been disabled due to changes to the client db code.
+ * XXX The client db code used to use an IPv4 hash table; it will
+ * XXX use an IPv4/IPv6 radix tree. The SNMP code should be
+ * XXX modified to use the radix tree and be "IPv6 compatible"
+ * XXX in whatever way Squid-3's client database is.
+ */
#if SQUID_SNMP
struct in_addr *
client_entry(struct in_addr *current)
Modified: branches/LUSCA_HEAD/src/snmp_core.c
==============================================================================
--- branches/LUSCA_HEAD/src/snmp_core.c (original)
+++ branches/LUSCA_HEAD/src/snmp_core.c Tue May 19 00:49:28 2009
@@ -69,7 +69,9 @@
static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current,
oid_ParseFn ** Fn);
static oid *peer_Inst(oid * name, snint * len, mib_tree_entry * current,
oid_ParseFn ** Fn);
static oid *peer_InstIndex(oid * name, snint * len, mib_tree_entry *
current, oid_ParseFn ** Fn);
+#if 0
static oid *client_Inst(oid * name, snint * len, mib_tree_entry * current,
oid_ParseFn ** Fn);
+#endif
static void snmpDecodePacket(snmp_request_t * rq);
static void snmpConstructReponse(snmp_request_t * rq);
static struct snmp_pdu *snmpAgentResponse(struct snmp_pdu *PDU);
@@ -269,8 +271,9 @@
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.1.2", 12, snmp_meshPtblFn,
peer_InstIndex);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.1.2", 13, snmp_meshPtblFn,
peer_InstIndex);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.1.2", 14, snmp_meshPtblFn,
peer_InstIndex);
- snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.1.2", 15, snmp_meshPtblFn,
peer_InstIndex);
+ mib_tree_last = snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.1.2", 15,
snmp_meshPtblFn, peer_InstIndex);
+#if 0
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5", 2, NULL, NULL);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.2", 1, NULL, NULL);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.2.1", 1, snmp_meshCtblFn,
client_Inst);
@@ -282,6 +285,7 @@
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.2.1", 7, snmp_meshCtblFn,
client_Inst);
snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.2.1", 8, snmp_meshCtblFn,
client_Inst);
mib_tree_last = snmpAddNodeStr("1.3.6.1.4.1.3495.1.5.2.1", 9,
snmp_meshCtblFn, client_Inst);
+#endif
debug(49, 9) ("snmpInit: Completed SNMP mib tree structure\n");
}
@@ -804,6 +808,7 @@
return (instance);
}
+#if 0
static oid *
client_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn
** Fn)
{
@@ -839,6 +844,7 @@
*Fn = current->parsefunction;
return (instance);
}
+#endif
/*
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
