From b8cf46b715b2c21db5dce8118c70b4dd9b5255a3 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@luffy.cx>
Date: Fri, 25 May 2012 08:56:44 +0200
Subject: smux: drop findVar element from trap object struct
This element was not unused.
---
bgpd/bgp_snmp.c | 4 ++--
lib/smux.h | 3 +--
ospfd/ospf_snmp.c | 32 ++++++++++++++++----------------
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index a995ff6c..73406d59 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -833,8 +833,8 @@ bgp4PathAttrTable (struct variable *v, oid name[], size_t *length,
/* BGP Traps. */
struct trap_object bgpTrapList[] =
{
- {bgpPeerTable, 3, {3, 1, BGPPEERLASTERROR}},
- {bgpPeerTable, 3, {3, 1, BGPPEERSTATE}}
+ {3, {3, 1, BGPPEERLASTERROR}},
+ {3, {3, 1, BGPPEERSTATE}}
};
void
diff --git a/lib/smux.h b/lib/smux.h
index 78460e68..b7d5096e 100644
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -47,8 +47,7 @@
struct trap_object
{
- FindVarMethod *findVar;
- int namelen;
+ int namelen; /* Negative if the object is not indexed */
oid name[MAX_OID_LEN];
};
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 409153b8..b2d56860 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2568,35 +2568,35 @@ ospfAreaAggregateEntry (struct variable *v, oid *name, size_t *length,
struct trap_object ospfNbrTrapList[] =
{
- {ospfGeneralGroup, -2, {1, OSPFROUTERID}},
- {ospfNbrEntry, 3, {10, 1, OSPFNBRIPADDR}},
- {ospfNbrEntry, 3, {10, 1, OSPFNBRRTRID}},
- {ospfNbrEntry, 3, {10, 1, OSPFNBRSTATE}}
+ {-2, {1, OSPFROUTERID}},
+ {3, {10, 1, OSPFNBRIPADDR}},
+ {3, {10, 1, OSPFNBRRTRID}},
+ {3, {10, 1, OSPFNBRSTATE}}
};
struct trap_object ospfVirtNbrTrapList[] =
{
- {ospfGeneralGroup, -2, {1, 1}},
- {ospfVirtNbrEntry, 3, {11, 1, OSPFVIRTNBRAREA}},
- {ospfVirtNbrEntry, 3, {11, 1, OSPFVIRTNBRRTRID}},
- {ospfVirtNbrEntry, 3, {11, 1, OSPFVIRTNBRSTATE}}
+ {-2, {1, 1}},
+ {3, {11, 1, OSPFVIRTNBRAREA}},
+ {3, {11, 1, OSPFVIRTNBRRTRID}},
+ {3, {11, 1, OSPFVIRTNBRSTATE}}
};
struct trap_object ospfIfTrapList[] =
{
- {ospfGeneralGroup, -2, {1, OSPFROUTERID}},
- {ospfIfEntry, 3, {7, 1, OSPFIFIPADDRESS}},
- {ospfIfEntry, 3, {7, 1, OSPFADDRESSLESSIF}},
- {ospfIfEntry, 3, {7, 1, OSPFIFSTATE}}
+ {-2, {1, OSPFROUTERID}},
+ {3, {7, 1, OSPFIFIPADDRESS}},
+ {3, {7, 1, OSPFADDRESSLESSIF}},
+ {3, {7, 1, OSPFIFSTATE}}
};
struct trap_object ospfVirtIfTrapList[] =
{
- {ospfGeneralGroup, -2, {1, OSPFROUTERID}},
- {ospfVirtIfEntry, 3, {9, 1, OSPFVIRTIFAREAID}},
- {ospfVirtIfEntry, 3, {9, 1, OSPFVIRTIFNEIGHBOR}},
- {ospfVirtIfEntry, 3, {9, 1, OSPFVIRTIFSTATE}}
+ {-2, {1, OSPFROUTERID}},
+ {3, {9, 1, OSPFVIRTIFAREAID}},
+ {3, {9, 1, OSPFVIRTIFNEIGHBOR}},
+ {3, {9, 1, OSPFVIRTIFSTATE}}
};
void
--
cgit v1.2.1