From 0cd944f119ad3981cc59d1e1d37b63b5e3a6ad45 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sun, 19 Feb 2023 15:35:07 +0100 Subject: [PATCH] BGP: Update RFC references --- doc/bird.sgml | 2 ++ proto/bgp/bgp.c | 2 +- proto/bgp/bgp.h | 4 ++-- proto/bgp/packets.c | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/bird.sgml b/doc/bird.sgml index 477bc7a3..85711c31 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2400,6 +2400,8 @@ avoid routing loops. - BGP Large Communities Attribute - BGP Administrative Shutdown Communication - Default EBGP Route Propagation Behavior without Policies + - Extended Message Support for BGP + - Extended Optional Parameters Length for BGP OPEN Message - Revised Validation Procedure for BGP Flow Specifications - Route Leak Prevention and Detection Using Roles diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 2e442e16..a0e83415 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -101,9 +101,9 @@ * RFC 8203 - BGP Administrative Shutdown Communication * RFC 8212 - Default EBGP Route Propagation Behavior without Policies * RFC 8654 - Extended Message Support for BGP + * 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 - * draft-ietf-idr-ext-opt-param-07 * draft-uttaro-idr-bgp-persistence-04 * draft-walton-bgp-hostname-capability-02 */ diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h index 2808d479..a36949c2 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -97,7 +97,7 @@ struct bgp_config { int capabilities; /* Enable capability handshake [RFC 5492] */ int enable_refresh; /* Enable local support for route refresh [RFC 2918] */ int enable_as4; /* Enable local support for 4B AS numbers [RFC 6793] */ - int enable_extended_messages; /* Enable local support for extended messages [draft] */ + int enable_extended_messages; /* Enable local support for extended messages [RFC 8654] */ int enable_hostname; /* Enable local support for hostname [draft] */ u32 rr_cluster_id; /* Route reflector cluster ID, if different from local ID */ int rr_client; /* Whether neighbor is RR client of me */ @@ -239,7 +239,7 @@ struct bgp_caps { u32 as4_number; /* Announced ASN */ u8 as4_support; /* Four-octet AS capability, RFC 6793 */ - u8 ext_messages; /* Extended message length, RFC draft */ + u8 ext_messages; /* Extended message length, RFC 8654 */ u8 route_refresh; /* Route refresh capability, RFC 2918 */ u8 enhanced_refresh; /* Enhanced route refresh, RFC 7313 */ u8 role; /* BGP role capability, RFC 9234 */ diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 16818cf3..5c17c370 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -518,7 +518,7 @@ bgp_read_capabilities(struct bgp_conn *conn, byte *pos, int len) } break; - case 6: /* Extended message length capability, RFC draft */ + case 6: /* Extended message length capability, RFC 8654 */ if (cl != 0) goto err; @@ -711,7 +711,7 @@ bgp_read_options(struct bgp_conn *conn, byte *pos, uint len, uint rest) struct bgp_proto *p = conn->bgp; int ext = 0; - /* Handle extended length (draft-ietf-idr-ext-opt-param-07) */ + /* Handle extended length, RFC 9072 */ if ((len > 0) && (rest > 0) && (pos[0] == 255)) { if (rest < 3) @@ -796,7 +796,7 @@ bgp_create_open(struct bgp_conn *conn, byte *buf) buf[10] = 2; /* Option 2: Capability list */ buf[11] = len; /* Option data length */ } - else /* draft-ietf-idr-ext-opt-param-07 */ + else /* Extended length, RFC 9072 */ { /* Move capabilities 4 B forward */ memmove(buf + 16, pos, len);