X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9178fd8a959af7e6e5fb3a9d4cc23c76598e721e..refs/heads/master:/l2vpn.c

diff --git a/l2vpn.c b/l2vpn.c
index 156139ba..5e2e768f 100644
--- a/l2vpn.c
+++ b/l2vpn.c
@@ -10,14 +10,12 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 #include "netdissect.h"
 #include "l2vpn.h"
 
@@ -26,28 +24,33 @@
  *
  * RFC 6624
  *
- * http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml#bgp-l2-encapsulation-types-registry
+ * https://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml#bgp-l2-encapsulation-types-registry
  */
 const struct tok l2vpn_encaps_values[] = {
     { 0, "Reserved"},
     { 1, "Frame Relay"},
-    { 2, "ATM AAL5 VCC transport"},
+    { 2, "ATM AAL5 SDU VCC transport"},
     { 3, "ATM transparent cell transport"},
-    { 4, "Ethernet VLAN"},
-    { 5, "Ethernet"},
-    { 6, "Cisco-HDLC"},
+    { 4, "Ethernet (VLAN) Tagged Mode"},
+    { 5, "Ethernet Raw Mode"},
+    { 6, "Cisco HDLC"},
     { 7, "PPP"},
     { 8, "SONET/SDH Circuit Emulation Service over MPLS"},
     { 9, "ATM n-to-one VCC cell transport"},
     { 10, "ATM n-to-one VPC cell transport"},
-    { 11, "IP Layer2 Transport"},
-    { 15, "Frame-Relay Port mode"},
-    { 17, "Structure-agnostic E1 over Packet"},
-    { 18, "Structure-agnostic T1 (DS1) over Packet"},
+    { 11, "IP layer 2 transport"},
+    { 15, "Frame Relay Port mode"},
+    { 17, "Structure-agnostic E1 over packet"},
+    { 18, "Structure-agnostic T1 (DS1) over packet"},
     { 19, "VPLS"},
-    { 20, "Structure-agnostic T3 (DS3) over Packet"},
+    { 20, "Structure-agnostic T3 (DS3) over packet"},
     { 21, "Nx64kbit/s Basic Service using Structure-aware"},
     { 25, "Frame Relay DLCI"},
+    { 40, "Structure-agnostic E3 over packet"},
+    { 41, "Octet-aligned playload for Structure-agnostic DS1 circuits"},
+    { 42, "E1 Nx64kbit/s with CAS using Structure-aware"},
+    { 43, "DS1 (ESF) Nx64kbit/s with CAS using Structure-aware"},
+    { 44, "DS1 (SF) Nx64kbit/s with CAS using Structure-aware"},
     { 0, NULL}
 };
 
@@ -56,12 +59,12 @@ const struct tok l2vpn_encaps_values[] = {
  *
  * RFC 4446
  *
- * http://www.iana.org/assignments/pwe3-parameters/pwe3-parameters.xhtml#pwe3-parameters-2
+ * https://www.iana.org/assignments/pwe3-parameters/pwe3-parameters.xhtml#pwe3-parameters-2
  */
 const struct tok mpls_pw_types_values[] = {
     { 0x0000, "Reserved"},
-    { 0x0001, "Frame Relay"},
-    { 0x0002, "ATM AAL5 VCC transport"},
+    { 0x0001, "Frame Relay DLCI (Martini Mode)"},
+    { 0x0002, "ATM AAL5 SDU VCC transport"},
     { 0x0003, "ATM transparent cell transport"},
     { 0x0004, "Ethernet VLAN"},
     { 0x0005, "Ethernet"},