diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-01-14 17:47:14 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-02-14 06:45:03 +0100 |
| commit | 9bb93fa04e58742f4afb97697381af69cddcabd4 (patch) | |
| tree | 54d6553f70d37c4a638b44f3388c172d77882113 /pimd/pim_join.c | |
| parent | c631920c151f0130986cb9051daa710bb0eb261b (diff) | |
pim6d: IPv6-adjust neigh->source_addr
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_join.c')
| -rw-r--r-- | pimd/pim_join.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 7aea411606..bb097dfe2e 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -61,15 +61,12 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh, if (PIM_DEBUG_PIM_TRACE) { char up_str[INET_ADDRSTRLEN]; - char neigh_str[INET_ADDRSTRLEN]; pim_inet4_dump("<upstream?>", upstream, up_str, sizeof(up_str)); - pim_inet4_dump("<neigh?>", neigh->source_addr, neigh_str, - sizeof(neigh_str)); - zlog_debug("%s: join (S,G)=%pSG rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s", - __func__, sg, - !!(source_flags & PIM_RPT_BIT_MASK), - !!(source_flags & PIM_WILDCARD_BIT_MASK), up_str, - holdtime, neigh_str, ifp->name); + zlog_debug( + "%s: join (S,G)=%pSG rpt=%d wc=%d upstream=%s holdtime=%d from %pPA on %s", + __func__, sg, !!(source_flags & PIM_RPT_BIT_MASK), + !!(source_flags & PIM_WILDCARD_BIT_MASK), up_str, + holdtime, &neigh->source_addr, ifp->name); } pim_ifp = ifp->info; @@ -126,16 +123,12 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh, if (PIM_DEBUG_PIM_TRACE) { char up_str[INET_ADDRSTRLEN]; - char neigh_str[INET_ADDRSTRLEN]; pim_inet4_dump("<upstream?>", upstream, up_str, sizeof(up_str)); - pim_inet4_dump("<neigh?>", neigh->source_addr, neigh_str, - sizeof(neigh_str)); - zlog_debug("%s: prune (S,G)=%pSG rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s", - __func__, sg, - source_flags & PIM_RPT_BIT_MASK, - source_flags & PIM_WILDCARD_BIT_MASK, up_str, - holdtime, - neigh_str, ifp->name); + zlog_debug( + "%s: prune (S,G)=%pSG rpt=%d wc=%d upstream=%s holdtime=%d from %pPA on %s", + __func__, sg, source_flags & PIM_RPT_BIT_MASK, + source_flags & PIM_WILDCARD_BIT_MASK, up_str, holdtime, + &neigh->source_addr, ifp->name); } pim_ifp = ifp->info; |