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_rp.c | |
| parent | c631920c151f0130986cb9051daa710bb0eb261b (diff) | |
pim6d: IPv6-adjust neigh->source_addr
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_rp.c')
| -rw-r--r-- | pimd/pim_rp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 702eace3c0..0a52092b1e 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -1360,17 +1360,19 @@ void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr) if (nbr->interface != ifp1) continue; +#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) nh_node->gate.ipv4 = nbr->source_addr; +#else + nh_node->gate.ipv6 = nbr->source_addr; +#endif if (PIM_DEBUG_PIM_NHT_RP) { char str[PREFIX_STRLEN]; - char str1[INET_ADDRSTRLEN]; - pim_inet4_dump("<nht_nbr?>", nbr->source_addr, - str1, sizeof(str1)); pim_addr_dump("<nht_addr?>", &nht_p, str, sizeof(str)); zlog_debug( - "%s: addr %s new nexthop addr %s interface %s", - __func__, str, str1, ifp1->name); + "%s: addr %s new nexthop addr %pPAs interface %s", + __func__, str, &nbr->source_addr, + ifp1->name); } } } |