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

bgpd: Drop deprecated capability (dynamic 66)

Browse Source 
Already deprecated since two decades.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-07-07 15:51:32 +03:00
parent 700ef0dd20
commit e3ba70e8df
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_open.c
View File

@ -36,7 +36,6 @@ static const struct message capcode_str[] = {
{CAPABILITY_CODE_ADDPATH, "AddPath"}, {CAPABILITY_CODE_ADDPATH, "AddPath"},
{CAPABILITY_CODE_DYNAMIC, "Dynamic"}, {CAPABILITY_CODE_DYNAMIC, "Dynamic"},
{CAPABILITY_CODE_ENHE, "Extended Next Hop Encoding"}, {CAPABILITY_CODE_ENHE, "Extended Next Hop Encoding"},
{CAPABILITY_CODE_DYNAMIC_OLD, "Dynamic (Old)"},
{CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (Old)"}, {CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (Old)"},
{CAPABILITY_CODE_ORF_OLD, "ORF (Old)"}, {CAPABILITY_CODE_ORF_OLD, "ORF (Old)"},
{CAPABILITY_CODE_FQDN, "FQDN"}, {CAPABILITY_CODE_FQDN, "FQDN"},
@ -56,7 +55,6 @@ static const size_t cap_minsizes[] = {
[CAPABILITY_CODE_AS4] = CAPABILITY_CODE_AS4_LEN, [CAPABILITY_CODE_AS4] = CAPABILITY_CODE_AS4_LEN,
[CAPABILITY_CODE_ADDPATH] = CAPABILITY_CODE_ADDPATH_LEN, [CAPABILITY_CODE_ADDPATH] = CAPABILITY_CODE_ADDPATH_LEN,
[CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN, [CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN,
[CAPABILITY_CODE_DYNAMIC_OLD] = CAPABILITY_CODE_DYNAMIC_LEN,
[CAPABILITY_CODE_ENHE] = CAPABILITY_CODE_ENHE_LEN, [CAPABILITY_CODE_ENHE] = CAPABILITY_CODE_ENHE_LEN,
[CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN, [CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN,
[CAPABILITY_CODE_ORF_OLD] = CAPABILITY_CODE_ORF_LEN, [CAPABILITY_CODE_ORF_OLD] = CAPABILITY_CODE_ORF_LEN,
@ -81,7 +79,6 @@ static const size_t cap_modsizes[] = {
[CAPABILITY_CODE_AS4] = 4, [CAPABILITY_CODE_AS4] = 4,
[CAPABILITY_CODE_ADDPATH] = 4, [CAPABILITY_CODE_ADDPATH] = 4,
[CAPABILITY_CODE_DYNAMIC] = 1, [CAPABILITY_CODE_DYNAMIC] = 1,
[CAPABILITY_CODE_DYNAMIC_OLD] = 1,
[CAPABILITY_CODE_ENHE] = 6, [CAPABILITY_CODE_ENHE] = 6,
[CAPABILITY_CODE_REFRESH_OLD] = 1, [CAPABILITY_CODE_REFRESH_OLD] = 1,
[CAPABILITY_CODE_ORF_OLD] = 1, [CAPABILITY_CODE_ORF_OLD] = 1,
@ -1018,7 +1015,6 @@ static int bgp_capability_parse(struct peer *peer, size_t length,
case CAPABILITY_CODE_AS4: case CAPABILITY_CODE_AS4:
case CAPABILITY_CODE_ADDPATH: case CAPABILITY_CODE_ADDPATH:
case CAPABILITY_CODE_DYNAMIC: case CAPABILITY_CODE_DYNAMIC:
case CAPABILITY_CODE_DYNAMIC_OLD:
case CAPABILITY_CODE_ENHE: case CAPABILITY_CODE_ENHE:
case CAPABILITY_CODE_FQDN: case CAPABILITY_CODE_FQDN:
case CAPABILITY_CODE_ENHANCED_RR: case CAPABILITY_CODE_ENHANCED_RR:
@ -1097,7 +1093,6 @@ static int bgp_capability_parse(struct peer *peer, size_t length,
ret = bgp_capability_llgr(peer, &caphdr); ret = bgp_capability_llgr(peer, &caphdr);
break; break;
case CAPABILITY_CODE_DYNAMIC: case CAPABILITY_CODE_DYNAMIC:
case CAPABILITY_CODE_DYNAMIC_OLD:
SET_FLAG(peer->cap, PEER_CAP_DYNAMIC_RCV); SET_FLAG(peer->cap, PEER_CAP_DYNAMIC_RCV);
break; break;
case CAPABILITY_CODE_AS4: case CAPABILITY_CODE_AS4:
@ -1910,12 +1905,6 @@ uint16_t bgp_open_capability(struct stream *s, struct peer *peer,
if (CHECK_FLAG(peer->flags, PEER_FLAG_DYNAMIC_CAPABILITY)) { if (CHECK_FLAG(peer->flags, PEER_FLAG_DYNAMIC_CAPABILITY)) {
SET_FLAG(peer->cap, PEER_CAP_DYNAMIC_ADV); SET_FLAG(peer->cap, PEER_CAP_DYNAMIC_ADV);
stream_putc(s, BGP_OPEN_OPT_CAP); stream_putc(s, BGP_OPEN_OPT_CAP);
ext_opt_params
? stream_putw(s, CAPABILITY_CODE_DYNAMIC_LEN + 2)
: stream_putc(s, CAPABILITY_CODE_DYNAMIC_LEN + 2);
stream_putc(s, CAPABILITY_CODE_DYNAMIC_OLD);
stream_putc(s, CAPABILITY_CODE_DYNAMIC_LEN);
stream_putc(s, BGP_OPEN_OPT_CAP);
ext_opt_params ext_opt_params
? stream_putw(s, CAPABILITY_CODE_DYNAMIC_LEN + 2) ? stream_putw(s, CAPABILITY_CODE_DYNAMIC_LEN + 2)
: stream_putc(s, CAPABILITY_CODE_DYNAMIC_LEN + 2); : stream_putc(s, CAPABILITY_CODE_DYNAMIC_LEN + 2);

1
bgpd/bgp_open.h
View File

@ -31,7 +31,6 @@ struct graceful_restart_af {
#define CAPABILITY_CODE_ORF 3 /* Cooperative Route Filtering Capability */ #define CAPABILITY_CODE_ORF 3 /* Cooperative Route Filtering Capability */
#define CAPABILITY_CODE_RESTART 64 /* Graceful Restart Capability */ #define CAPABILITY_CODE_RESTART 64 /* Graceful Restart Capability */
#define CAPABILITY_CODE_AS4 65 /* 4-octet AS number Capability */ #define CAPABILITY_CODE_AS4 65 /* 4-octet AS number Capability */
#define CAPABILITY_CODE_DYNAMIC_OLD 66 /* Dynamic Capability, deprecated since 2003 */
#define CAPABILITY_CODE_DYNAMIC 67 /* Dynamic Capability */ #define CAPABILITY_CODE_DYNAMIC 67 /* Dynamic Capability */
#define CAPABILITY_CODE_ADDPATH 69 /* Addpath Capability */ #define CAPABILITY_CODE_ADDPATH 69 /* Addpath Capability */
#define CAPABILITY_CODE_ENHANCED_RR 70 /* Enhanced Route Refresh capability */ #define CAPABILITY_CODE_ENHANCED_RR 70 /* Enhanced Route Refresh capability */