add bgp LLGR capability

diff --git a/print-bgp.c b/print-bgp.c
index fe859def3c90a17dcfff956a9448035c45dab769..97f3bbee2daf042c1e9b6a67977433b613181b91 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -223,6 +223,7 @@ static const struct tok bgp_opt_values[] = {
 #define BGP_CAPCODE_MULTISESS          68 /* draft-ietf-idr-bgp-multisession */
 #define BGP_CAPCODE_ADD_PATH           69 /* RFC7911 */
 #define BGP_CAPCODE_ENH_RR             70 /* draft-keyur-bgp-enhanced-route-refresh */
+#define BGP_CAPCODE_LLGR               71 /* draft-uttaro-idr-bgp-persistence-05 */
 #define BGP_CAPCODE_RR_CISCO          128
 
 static const struct tok bgp_capcode_values[] = {
@@ -238,6 +239,7 @@ static const struct tok bgp_capcode_values[] = {
     { BGP_CAPCODE_MULTISESS,    "Multisession BGP"},
     { BGP_CAPCODE_ADD_PATH,     "Multiple Paths"},
     { BGP_CAPCODE_ENH_RR,       "Enhanced Route Refresh"},
+    { BGP_CAPCODE_LLGR,         "Long-lived Graceful Restart"},
     { BGP_CAPCODE_RR_CISCO,     "Route Refresh (Cisco)"},
     { 0, NULL}
 };
@@ -2473,6 +2475,7 @@ bgp_capabilities_print(netdissect_options *ndo,
             }
             break;
         case BGP_CAPCODE_RR:
+        case BGP_CAPCODE_LLGR:
         case BGP_CAPCODE_RR_CISCO:
             break;
         case BGP_CAPCODE_AS_NEW:

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 68467bf6d972abc5fc1f272ae8ecbd656c7edde3..300be7fd6dbd30cf8d9a47a5b3e6ed5acaf31226 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -31,6 +31,7 @@ bgp-4byte-asn bgp-4byte-asn.pcap      bgp-4byte-asn.out       -v
 bgp-4byte-asdot        bgp-4byte-asn.pcap      bgp-4byte-asdot.out     -vb
 bgp-lu-multiple-labels bgp-lu-multiple-labels.pcap bgp-lu-multiple-labels.out -v
 bgp-evpn       bgp-evpn.pcap           bgp-evpn.out            -v
+bgp-llgr       bgp-evpn.pcap           bgp-llgr.out            -v
 
 # Broadcom tag tests
 brcmtag                brcm-tag.pcap           brcm-tag.out

diff --git a/tests/bgp-evpn.out b/tests/bgp-evpn.out
index b961d684d9737a5289ab4f7b754a7c745986ad58..e423fb831ad7b251a5667430b3e73ddb6ed377f0 100644 (file)
--- a/tests/bgp-evpn.out
+++ b/tests/bgp-evpn.out
@@ -20,5 +20,4 @@
              32-Bit AS Number (65), length: 4
                 4 Byte AS 65000
            Option Capabilities Advertisement (2), length: 2
-             Unknown (71), length: 0
-               no decoder for Capability 71
+             Long-lived Graceful Restart (71), length: 0

diff --git a/tests/bgp-llgr.out b/tests/bgp-llgr.out
new file mode 100644 (file)
index 0000000..e423fb8
--- /dev/null
+++ b/tests/bgp-llgr.out
@@ -0,0 +1,23 @@
+    1  14:33:30.055180 IP (tos 0xc0, ttl 255, id 64247, offset 0, flags [none], proto TCP (6), length 123)
+    2.2.2.2.179 > 3.3.3.3.56988: Flags [P.], cksum 0x3c01 (correct), seq 334666955:334667026, ack 4146650227, win 16384, options [nop,nop,TS val 2156984502 ecr 2156984501], length 71: BGP
+       Open Message (1), length: 71
+         Version 4, my AS 65000, Holdtime 90s, ID 2.2.2.2
+         Optional parameters, length: 42
+           Option Capabilities Advertisement (2), length: 6
+             Multiprotocol Extensions (1), length: 4
+               AFI IPv4 (1), SAFI labeled VPN Unicast (128)
+           Option Capabilities Advertisement (2), length: 6
+             Multiprotocol Extensions (1), length: 4
+               AFI VPLS (25), SAFI EVPN (70)
+           Option Capabilities Advertisement (2), length: 2
+             Route Refresh (Cisco) (128), length: 0
+           Option Capabilities Advertisement (2), length: 2
+             Route Refresh (2), length: 0
+           Option Capabilities Advertisement (2), length: 4
+             Graceful Restart (64), length: 2
+               Restart Flags: [none], Restart Time 120s
+           Option Capabilities Advertisement (2), length: 6
+             32-Bit AS Number (65), length: 4
+                4 Byte AS 65000
+           Option Capabilities Advertisement (2), length: 2
+             Long-lived Graceful Restart (71), length: 0