Put in some missing brackets.

[tcpdump] / gmpls.c

diff --git a/gmpls.c b/gmpls.c
index 380b05854a39c1d96a421e4a302246e6929333ea..7d563446a77ed72293c67ac7175c0558122f86da 100644 (file)
--- a/gmpls.c
+++ b/gmpls.c
@@ -14,8 +14,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.1 2003-06-09 23:28:09 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.5 2004-09-15 17:54:10 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -26,6 +26,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 
 
 #include "interface.h"
 

+/* rfc3471 */

 struct tok gmpls_link_prot_values[] = {
     { 0x01, "Extra Traffic"},
     { 0x02, "Unprotected"},
 struct tok gmpls_link_prot_values[] = {
     { 0x01, "Extra Traffic"},
     { 0x02, "Unprotected"},


@@ -38,6 +39,7 @@ struct tok gmpls_link_prot_values[] = {
     { 0, NULL }
 };
 
     { 0, NULL }
 };
 

+/* rfc3471 */

 struct tok gmpls_switch_cap_values[] = {
     { 1,       "Packet-Switch Capable-1"},
     { 2,       "Packet-Switch Capable-2"},
 struct tok gmpls_switch_cap_values[] = {
     { 1,       "Packet-Switch Capable-1"},
     { 2,       "Packet-Switch Capable-2"},


@@ -50,6 +52,7 @@ struct tok gmpls_switch_cap_values[] = {
     { 0, NULL }
 };
 
     { 0, NULL }
 };
 

+/* rfc3471 */

 struct tok gmpls_encoding_values[] = {
     { 1,    "Packet"},
     { 2,    "Ethernet V2/DIX"},
 struct tok gmpls_encoding_values[] = {
     { 1,    "Packet"},
     { 2,    "Ethernet V2/DIX"},


@@ -65,6 +68,7 @@ struct tok gmpls_encoding_values[] = {
     { 0, NULL }
 };
 
     { 0, NULL }
 };
 

+/* rfc3471 */

 struct tok gmpls_payload_values[] = {
     {  0,   "Unknown"},
     {  1,   "Reserved"},
 struct tok gmpls_payload_values[] = {
     {  0,   "Unknown"},
     {  1,   "Reserved"},


@@ -99,7 +103,7 @@ struct tok gmpls_payload_values[] = {
     { 30,   "POS - Scrambling, 16 bit CRC"},
     { 31,   "POS - Scrambling, 32 bit CRC"},
     { 32,   "ATM mapping"},
     { 30,   "POS - Scrambling, 16 bit CRC"},
     { 31,   "POS - Scrambling, 32 bit CRC"},
     { 32,   "ATM mapping"},

-    { 33,   "Ethernet"},
+    { 33,   "Ethernet PHY"},

     { 34,   "SONET/SDH"},
     { 35,   "Reserved (SONET deprecated)"},
     { 36,   "Digital Wrapper"},
     { 34,   "SONET/SDH"},
     { 35,   "Reserved (SONET deprecated)"},
     { 36,   "Digital Wrapper"},


@@ -113,5 +117,29 @@ struct tok gmpls_payload_values[] = {
     { 44,   "HDLC"},
     { 45,   "Ethernet V2/DIX (only)"},
     { 46,   "Ethernet 802.3 (only)"},
     { 44,   "HDLC"},
     { 45,   "Ethernet V2/DIX (only)"},
     { 46,   "Ethernet 802.3 (only)"},

+/* draft-ietf-ccamp-gmpls-g709-04.txt */
+    { 47,   "G.709 ODUj"},
+    { 48,   "G.709 OTUk(v)"},
+    { 49,   "CBR/CBRa"},
+    { 50,   "CBRb"},
+    { 51,   "BSOT"},
+    { 52,   "BSNT"},
+    { 53,   "IP/PPP (GFP)"},
+    { 54,   "Ethernet MAC (framed GFP)"},
+    { 55,   "Ethernet PHY (transparent GFP)"},
+    { 56,   "ESCON"},
+    { 57,   "FICON"},
+    { 58,   "Fiber Channel"},
+    { 0, NULL }
+};
+
+#define DIFFSERV_BC_MODEL_RDM           0   /* draft-ietf-tewg-diff-te-proto-07 */
+#define DIFFSERV_BC_MODEL_MAM           1   /* draft-ietf-tewg-diff-te-proto-07 */ 
+#define DIFFSERV_BC_MODEL_EXTD_MAM      254 /* experimental */
+
+struct tok diffserv_te_bc_values[] = {
+    {  DIFFSERV_BC_MODEL_RDM, "Russian dolls"},
+    {  DIFFSERV_BC_MODEL_MAM, "Maximum allocation"},
+    {  DIFFSERV_BC_MODEL_EXTD_MAM, "Maximum allocation with E-LSP support"},

     { 0, NULL }
 };
     { 0, NULL }
 };