proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 14:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9956 from idryzhov/bfd-remove-ttl

Browse Source 
lib: remove confusing bfd TTL API
This commit is contained in:
Russ White 2021-11-14 12:24:28 -05:00 committed by GitHub
commit 47af849f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/bfd.c
View File

@ -646,32 +646,16 @@ void bfd_sess_set_vrf(struct bfd_session_params *bsp, vrf_id_t vrf_id)
bsp->args.vrf_id = vrf_id; bsp->args.vrf_id = vrf_id;
} }
void bfd_sess_set_mininum_ttl(struct bfd_session_params *bsp, uint8_t min_ttl) void bfd_sess_set_hop_count(struct bfd_session_params *bsp, uint8_t hops)
{ {
assert(min_ttl != 0); if (bsp->args.ttl == hops)
if (bsp->args.ttl == ((BFD_SINGLE_HOP_TTL + 1) - min_ttl))
return; return;
/* If already installed, remove the old setting. */ /* If already installed, remove the old setting. */
_bfd_sess_remove(bsp); _bfd_sess_remove(bsp);
/* Invert TTL value: protocol expects number of hops. */ bsp->args.ttl = hops;
min_ttl = (BFD_SINGLE_HOP_TTL + 1) - min_ttl; bsp->args.mhop = (hops > 1);
bsp->args.ttl = min_ttl;
bsp->args.mhop = (min_ttl > 1);
}
void bfd_sess_set_hop_count(struct bfd_session_params *bsp, uint8_t min_ttl)
{
if (bsp->args.ttl == min_ttl)
return;
/* If already installed, remove the old setting. */
_bfd_sess_remove(bsp);
bsp->args.ttl = min_ttl;
bsp->args.mhop = (min_ttl > 1);
} }
@ -706,11 +690,6 @@ enum bfd_session_state bfd_sess_status(const struct bfd_session_params *bsp)
return bsp->bss.state; return bsp->bss.state;
} }
uint8_t bfd_sess_minimum_ttl(const struct bfd_session_params *bsp)
{
return ((BFD_SINGLE_HOP_TTL + 1) - bsp->args.ttl);
}
uint8_t bfd_sess_hop_count(const struct bfd_session_params *bsp) uint8_t bfd_sess_hop_count(const struct bfd_session_params *bsp)
{ {
return bsp->args.ttl; return bsp->args.ttl;

47
lib/bfd.h
View File

@ -181,39 +181,14 @@ void bfd_sess_set_vrf(struct bfd_session_params *bsp, vrf_id_t vrf_id);
* Configure the BFD session single/multi hop setting. * Configure the BFD session single/multi hop setting.
* *
* NOTE: * NOTE:
* If the TTL changed the session is removed and must be installed again * If the number of hops is changed the session is removed and must be
* with `bfd_sess_install`. * installed again with `bfd_sess_install`.
* *
* \param bsp BFD session parameters. * \param bsp BFD session parameters.
* \param min_ttl minimum TTL value expected (255 for single hop, 254 for * \param hops maximum amount of hops expected (1 for single hop, 2 or
* multi hop with single hop, 253 for multi hop with two hops * more for multi hop).
* and so on). See `BFD_SINGLE_HOP_TTL` and
* `BFD_MULTI_HOP_MIN_TTL` for defaults.
*
* To simplify things if your protocol only knows the amount of hops it is
* better to use `bfd_sess_set_hops` instead.
*/ */
void bfd_sess_set_mininum_ttl(struct bfd_session_params *bsp, uint8_t min_ttl); void bfd_sess_set_hop_count(struct bfd_session_params *bsp, uint8_t hops);
/** To use single hop the minimum TTL must be set to this. */
#define BFD_SINGLE_HOP_TTL 255
/** To use multi hop the minimum TTL must be set to this or less. */
#define BFD_MULTI_HOP_MIN_TTL 254
/**
* This function is the inverted version of `bfd_sess_set_minimum_ttl`.
* Instead of receiving the minimum expected TTL, it receives the amount of
* hops the protocol will jump.
*
* NOTE:
* If the TTL changed the session is removed and must be installed again
* with `bfd_sess_install`.
*
* \param bsp BFD session parameters.
* \param min_ttl minimum amount of hops expected (1 for single hop, 2 or
* more for multi hop).
*/
void bfd_sess_set_hop_count(struct bfd_session_params *bsp, uint8_t min_ttl);
/** /**
* Configure the BFD session to set the Control Plane Independent bit. * Configure the BFD session to set the Control Plane Independent bit.
@ -278,17 +253,7 @@ void bfd_sess_uninstall(struct bfd_session_params *bsp);
enum bfd_session_state bfd_sess_status(const struct bfd_session_params *bsp); enum bfd_session_state bfd_sess_status(const struct bfd_session_params *bsp);
/** /**
* Get BFD session minimum TTL configured value. * Get BFD session amount of hops configured value.
*
* \param bsp session parameters.
*
* \returns configured minimum TTL.
*/
uint8_t bfd_sess_minimum_ttl(const struct bfd_session_params *bsp);
/**
* Inverted version of `bfd_sess_minimum_ttl`. Gets the amount of hops in the
* way to the peer.
* *
* \param bsp session parameters. * \param bsp session parameters.
* *