Support for MultiProtocol Label Switching (MPLS). The following support

[obnox/wireshark/wip.git] / ethertype.c

diff --git a/ethertype.c b/ethertype.c
index 60387139a972d5fa519cfa4fa144ec43b4615b06..93344ec03b886279b72e30204435cb1c340f64a2 100644 (file)
--- a/ethertype.c
+++ b/ethertype.c
@@ -2,7 +2,7 @@
  * Routines for calling the right protocol for the ethertype.
  * This is called by both packet-eth.c (Ethernet II) and packet-llc.c (SNAP)
  *
- * $Id: ethertype.c,v 1.27 2000/02/15 21:01:56 gram Exp $
+ * $Id: ethertype.c,v 1.28 2000/03/09 18:31:50 ashokn Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -48,6 +48,7 @@
 #include "packet-vines.h"
 #include "packet-vlan.h"
 #include "packet-x25.h"
+#include "packet-mpls.h"
 
 const value_string etype_vals[] = {
     {ETHERTYPE_IP,     "IP"             },
@@ -64,6 +65,8 @@ const value_string etype_vals[] = {
     {ETHERTYPE_PPPOED, "PPPoE Discovery"}, 
     {ETHERTYPE_PPPOES, "PPPoE Session"  }, 
     {ETHERTYPE_VLAN,   "802.1Q Virtual LAN" },
+    {ETHERTYPE_MPLS,   "MPLS label switched packet" },
+    {ETHERTYPE_MPLS_MULTI,   "MPLS multicast label switched packet" },
     {0,                 NULL            } };
 
 void
@@ -141,6 +144,9 @@ ethertype(guint16 etype, int offset,
     case ETHERTYPE_SNMP:
       dissect_snmp(pd, offset, fd, tree);
       break;
+    case ETHERTYPE_MPLS:
+      dissect_mpls(pd, offset, fd, tree);
+      break;
     default:
       dissect_data(pd, offset, fd, tree);
       if (check_col(fd, COL_PROTOCOL)) { col_add_fstr(fd, COL_PROTOCOL, "0x%04x", etype); }