proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-06 02:44:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: bsr nht handling for IPV6

Browse Source 
Signed-off-by: sarita patra <saritap@vmware.com>
This commit is contained in:
sarita patra 2022-02-16 03:45:34 -08:00 committed by Sarita Patra
parent e309769ae7
commit 53bbfd535a
4 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pimd/pim6_stubs.c
View File

@ -27,42 +27,3 @@
#include "pim_cmd.h" #include "pim_cmd.h"
#include "pim_bsm.h" #include "pim_bsm.h"
/*
* NH lookup / NHT
*/
void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
{
}
void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr)
{
}
bool pim_bsm_new_nbr_fwd(struct pim_neighbor *neigh, struct interface *ifp)
{
return false;
}
void pim_bsm_proc_free(struct pim_instance *pim)
{
}
void pim_bsm_proc_init(struct pim_instance *pim)
{
}
struct bsgrp_node *pim_bsm_get_bsgrp_node(struct bsm_scope *scope,
struct prefix *grp)
{
return NULL;
}
void pim_bsm_write_config(struct vty *vty, struct interface *ifp)
{
}
int pim_bsm_process(struct interface *ifp, pim_sgaddr *sg, uint8_t *buf,
uint32_t buf_size, bool no_fwd)
{
return 0;
}

1
pimd/pim_bsm.c
View File

@ -1388,6 +1388,7 @@ int pim_bsm_process(struct interface *ifp, pim_sgaddr *sg, uint8_t *buf,
if (0) if (0)
#endif #endif
{ {
#if PIM_IPV == 4
/* Multicast BSMs are only accepted if source interface & IP /* Multicast BSMs are only accepted if source interface & IP
* match RPF towards the BSR's IP address, or they have * match RPF towards the BSR's IP address, or they have
* no-forward set * no-forward set

16
pimd/pim_nht.c
View File

@ -163,8 +163,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr addr,
return 0; return 0;
} }
#if PIM_IPV == 4 void pim_nht_bsr_add(struct pim_instance *pim, pim_addr addr)
void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
{ {
struct pim_nexthop_cache *pnc; struct pim_nexthop_cache *pnc;
@ -172,7 +171,6 @@ void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
pnc->bsr_count++; pnc->bsr_count++;
} }
#endif /* PIM_IPV == 4 */
static void pim_nht_drop_maybe(struct pim_instance *pim, static void pim_nht_drop_maybe(struct pim_instance *pim,
struct pim_nexthop_cache *pnc) struct pim_nexthop_cache *pnc)
@ -242,8 +240,7 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr addr,
pim_nht_drop_maybe(pim, pnc); pim_nht_drop_maybe(pim, pnc);
} }
#if PIM_IPV == 4 void pim_nht_bsr_del(struct pim_instance *pim, pim_addr addr)
void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr)
{ {
struct pim_nexthop_cache *pnc = NULL; struct pim_nexthop_cache *pnc = NULL;
struct pim_nexthop_cache lookup; struct pim_nexthop_cache lookup;
@ -253,7 +250,7 @@ void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr)
* is 0.0.0.0 as that the BSR has not been registered * is 0.0.0.0 as that the BSR has not been registered
* for tracking yet. * for tracking yet.
*/ */
if (addr.s_addr == INADDR_ANY) if (pim_addr_is_any(addr))
return; return;
lookup.rpf.rpf_addr = addr; lookup.rpf.rpf_addr = addr;
@ -261,18 +258,18 @@ void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr)
pnc = hash_lookup(pim->rpf_hash, &lookup); pnc = hash_lookup(pim->rpf_hash, &lookup);
if (!pnc) { if (!pnc) {
zlog_warn("attempting to delete nonexistent NHT BSR entry %pI4", zlog_warn("attempting to delete nonexistent NHT BSR entry %pPA",
&addr); &addr);
return; return;
} }
assertf(pnc->bsr_count > 0, "addr=%pI4", &addr); assertf(pnc->bsr_count > 0, "addr=%pPA", &addr);
pnc->bsr_count--; pnc->bsr_count--;
pim_nht_drop_maybe(pim, pnc); pim_nht_drop_maybe(pim, pnc);
} }
bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr, bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
struct interface *src_ifp, pim_addr src_ip) struct interface *src_ifp, pim_addr src_ip)
{ {
struct pim_nexthop_cache *pnc = NULL; struct pim_nexthop_cache *pnc = NULL;
@ -392,7 +389,6 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr,
} }
return false; return false;
} }
#endif /* PIM_IPV == 4 */
void pim_rp_nexthop_del(struct rp_info *rp_info) void pim_rp_nexthop_del(struct rp_info *rp_info)
{ {

6
pimd/pim_nht.h
View File

@ -72,10 +72,10 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr src,
void pim_rp_nexthop_del(struct rp_info *rp_info); void pim_rp_nexthop_del(struct rp_info *rp_info);
/* for RPF check on BSM message receipt */ /* for RPF check on BSM message receipt */
void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr bsr_addr); void pim_nht_bsr_add(struct pim_instance *pim, pim_addr bsr_addr);
void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr bsr_addr); void pim_nht_bsr_del(struct pim_instance *pim, pim_addr bsr_addr);
/* RPF(bsr_addr) == src_ip%src_ifp? */ /* RPF(bsr_addr) == src_ip%src_ifp? */
bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr, bool pim_nht_bsr_rpf_check(struct pim_instance *pim, pim_addr bsr_addr,
struct interface *src_ifp, pim_addr src_ip); struct interface *src_ifp, pim_addr src_ip);
#endif #endif