proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ Minor bugfix: IPv6 prefixes were logged incorrectly in RIB debugging calls. Fixed.

Browse Source
This commit is contained in:
Denis Ovsienko 2007-10-03 12:27:16 +00:00
parent 6b148faa29
commit f304cb48f0
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/ChangeLog
View File

@ -1,3 +1,9 @@
2007-10-03 Denis Ovsienko
* zebra_rib.c: (rib_process, rib_link, rib_addnode,
rib_unlink, rib_delnode) log IPv6 prefixes same well
as IPv4 ones are logged.
2007-09-14 Denis Ovsienko 2007-09-14 Denis Ovsienko
* rt_socket.c: (kernel_rtm_ipv4) Use lookup() instead of * rt_socket.c: (kernel_rtm_ipv4) Use lookup() instead of
@ -40,7 +46,7 @@
2007-08-14 Denis Ovsienko 2007-08-14 Denis Ovsienko
* zebra_rib.c: (nexthop_active_update) Added a comment * zebra_rib.c: (nexthop_active_update) Added a comment
and rewrote nexthop iteration. and rewrote nexthop iteration.
2007-08-13 Denis Ovsienko 2007-08-13 Denis Ovsienko

20
zebra/zebra_rib.c
View File

@ -992,12 +992,12 @@ rib_process (struct work_queue *wq, void *data)
struct route_node *rn = data; struct route_node *rn = data;
int installed = 0; int installed = 0;
struct nexthop *nexthop = NULL; struct nexthop *nexthop = NULL;
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
assert (rn); assert (rn);
if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_RIB_Q) if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_RIB_Q)
inet_ntop (AF_INET, &rn->p.u.prefix, buf, INET_ADDRSTRLEN); inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
for (rib = rn->info; rib; rib = next) for (rib = rn->info; rib; rib = next)
{ {
@ -1300,7 +1300,7 @@ static void
rib_link (struct route_node *rn, struct rib *rib) rib_link (struct route_node *rn, struct rib *rib)
{ {
struct rib *head; struct rib *head;
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
assert (rib && rn); assert (rib && rn);
@ -1308,7 +1308,7 @@ rib_link (struct route_node *rn, struct rib *rib)
if (IS_ZEBRA_DEBUG_RIB) if (IS_ZEBRA_DEBUG_RIB)
{ {
inet_ntop (AF_INET, &rn->p.u.prefix, buf, INET_ADDRSTRLEN); inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
zlog_debug ("%s: %s/%d: rn %p, rib %p", __func__, zlog_debug ("%s: %s/%d: rn %p, rib %p", __func__,
buf, rn->p.prefixlen, rn, rib); buf, rn->p.prefixlen, rn, rib);
} }
@ -1338,8 +1338,8 @@ rib_addnode (struct route_node *rn, struct rib *rib)
{ {
if (IS_ZEBRA_DEBUG_RIB) if (IS_ZEBRA_DEBUG_RIB)
{ {
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
inet_ntop (AF_INET, &rn->p.u.prefix, buf, INET_ADDRSTRLEN); inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
zlog_debug ("%s: %s/%d: rn %p, un-removed rib %p", zlog_debug ("%s: %s/%d: rn %p, un-removed rib %p",
__func__, buf, rn->p.prefixlen, rn, rib); __func__, buf, rn->p.prefixlen, rn, rib);
} }
@ -1353,13 +1353,13 @@ static void
rib_unlink (struct route_node *rn, struct rib *rib) rib_unlink (struct route_node *rn, struct rib *rib)
{ {
struct nexthop *nexthop, *next; struct nexthop *nexthop, *next;
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
assert (rn && rib); assert (rn && rib);
if (IS_ZEBRA_DEBUG_RIB) if (IS_ZEBRA_DEBUG_RIB)
{ {
inet_ntop (AF_INET, &rn->p.u.prefix, buf, INET_ADDRSTRLEN); inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
zlog_debug ("%s: %s/%d: rn %p, rib %p", zlog_debug ("%s: %s/%d: rn %p, rib %p",
__func__, buf, rn->p.prefixlen, rn, rib); __func__, buf, rn->p.prefixlen, rn, rib);
} }
@ -1398,8 +1398,8 @@ rib_delnode (struct route_node *rn, struct rib *rib)
{ {
if (IS_ZEBRA_DEBUG_RIB) if (IS_ZEBRA_DEBUG_RIB)
{ {
char buf[INET_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
inet_ntop (AF_INET, &rn->p.u.prefix, buf, INET_ADDRSTRLEN); inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
zlog_debug ("%s: %s/%d: rn %p, rib %p, removing", __func__, zlog_debug ("%s: %s/%d: rn %p, rib %p, removing", __func__,
buf, rn->p.prefixlen, rn, rib); buf, rn->p.prefixlen, rn, rib);
} }