diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-07 16:01:19 +0300 | 
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-07 16:19:54 +0300 | 
| commit | 04dfcb14ff9a02b053dfed0b3f657c6643d73830 (patch) | |
| tree | 02c6b8199893c2ea3f687f79382326e7ff545a37 /bgpd/bgp_open.c | |
| parent | e3ba70e8df672f42402ea73f01176e49a3da748e (diff) | |
bgpd: Deprecate Prestandard Route Refresh capability (128)
More details: https://www.rfc-editor.org/rfc/rfc8810.html
Not sure if we want to maintain the old code more.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_open.c')
| -rw-r--r-- | bgpd/bgp_open.c | 16 | 
1 files changed, 2 insertions, 14 deletions
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index d6151db3a4..84f770f7db 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -36,7 +36,6 @@ static const struct message capcode_str[] = {  	{CAPABILITY_CODE_ADDPATH, "AddPath"},  	{CAPABILITY_CODE_DYNAMIC, "Dynamic"},  	{CAPABILITY_CODE_ENHE, "Extended Next Hop Encoding"}, -	{CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (Old)"},  	{CAPABILITY_CODE_ORF_OLD, "ORF (Old)"},  	{CAPABILITY_CODE_FQDN, "FQDN"},  	{CAPABILITY_CODE_ENHANCED_RR, "Enhanced Route Refresh"}, @@ -56,7 +55,6 @@ static const size_t cap_minsizes[] = {  		[CAPABILITY_CODE_ADDPATH] = CAPABILITY_CODE_ADDPATH_LEN,  		[CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN,  		[CAPABILITY_CODE_ENHE] = CAPABILITY_CODE_ENHE_LEN, -		[CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN,  		[CAPABILITY_CODE_ORF_OLD] = CAPABILITY_CODE_ORF_LEN,  		[CAPABILITY_CODE_FQDN] = CAPABILITY_CODE_MIN_FQDN_LEN,  		[CAPABILITY_CODE_ENHANCED_RR] = CAPABILITY_CODE_ENHANCED_LEN, @@ -80,7 +78,6 @@ static const size_t cap_modsizes[] = {  		[CAPABILITY_CODE_ADDPATH] = 4,  		[CAPABILITY_CODE_DYNAMIC] = 1,  		[CAPABILITY_CODE_ENHE] = 6, -		[CAPABILITY_CODE_REFRESH_OLD] = 1,  		[CAPABILITY_CODE_ORF_OLD] = 1,  		[CAPABILITY_CODE_FQDN] = 1,  		[CAPABILITY_CODE_ENHANCED_RR] = 1, @@ -1008,7 +1005,6 @@ static int bgp_capability_parse(struct peer *peer, size_t length,  		switch (caphdr.code) {  		case CAPABILITY_CODE_MP:  		case CAPABILITY_CODE_REFRESH: -		case CAPABILITY_CODE_REFRESH_OLD:  		case CAPABILITY_CODE_ORF:  		case CAPABILITY_CODE_ORF_OLD:  		case CAPABILITY_CODE_RESTART: @@ -1072,15 +1068,12 @@ static int bgp_capability_parse(struct peer *peer, size_t length,  			}  		} break;  		case CAPABILITY_CODE_ENHANCED_RR: -		case CAPABILITY_CODE_REFRESH: -		case CAPABILITY_CODE_REFRESH_OLD: { +		case CAPABILITY_CODE_REFRESH: {  			/* BGP refresh capability */  			if (caphdr.code == CAPABILITY_CODE_ENHANCED_RR)  				SET_FLAG(peer->cap, PEER_CAP_ENHANCED_RR_RCV); -			else if (caphdr.code == CAPABILITY_CODE_REFRESH_OLD) -				SET_FLAG(peer->cap, PEER_CAP_REFRESH_OLD_RCV);  			else -				SET_FLAG(peer->cap, PEER_CAP_REFRESH_NEW_RCV); +				SET_FLAG(peer->cap, PEER_CAP_REFRESH_RCV);  		} break;  		case CAPABILITY_CODE_ORF:  		case CAPABILITY_CODE_ORF_OLD: @@ -1766,11 +1759,6 @@ uint16_t bgp_open_capability(struct stream *s, struct peer *peer,  	stream_putc(s, BGP_OPEN_OPT_CAP);  	ext_opt_params ? stream_putw(s, CAPABILITY_CODE_REFRESH_LEN + 2)  		       : stream_putc(s, CAPABILITY_CODE_REFRESH_LEN + 2); -	stream_putc(s, CAPABILITY_CODE_REFRESH_OLD); -	stream_putc(s, CAPABILITY_CODE_REFRESH_LEN); -	stream_putc(s, BGP_OPEN_OPT_CAP); -	ext_opt_params ? stream_putw(s, CAPABILITY_CODE_REFRESH_LEN + 2) -		       : stream_putc(s, CAPABILITY_CODE_REFRESH_LEN + 2);  	stream_putc(s, CAPABILITY_CODE_REFRESH);  	stream_putc(s, CAPABILITY_CODE_REFRESH_LEN);  | 
