diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2020-02-27 18:43:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 18:43:59 -0500 |
| commit | f16e992d37f670ea4812c950e3f3d29e7f019b03 (patch) | |
| tree | 1fa614cd6e3aaad1b237b159be2b48dfa7282d3b /zebra/zebra_snmp.c | |
| parent | 93b568451d3af4228376f82a253fa71a964fb091 (diff) | |
| parent | c415d89528f5cd7128e5b4c4cd65cce01d64fc80 (diff) | |
Merge pull request #5857 from mjstapp/embed_nhg_in_nhe
zebra,lib: Embed lib nexthop-group in zebra hash entry
Diffstat (limited to 'zebra/zebra_snmp.c')
| -rw-r--r-- | zebra/zebra_snmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index 70bb6a14ca..5de45c0294 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -285,8 +285,8 @@ static void check_replace(struct route_node *np2, struct route_entry *re2, return; } - if (in_addr_cmp((uint8_t *)&(*re)->nhe->nhg->nexthop->gate.ipv4, - (uint8_t *)&re2->nhe->nhg->nexthop->gate.ipv4) + if (in_addr_cmp((uint8_t *)&(*re)->nhe->nhg.nexthop->gate.ipv4, + (uint8_t *)&re2->nhe->nhg.nexthop->gate.ipv4) <= 0) return; @@ -372,7 +372,7 @@ static void get_fwtable_route_node(struct variable *v, oid objid[], (uint8_t *)&dest)) { RNODE_FOREACH_RE (*np, *re) { if (!in_addr_cmp((uint8_t *)&(*re)->nhe - ->nhg->nexthop + ->nhg.nexthop ->gate.ipv4, (uint8_t *)&nexthop)) if (proto @@ -407,7 +407,7 @@ static void get_fwtable_route_node(struct variable *v, oid objid[], || ((policy == policy2) && (proto == proto2) && (in_addr_cmp( (uint8_t *)&re2->nhe - ->nhg->nexthop->gate.ipv4, + ->nhg.nexthop->gate.ipv4, (uint8_t *)&nexthop) >= 0))) check_replace(np2, re2, np, re); @@ -432,7 +432,7 @@ static void get_fwtable_route_node(struct variable *v, oid objid[], { struct nexthop *nexthop; - nexthop = (*re)->nhe->nhg->nexthop; + nexthop = (*re)->nhe->nhg.nexthop; if (nexthop) { pnt = (uint8_t *)&nexthop->gate.ipv4; for (i = 0; i < 4; i++) @@ -462,7 +462,7 @@ static uint8_t *ipFwTable(struct variable *v, oid objid[], size_t *objid_len, if (!np) return NULL; - nexthop = re->nhe->nhg->nexthop; + nexthop = re->nhe->nhg.nexthop; if (!nexthop) return NULL; |