Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11008 from patrasar/sec_addr_list_pimv6

This commit is contained in:
David Lamparter 2022-05-20 15:25:52 +02:00 committed by GitHub
parent 5a744d5c86 53749ba70b
commit cbbb1813a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pimd/pim_neighbor.c
View File

@ -363,19 +363,16 @@ static void delete_prefix_list(struct pim_neighbor *neigh)
#ifdef DUMP_PREFIX_LIST
struct listnode *p_node;
struct prefix *p;
char addr_str[10];
int list_size = neigh->prefix_list
? (int)listcount(neigh->prefix_list)
: -1;
int i = 0;
for (ALL_LIST_ELEMENTS_RO(neigh->prefix_list, p_node, p)) {
pim_inet4_dump("<addr?>", p->u.prefix4, addr_str,
sizeof(addr_str));
zlog_debug(
"%s: DUMP_PREFIX_LIST neigh=%x prefix_list=%x prefix=%x addr=%s [%d/%d]",
"%s: DUMP_PREFIX_LIST neigh=%x prefix_list=%x prefix=%x addr=%pFXh [%d/%d]",
__func__, (unsigned)neigh,
(unsigned)neigh->prefix_list, (unsigned)p,
addr_str, i, list_size);
(unsigned)neigh->prefix_list, (unsigned)p, p, i,
list_size);
++i;
}
#endif
@ -716,9 +713,8 @@ static void delete_from_neigh_addr(struct interface *ifp,
struct listnode *neigh_node;
struct pim_neighbor *neigh;
if (addr->family != AF_INET)
if (addr->family != PIM_AF)
continue;
/*
Scan neighbors
*/
@ -728,15 +724,9 @@ static void delete_from_neigh_addr(struct interface *ifp,
struct prefix *p = pim_neighbor_find_secondary(
neigh, addr);
if (p) {
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump(
"<addr?>", addr->u.prefix4,
addr_str, sizeof(addr_str));
zlog_info(
"secondary addr %s recvd from neigh %pPA deleted from neigh %pPA on %s",
addr_str, &neigh_addr,
"secondary addr %pFXh recvd from neigh %pPA deleted from neigh %pPA on %s",
addr, &neigh_addr,
&neigh->source_addr, ifp->name);
listnode_delete(neigh->prefix_list, p);