diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2012-07-13 14:05:36 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2012-07-13 14:05:40 +0200 |
| commit | 18a4e3715f89337ac8b70f6f63cc131c3218c82c (patch) | |
| tree | 1b38b2eae4e1cee042f96a42217b14647159bf0f /ripd/rip_snmp.c | |
| parent | a47c5838e9f445ab887ad927706b11ccbb181364 (diff) | |
| parent | 8046ba6ec4d6e87bf8da6563c0f3e5e66c4652b3 (diff) | |
Merge remote branch 'vincentbernat/feature/agentx'
Diffstat (limited to 'ripd/rip_snmp.c')
| -rw-r--r-- | ripd/rip_snmp.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c index 61c47c71..090ebfae 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -22,14 +22,8 @@ #include <zebra.h> #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> -#else -#include <asn1.h> -#include <snmp.h> -#include <snmp_impl.h> -#endif #include "if.h" #include "log.h" @@ -351,6 +345,10 @@ rip2IfStatEntry (struct variable *v, oid name[], size_t *length, static struct in_addr addr; static long valid = SNMP_VALID; + if (smux_header_table(v, name, length, exact, var_len, write_method) + == MATCH_FAILED) + return NULL; + memset (&addr, 0, sizeof (struct in_addr)); /* Lookup interface. */ @@ -454,6 +452,10 @@ rip2IfConfAddress (struct variable *v, oid name[], size_t *length, struct interface *ifp; struct rip_interface *ri; + if (smux_header_table(v, name, length, exact, val_len, write_method) + == MATCH_FAILED) + return NULL; + memset (&addr, 0, sizeof (struct in_addr)); /* Lookup interface. */ @@ -524,6 +526,10 @@ rip2PeerTable (struct variable *v, oid name[], size_t *length, struct rip_peer *peer; + if (smux_header_table(v, name, length, exact, val_len, write_method) + == MATCH_FAILED) + return NULL; + memset (&addr, 0, sizeof (struct in_addr)); /* Lookup interface. */ |