diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-02-26 14:03:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 14:03:06 +0100 |
| commit | 3bf65aa1ae5fb69bf97c6dc54775a25c13cc4c59 (patch) | |
| tree | 4ea94e01cadb3d0209ad8abdd7fd584b26c55918 /pimd/pim_nht.c | |
| parent | Merge pull request #10658 from proelbtn/fix/srv6-l3vpn-transposition (diff) | |
| parent | pim6d: remove `PIM_V6_TEMP_BREAK` (diff) | |
| download | frr-3bf65aa1ae5fb69bf97c6dc54775a25c13cc4c59.tar.xz frr-3bf65aa1ae5fb69bf97c6dc54775a25c13cc4c59.zip | |
Merge pull request #10400 from opensourcerouting/pim6-compilefix
pim6d: get running with ipv6 types throughout
Diffstat (limited to 'pimd/pim_nht.c')
| -rw-r--r-- | pimd/pim_nht.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 2e690d85f..a494968e9 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -361,7 +361,7 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr, pim_addr nhaddr; switch (nh->type) { -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 case NEXTHOP_TYPE_IPV4: if (nh->ifindex == IFINDEX_INTERNAL) continue; @@ -605,7 +605,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, ifps[i] = if_lookup_by_index(nh_node->ifindex, pim->vrf->vrf_id); if (ifps[i]) { -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 pim_addr nhaddr = nh_node->gate.ipv4; #else pim_addr nhaddr = nh_node->gate.ipv6; @@ -798,7 +798,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS) nbr = pim_neighbor_find_if(ifp1); /* Overwrite with Nbr address as NH addr */ if (nbr) -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 nexthop->gate.ipv4 = nbr->source_addr; #else nexthop->gate.ipv6 = nbr->source_addr; |