Merge pull request #6147 from opensourcerouting/ldpd-broken-lsps

[mirror_frr.git] / ripd / rip_snmp.c

diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index 917e532e0a95b79e8f28b05701428edfe4d0a12d..be222c7a5fc5faa72d308a38973c69e428ee3a46 100644 (file)
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -156,21 +156,24 @@ static uint8_t *rip2Globals(struct variable *v, oid name[], size_t *length,
                            int exact, size_t *var_len,
                            WriteMethod **write_method)
 {
+       struct rip *rip;
+
        if (smux_header_generic(v, name, length, exact, var_len, write_method)
            == MATCH_FAILED)
                return NULL;
 
+       rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
+       if (!rip)
+               return NULL;
+
        /* Retrun global counter. */
        switch (v->magic) {
        case RIP2GLOBALROUTECHANGES:
-               return SNMP_INTEGER(rip_global_route_changes);
-               break;
+               return SNMP_INTEGER(rip->counters.route_changes);
        case RIP2GLOBALQUERIES:
-               return SNMP_INTEGER(rip_global_queries);
-               break;
+               return SNMP_INTEGER(rip->counters.queries);
        default:
                return NULL;
-               break;
        }
        return NULL;
 }
@@ -207,7 +210,7 @@ static int rip_snmp_ifaddr_del(struct connected *ifc)
        if (!rn)
                return 0;
        i = rn->info;
-       if (rn && !strncmp(i->name, ifp->name, INTERFACE_NAMSIZ)) {
+       if (!strncmp(i->name, ifp->name, INTERFACE_NAMSIZ)) {
                rn->info = NULL;
                route_unlock_node(rn);
                route_unlock_node(rn);
@@ -281,9 +284,14 @@ static struct rip_peer *rip2PeerLookup(struct variable *v, oid name[],
                                       size_t *length, struct in_addr *addr,
                                       int exact)
 {
+       struct rip *rip;
        int len;
        struct rip_peer *peer;
 
+       rip = rip_lookup_by_vrf_id(VRF_DEFAULT);
+       if (!rip)
+               return NULL;
+
        if (exact) {
                /* Check the length. */
                if (*length - v->namelen != sizeof(struct in_addr) + 1)
@@ -291,7 +299,7 @@ static struct rip_peer *rip2PeerLookup(struct variable *v, oid name[],
 
                oid2in_addr(name + v->namelen, sizeof(struct in_addr), addr);
 
-               peer = rip_peer_lookup(addr);
+               peer = rip_peer_lookup(rip, addr);
 
                if (peer->domain
                    == (int)name[v->namelen + sizeof(struct in_addr)])
@@ -306,7 +314,7 @@ static struct rip_peer *rip2PeerLookup(struct variable *v, oid name[],
                oid2in_addr(name + v->namelen, len, addr);
 
                len = *length - v->namelen;
-               peer = rip_peer_lookup(addr);
+               peer = rip_peer_lookup(rip, addr);
                if (peer) {
                        if ((len < (int)sizeof(struct in_addr) + 1)
                            || (peer->domain
@@ -321,7 +329,7 @@ static struct rip_peer *rip2PeerLookup(struct variable *v, oid name[],
                                return peer;
                        }
                }
-               peer = rip_peer_lookup_next(addr);
+               peer = rip_peer_lookup_next(rip, addr);
 
                if (!peer)
                        return NULL;
@@ -362,7 +370,6 @@ static uint8_t *rip2IfStatEntry(struct variable *v, oid name[], size_t *length,
        switch (v->magic) {
        case RIP2IFSTATADDRESS:
                return SNMP_IPADDRESS(addr);
-               break;
        case RIP2IFSTATRCVBADPACKETS:
                *var_len = sizeof(long);
                return (uint8_t *)&ri->recv_badpackets;
@@ -402,10 +409,10 @@ static long rip2IfConfSend(struct rip_interface *ri)
                return ripVersion2;
        else if (ri->ri_send & RIPv1)
                return ripVersion1;
-       else if (rip) {
-               if (rip->version_send == RIPv2)
+       else if (ri->rip) {
+               if (ri->rip->version_send == RIPv2)
                        return ripVersion2;
-               else if (rip->version_send == RIPv1)
+               else if (ri->rip->version_send == RIPv1)
                        return ripVersion1;
        }
        return doNotSend;
@@ -423,7 +430,7 @@ static long rip2IfConfReceive(struct rip_interface *ri)
        if (!ri->running)
                return doNotReceive;
 
-       recvv = (ri->ri_receive == RI_RIP_UNSPEC) ? rip->version_recv
+       recvv = (ri->ri_receive == RI_RIP_UNSPEC) ? ri->rip->version_recv
                                                  : ri->ri_receive;
        if (recvv == RI_RIP_VERSION_1_AND_2)
                return rip1OrRip2;
@@ -540,13 +547,13 @@ static uint8_t *rip2PeerTable(struct variable *v, oid name[], size_t *length,
                return (uint8_t *)&domain;
 
        case RIP2PEERLASTUPDATE:
-#if 0 
+#if 0
       /* We don't know the SNMP agent startup time. We have two choices here:
        * - assume ripd startup time equals SNMP agent startup time
        * - don't support this variable, at all
        * Currently, we do the latter...
        */
-      *val_len = sizeof (time_t);
+      *val_len = sizeof(time_t);
       uptime = peer->uptime; /* now - snmp_agent_startup - peer->uptime */
       return (uint8_t *) &uptime;
 #else