BFD: Refine the previous commit.

Spell acronyms as they appear in respective specifications, fix a
reference in a comment, add a change log entry and update some tests.

diff --git a/CHANGES b/CHANGES
index 4ca901d24c04d090051bd6121b67cbc046107980..f6a9d64278a267e389cc32dd6ee90155ca620719 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Monthday, Month DD, YYYY by gharris and denis
       MPLS: Rename the "exp" field to "tc".
       VQP: Do not print unknown error codes twice.
       ZMTP: Replace custom code with bittok2str().
+      BFD: Add support for S-BFD and spell LAG in uppercase.
     Source code:
       Use %zu when printing a sizeof to squelch compiler warnings
       (FIXME: somebody please wrap the line below just before the release)

diff --git a/print-bfd.c b/print-bfd.c
index 32dcbf20aacd28ed8983ef68dfd44281e4ad7a25..fbead9dbd274370eac76f81d4698389fbcd80cb5 100644 (file)
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -146,8 +146,8 @@ static const struct tok bfd_diag_values[] = {
 static const struct tok bfd_port_values[] = {
     { BFD_CONTROL_PORT,  "Control" },
     { BFD_MULTIHOP_PORT, "Multihop" },
-    { BFD_LAG_PORT,      "Lag" },
-    { SBFD_PORT,         "Sbfd" },
+    { BFD_LAG_PORT,      "LAG" },
+    { SBFD_PORT,         "S-BFD" },
     { 0, NULL }
 };
 

diff --git a/tests/bfd-lag-v.out b/tests/bfd-lag-v.out
index 38246fe609f925db96ecdc5021b9efbcf733cb67..8f4f6994b568ce711211f24518c34585d87d30a2 100644 (file)
--- a/tests/bfd-lag-v.out
+++ b/tests/bfd-lag-v.out
@@ -1,6 +1,6 @@
     1  17:19:29.162992 IP (tos 0xc0, ttl 255, id 0, offset 0, flags [none], proto UDP (17), length 52)
     10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, length: 24
-       Lag, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
+       LAG, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (3000 ms Detection time), BFD Length: 24
        My Discriminator: 0x0de60837, Your Discriminator: 0x00000000
          Desired min Tx Interval:    1000 ms
@@ -8,7 +8,7 @@
          Required min Echo Interval:  300 ms
     2  17:19:30.154937 IP (tos 0xc0, ttl 255, id 0, offset 0, flags [none], proto UDP (17), length 52)
     10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, length: 24
-       Lag, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
+       LAG, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (3000 ms Detection time), BFD Length: 24
        My Discriminator: 0x0de60837, Your Discriminator: 0x00000000
          Desired min Tx Interval:    1000 ms
@@ -16,7 +16,7 @@
          Required min Echo Interval:  300 ms
     3  17:19:31.146839 IP (tos 0xc0, ttl 255, id 0, offset 0, flags [none], proto UDP (17), length 52)
     10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, length: 24
-       Lag, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
+       LAG, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (3000 ms Detection time), BFD Length: 24
        My Discriminator: 0x0de60837, Your Discriminator: 0x00000000
          Desired min Tx Interval:    1000 ms
@@ -24,7 +24,7 @@
          Required min Echo Interval:  300 ms
     4  17:19:32.074819 IP (tos 0xc0, ttl 255, id 0, offset 0, flags [none], proto UDP (17), length 52)
     10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, length: 24
-       Lag, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
+       LAG, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (3000 ms Detection time), BFD Length: 24
        My Discriminator: 0x0de60837, Your Discriminator: 0x00000000
          Desired min Tx Interval:    1000 ms
@@ -32,7 +32,7 @@
          Required min Echo Interval:  300 ms
     5  17:19:32.842739 IP (tos 0xc0, ttl 255, id 0, offset 0, flags [none], proto UDP (17), length 52)
     10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, length: 24
-       Lag, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
+       LAG, State Down, Flags: [Poll], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (3000 ms Detection time), BFD Length: 24
        My Discriminator: 0x0de60837, Your Discriminator: 0x00000000
          Desired min Tx Interval:    1000 ms

diff --git a/tests/bfd-lag.out b/tests/bfd-lag.out
index a6e2fb097557e42bdfb881fa7b0b15fc8483d33d..2e4ad86ccb95e58dcd8caa87a046ffb71b659c72 100644 (file)
--- a/tests/bfd-lag.out
+++ b/tests/bfd-lag.out
@@ -1,5 +1,5 @@
-    1  17:19:29.162992 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, Lag, State Down, Flags: [Poll], length: 24
-    2  17:19:30.154937 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, Lag, State Down, Flags: [Poll], length: 24
-    3  17:19:31.146839 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, Lag, State Down, Flags: [Poll], length: 24
-    4  17:19:32.074819 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, Lag, State Down, Flags: [Poll], length: 24
-    5  17:19:32.842739 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, Lag, State Down, Flags: [Poll], length: 24
+    1  17:19:29.162992 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, LAG, State Down, Flags: [Poll], length: 24
+    2  17:19:30.154937 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, LAG, State Down, Flags: [Poll], length: 24
+    3  17:19:31.146839 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, LAG, State Down, Flags: [Poll], length: 24
+    4  17:19:32.074819 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, LAG, State Down, Flags: [Poll], length: 24
+    5  17:19:32.842739 IP 10.0.0.2.51255 > 10.0.0.1.6784: BFDv1, LAG, State Down, Flags: [Poll], length: 24

diff --git a/tests/bfd-sbfd-v.out b/tests/bfd-sbfd-v.out
index aa164a772a46617e2ba2b11efa673db6ed8ee7e8..b10da2a2758b0de44c9c99a3102ef3d69fa0d6ac 100644 (file)
--- a/tests/bfd-sbfd-v.out
+++ b/tests/bfd-sbfd-v.out
@@ -1,20 +1,20 @@
     1  03:29:14.047626 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x27acfe90, Your Discriminator: 0xa2961c74
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
     2  03:29:14.047685 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xd3aefe90, Your Discriminator: 0xf30992bf
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
     3  03:29:14.293678 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xd4981d92, Your Discriminator: 0xd492ecb1
          Desired min Tx Interval:     300 ms
@@ -22,7 +22,7 @@
          Required min Echo Interval:    0 ms
     4  03:29:14.307841 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x8fa61d92, Your Discriminator: 0xb1415ec0
          Desired min Tx Interval:     300 ms
@@ -30,21 +30,21 @@
          Required min Echo Interval:    0 ms
     5  03:29:14.347597 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x21aa1d92, Your Discriminator: 0xa2961c74
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
     6  03:29:14.347671 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xafad1d92, Your Discriminator: 0xf30992bf
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
     7  03:29:14.594670 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xffbc3c93, Your Discriminator: 0xd492ecb1
          Desired min Tx Interval:     300 ms
@@ -52,7 +52,7 @@
          Required min Echo Interval:    0 ms
     8  03:29:14.608393 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xfcc73c93, Your Discriminator: 0xb1415ec0
          Desired min Tx Interval:     300 ms
@@ -60,21 +60,21 @@
          Required min Echo Interval:    0 ms
     9  03:29:14.648585 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x74cc3c93, Your Discriminator: 0xa2961c74
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    10  03:29:14.648656 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xb7d03c93, Your Discriminator: 0xf30992bf
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    11  03:29:14.895849 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x6fba5b94, Your Discriminator: 0xd492ecb1
          Desired min Tx Interval:     300 ms
@@ -82,7 +82,7 @@
          Required min Echo Interval:    0 ms
    12  03:29:14.911315 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x4cce5b94, Your Discriminator: 0xb1415ec0
          Desired min Tx Interval:     300 ms
@@ -90,21 +90,21 @@
          Required min Echo Interval:    0 ms
    13  03:29:14.951552 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x34c95b94, Your Discriminator: 0xa2961c74
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    14  03:29:14.951595 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x3bd15b94, Your Discriminator: 0xf30992bf
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    15  03:29:15.197326 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x85a87a95, Your Discriminator: 0xd492ecb1
          Desired min Tx Interval:     300 ms
@@ -112,7 +112,7 @@
          Required min Echo Interval:    0 ms
    16  03:29:15.211901 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xedc77a95, Your Discriminator: 0xb1415ec0
          Desired min Tx Interval:     300 ms
@@ -120,21 +120,21 @@
          Required min Echo Interval:    0 ms
    17  03:29:15.251529 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x4ab47a95, Your Discriminator: 0xa2961c74
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    18  03:29:15.251583 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x86cd7a95, Your Discriminator: 0xf30992bf
          Desired min Tx Interval:     300 ms
          Required min Rx Interval:      0 ms
          Required min Echo Interval:    0 ms
    19  03:29:15.498078 IP6 (class 0x30, hlim 252, next-header UDP (17) payload length: 32) 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: [udp sum ok] BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0xf0bf9996, Your Discriminator: 0xd492ecb1
          Desired min Tx Interval:     300 ms
@@ -142,7 +142,7 @@
          Required min Echo Interval:    0 ms
    20  03:29:15.512229 IP (tos 0x30, ttl 252, id 0, offset 0, flags [none], proto UDP (17), length 52)
     1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, length: 24
-       Sbfd, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
+       S-BFD, State Up, Flags: [none], Diagnostic: No Diagnostic (0x00)
        Detection Timer Multiplier: 3 (900 ms Detection time), BFD Length: 24
        My Discriminator: 0x1fc59996, Your Discriminator: 0xb1415ec0
          Desired min Tx Interval:     300 ms

diff --git a/tests/bfd-sbfd.out b/tests/bfd-sbfd.out
index 335a9a32eac488f6db50d140b00b5fb760c78b0e..c2f9bf63a8bfa0d0802c65ae83f465beee8892dd 100644 (file)
--- a/tests/bfd-sbfd.out
+++ b/tests/bfd-sbfd.out
@@ -1,20 +1,20 @@
-    1  03:29:14.047626 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    2  03:29:14.047685 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    3  03:29:14.293678 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    4  03:29:14.307841 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    5  03:29:14.347597 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    6  03:29:14.347671 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    7  03:29:14.594670 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    8  03:29:14.608393 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-    9  03:29:14.648585 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   10  03:29:14.648656 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   11  03:29:14.895849 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   12  03:29:14.911315 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   13  03:29:14.951552 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   14  03:29:14.951595 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   15  03:29:15.197326 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   16  03:29:15.211901 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   17  03:29:15.251529 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   18  03:29:15.251583 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   19  03:29:15.498078 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
-   20  03:29:15.512229 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, Sbfd, State Up, Flags: [none], length: 24
+    1  03:29:14.047626 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    2  03:29:14.047685 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    3  03:29:14.293678 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    4  03:29:14.307841 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    5  03:29:14.347597 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    6  03:29:14.347671 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    7  03:29:14.594670 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    8  03:29:14.608393 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+    9  03:29:14.648585 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   10  03:29:14.648656 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   11  03:29:14.895849 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   12  03:29:14.911315 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   13  03:29:14.951552 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   14  03:29:14.951595 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   15  03:29:15.197326 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   16  03:29:15.211901 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   17  03:29:15.251529 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   18  03:29:15.251583 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   19  03:29:15.498078 IP6 2000:0:0:40::.7784 > 2000:0:0:40::1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24
+   20  03:29:15.512229 IP 1.0.0.0.7784 > 1.0.0.1.47657: BFDv1, S-BFD, State Up, Flags: [none], length: 24

diff --git a/udp.h b/udp.h
index c6eb873e0a329fc2a7308bb8e7f82150b9a0759a..1eb844abdf9bf4e46f1731c384a29e873e56f0ea 100644 (file)
--- a/udp.h
+++ b/udp.h
@@ -216,7 +216,7 @@ struct udphdr {
 #define BABEL_PORT_OLD                 6697    /* RFC 6126 */
 #endif
 #ifndef BFD_LAG_PORT
-#define BFD_LAG_PORT                   6784    /* RFC 7310 */
+#define BFD_LAG_PORT                   6784    /* RFC 7130 */
 #endif
 #ifndef SBFD_PORT
 #define SBFD_PORT                      7784    /* SBFD RFC 7880 */