Merge pull request #245 from bgpkit/bugfix/open-capacities

Fix BGP Open Messages Capacities parsing

Author: digizeph

.gitignore

@@ -13,3 +13,5 @@ examples/debug-file.rs
 
 .env
 .claude
+*.pcap
+*.bin

CHANGELOG.md

@@ -132,6 +132,11 @@ We now set a minimum supported Rust version (MSRV) of 1.87.0.
     * previously path_id was read but discarded, now properly stored in `RibEntry`
 * clarified in-bounds indexing for BGP attribute types when tracking seen attributes (PR #239)
     * index attribute type as `u8` when indexing the seen-attributes array to ensure bounds correctness
+* fixed BGP OPEN message optional parameter parsing to support multiple capabilities per parameter
+    * changed `ParamValue::Capability` to `ParamValue::Capacities(Vec<Capability>)` to properly handle RFC 5492 format
+    * previously parser only read the first capability in each optional parameter, ignoring subsequent capabilities
+    * now correctly parses all capabilities within each optional parameter
+    * updated encoding logic to write all capabilities in the vector
 
 ## v0.11.1 - 2025-06-06
 

README.md

@@ -371,6 +371,7 @@ If you would like to see any specific RFC's support, please submit an issue on G
 - [X] [RFC 4724](https://datatracker.ietf.org/doc/html/rfc4724): Graceful Restart Mechanism for BGP
 - [X] [RFC 4456](https://datatracker.ietf.org/doc/html/rfc4456): BGP Route Reflection: An Alternative to Full Mesh Internal BGP (IBGP)
 - [X] [RFC 5065](https://datatracker.ietf.org/doc/html/rfc5065): Autonomous System Confederations for BGP
+- [X] [RFC 5492](https://datatracker.ietf.org/doc/html/rfc5492): Capabilities Advertisement with BGP-4
 - [X] [RFC 6793](https://datatracker.ietf.org/doc/html/rfc6793): BGP Support for Four-Octet Autonomous System (AS) Number Space
 - [X] [RFC 7606](https://datatracker.ietf.org/doc/html/rfc7606): Revised Error Handling for BGP UPDATE Messages
 - [X] [RFC 7911](https://datatracker.ietf.org/doc/html/rfc7911): Advertisement of Multiple Paths in BGP (ADD-PATH)

src/lib.rs

@@ -363,6 +363,7 @@ If you would like to see any specific RFC's support, please submit an issue on G
 - [X] [RFC 4724](https://datatracker.ietf.org/doc/html/rfc4724): Graceful Restart Mechanism for BGP
 - [X] [RFC 4456](https://datatracker.ietf.org/doc/html/rfc4456): BGP Route Reflection: An Alternative to Full Mesh Internal BGP (IBGP)
 - [X] [RFC 5065](https://datatracker.ietf.org/doc/html/rfc5065): Autonomous System Confederations for BGP
+- [X] [RFC 5492](https://datatracker.ietf.org/doc/html/rfc5492): Capabilities Advertisement with BGP-4
 - [X] [RFC 6793](https://datatracker.ietf.org/doc/html/rfc6793): BGP Support for Four-Octet Autonomous System (AS) Number Space
 - [X] [RFC 7606](https://datatracker.ietf.org/doc/html/rfc7606): Revised Error Handling for BGP UPDATE Messages
 - [X] [RFC 7911](https://datatracker.ietf.org/doc/html/rfc7911): Advertisement of Multiple Paths in BGP (ADD-PATH)

src/models/bgp/mod.rs

@@ -105,7 +105,7 @@ pub struct OptParam {
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum ParamValue {
     Raw(Vec<u8>),
-    Capability(Capability),
+    Capacities(Vec<Capability>),
 }
 
 /// BGP Capability.

src/parser/bgp/messages.rs

@@ -10,13 +10,14 @@ use num_enum::TryFromPrimitiveError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 
-#[derive(Debug, PartialEq, Clone, Copy, Eq)]
+#[derive(Debug, PartialEq, Clone, Eq)]
 pub enum ParserBmpError {
     InvalidOpenBmpHeader,
     UnsupportedOpenBmpMessage,
     UnknownTlvType,
     UnknownTlvValue,
     CorruptedBmpMessage,
+    CorruptedBgpMessage(String),
     TruncatedBmpMessage,
 }
 
@@ -41,6 +42,9 @@ impl Display for ParserBmpError {
             ParserBmpError::UnknownTlvValue => {
                 write!(f, "Unknown TLV value")
             }
+            ParserBmpError::CorruptedBgpMessage(s) => {
+                write!(f, "Corrupted BGP message: {}", s)
+            }
         }
     }
 }
@@ -55,8 +59,8 @@ impl From<std::io::Error> for ParserBmpError {
 }
 
 impl From<ParserError> for ParserBmpError {
-    fn from(_: ParserError) -> Self {
-        ParserBmpError::CorruptedBmpMessage
+    fn from(e: ParserError) -> Self {
+        ParserBmpError::CorruptedBgpMessage(e.to_string())
     }
 }
 
@@ -126,6 +130,10 @@ mod tests {
             ParserBmpError::CorruptedBmpMessage.to_string(),
             "Corrupted BMP message"
         );
+        assert_eq!(
+            ParserBmpError::CorruptedBgpMessage("test".to_string()).to_string(),
+            "Corrupted BGP message: test"
+        );
         assert_eq!(
             ParserBmpError::TruncatedBmpMessage.to_string(),
             "Truncated BMP message"
@@ -148,7 +156,7 @@ mod tests {
         );
         assert_eq!(
             ParserBmpError::from(ParserError::ParseError("test".to_string())),
-            ParserBmpError::CorruptedBmpMessage
+            ParserBmpError::CorruptedBgpMessage("Error: test".to_string())
         );
         assert_eq!(
             ParserBmpError::from(TryFromPrimitiveError::<BmpMsgType>::new(0)),