From 9bf20484764364b9f32bef0a3a7f877abbc29914 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Tue, 22 Aug 2023 14:20:59 +0200 Subject: [PATCH] BGP: Update RFC reference RFC 5549 was obsoleted by RFC 8950. --- doc/bird.sgml | 4 ++-- proto/bgp/bgp.c | 2 +- proto/bgp/bgp.h | 2 +- proto/bgp/packets.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/bird.sgml b/doc/bird.sgml index 6a818330..29e12b7a 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2425,7 +2425,6 @@ avoid routing loops. - AS confederations for BGP - Generalized TTL Security Mechanism - Capabilities Advertisement with BGP - - Advertising IPv4 NLRI with an IPv6 Next Hop - Dissemination of Flow Specification Rules - 4-Octet AS Specific BGP Extended Community - AS-Wide Unique BGP Identifier @@ -2440,6 +2439,7 @@ avoid routing loops. - BGP Administrative Shutdown Communication - Default EBGP Route Propagation Behavior without Policies - Extended Message Support for BGP + - Advertising IPv4 NLRI with an IPv6 Next Hop - Extended Optional Parameters Length for BGP OPEN Message - Revised Validation Procedure for BGP Flow Specifications - Route Leak Prevention and Detection Using Roles @@ -3100,7 +3100,7 @@ be used in explicit configuration. associated network prefixes. This option provides an extension to use IPv4 next hops with IPv6 prefixes and vice versa. For IPv4 / VPNv4 channels, the behavior is controlled by the Extended Next Hop Encoding - capability, as described in . For IPv6 / VPNv6 channels, + capability, as described in . For IPv6 / VPNv6 channels, just IPv4-mapped IPv6 addresses are used, as described in and . Default: off. diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index c806765a..1ae56397 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -86,7 +86,6 @@ * RFC 5065 - AS confederations for BGP * RFC 5082 - Generalized TTL Security Mechanism * RFC 5492 - Capabilities Advertisement with BGP - * RFC 5549 - Advertising IPv4 NLRI with an IPv6 Next Hop * RFC 5575 - Dissemination of Flow Specification Rules * RFC 5668 - 4-Octet AS Specific BGP Extended Community * RFC 6286 - AS-Wide Unique BGP Identifier @@ -101,6 +100,7 @@ * RFC 8203 - BGP Administrative Shutdown Communication * RFC 8212 - Default EBGP Route Propagation Behavior without Policies * RFC 8654 - Extended Message Support for BGP + * RFC 8950 - Advertising IPv4 NLRI with an IPv6 Next Hop * RFC 9072 - Extended Optional Parameters Length for BGP OPEN Message * RFC 9117 - Revised Validation Procedure for BGP Flow Specifications * RFC 9234 - Route Leak Prevention and Detection Using Roles diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h index 7c96e851..0fb375d5 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -232,7 +232,7 @@ struct bgp_af_caps { u8 llgr_able; /* Long-lived GR, RFC draft */ u32 llgr_time; /* Long-lived GR stale time */ u8 llgr_flags; /* Long-lived GR per-AF flags */ - u8 ext_next_hop; /* Extended IPv6 next hop, RFC 5549 */ + u8 ext_next_hop; /* Extended IPv6 next hop, RFC 8950 */ u8 add_path; /* Multiple paths support, RFC 7911 */ }; diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 6e6e41ca..66f243bd 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -507,7 +507,7 @@ bgp_read_capabilities(struct bgp_conn *conn, byte *pos, int len) caps->route_refresh = 1; break; - case 5: /* Extended next hop encoding capability, RFC 5549 */ + case 5: /* Extended next hop encoding capability, RFC 8950 */ if (cl % 6) goto err; @@ -1257,7 +1257,7 @@ bgp_encode_next_hop_ip(struct bgp_write_state *s, eattr *a, byte *buf, uint size /* * Both IPv4 and IPv6 next hops can be used (with ext_next_hop enabled). This - * is specified in RFC 5549 for IPv4 and in RFC 4798 for IPv6. The difference + * is specified in RFC 8950 for IPv4 and in RFC 4798 for IPv6. The difference * is that IPv4 address is directly encoded with IPv4 NLRI, but as IPv4-mapped * IPv6 address with IPv6 NLRI. */ @@ -1332,7 +1332,7 @@ bgp_encode_next_hop_vpn(struct bgp_write_state *s, eattr *a, byte *buf, uint siz /* * Both IPv4 and IPv6 next hops can be used (with ext_next_hop enabled). This - * is specified in RFC 5549 for VPNv4 and in RFC 4659 for VPNv6. The difference + * is specified in RFC 8950 for VPNv4 and in RFC 4659 for VPNv6. The difference * is that IPv4 address is directly encoded with VPNv4 NLRI, but as IPv4-mapped * IPv6 address with VPNv6 NLRI. */