Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zebra snmp fixes (backport #16918) #16924

Merged
merged 4 commits into from
Oct 1, 2024
Merged

zebra snmp fixes (backport #16918) #16924

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a473caf
zebra: Fix snmp walk of zebra rib
donaldsharp Sep 25, 2024
ec86d6f
zebra: Let's use memset instead of walking bytes and setting to 0
donaldsharp Sep 25, 2024
c6f8546
zebra: Correctly report metrics
donaldsharp Sep 25, 2024
aad4ef1
zebra: Add missing proto translations
donaldsharp Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions zebra/zebra_snmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ static int proto_trans(int type)
return 3; /* static route */
case ZEBRA_ROUTE_RIP:
return 8; /* rip */
case ZEBRA_ROUTE_ISIS:
return 9;
case ZEBRA_ROUTE_RIPNG:
return 1; /* shouldn't happen */
case ZEBRA_ROUTE_OSPF:
Expand All @@ -250,6 +252,8 @@ static int proto_trans(int type)
return 1; /* shouldn't happen */
case ZEBRA_ROUTE_BGP:
return 14; /* bgp */
case ZEBRA_ROUTE_EIGRP:
return 16;
default:
return 1; /* other */
}
Expand All @@ -266,9 +270,11 @@ static void check_replace(struct route_node *np2, struct route_entry *re2,
return;
}

if (prefix_cmp(&(*np)->p, &np2->p) < 0)
if (in_addr_cmp((uint8_t *)&(*np)->p.u.prefix4,
(uint8_t *)&np2->p.u.prefix4) < 0)
return;
if (prefix_cmp(&(*np)->p, &np2->p) > 0) {
if (in_addr_cmp((uint8_t *)&(*np)->p.u.prefix4,
(uint8_t *)&np2->p.u.prefix4) > 0) {
*np = np2;
*re = re2;
return;
Expand Down Expand Up @@ -311,14 +317,8 @@ static void get_fwtable_route_node(struct variable *v, oid objid[],
int i;

/* Init index variables */

pnt = (uint8_t *)&dest;
for (i = 0; i < 4; i++)
*pnt++ = 0;

pnt = (uint8_t *)&nexthop;
for (i = 0; i < 4; i++)
*pnt++ = 0;
memset(&dest, 0, sizeof(dest));
memset(&nexthop, 0, sizeof(nexthop));

proto = 0;
policy = 0;
Expand Down Expand Up @@ -509,23 +509,23 @@ static uint8_t *ipFwTable(struct variable *v, oid objid[], size_t *objid_len,
*val_len = sizeof(int);
return (uint8_t *)&result;
case IPFORWARDMETRIC1:
result = 0;
result = re->metric;
*val_len = sizeof(int);
return (uint8_t *)&result;
case IPFORWARDMETRIC2:
result = 0;
result = -1;
*val_len = sizeof(int);
return (uint8_t *)&result;
case IPFORWARDMETRIC3:
result = 0;
result = -1;
*val_len = sizeof(int);
return (uint8_t *)&result;
case IPFORWARDMETRIC4:
result = 0;
result = -1;
*val_len = sizeof(int);
return (uint8_t *)&result;
case IPFORWARDMETRIC5:
result = 0;
result = -1;
*val_len = sizeof(int);
return (uint8_t *)&result;
default:
Expand Down
Loading