Move the definitions of the various GMPLS "struct tok"s out of gmpls.h

into a new gmpls.c file; have gmpls.h contain only external declarations
of those structures.  That removes compiler warnings about static
structures being defined but not used, and also lets more than one file
share structures used in both of those files, rather than having private
definitions of them.

1 files changed, 5 insertions, 91 deletions

diff --git a/gmpls.h b/gmpls.h
index bf5a083a..b6cf880b 100644
--- a/gmpls.h
+++ b/gmpls.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/gmpls.h,v 1.1 2003-06-06 23:47:53 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/gmpls.h,v 1.2 2003-06-09 23:28:09 guy Exp $ (LBL) */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
@@ -14,93 +14,7 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-
-static struct tok gmpls_link_prot_values[] = {
-    { 0x01, "Extra Traffic"},
-    { 0x02, "Unprotected"},
-    { 0x04, "Shared"},
-    { 0x08, "Dedicated 1:1"},
-    { 0x10, "Dedicated 1+1"},
-    { 0x20, "Enhanced"},
-    { 0x40, "Reserved"},
-    { 0x80, "Reserved"},
-    { 0, NULL }
-};
-
-static struct tok gmpls_switch_cap_values[] = {
-    { 1,	"Packet-Switch Capable-1"},
-    { 2,	"Packet-Switch Capable-2"},
-    { 3,	"Packet-Switch Capable-3"},
-    { 4,	"Packet-Switch Capable-4"},
-    { 51,	"Layer-2 Switch Capable"},
-    { 100,	"Time-Division-Multiplex"},
-    { 150,	"Lambda-Switch Capable"},
-    { 200,	"Fiber-Switch Capable"},
-    { 0, NULL }
-};
-
-static struct tok gmpls_encoding_values[] = {
-    { 1,    "Packet"},
-    { 2,    "Ethernet V2/DIX"},
-    { 3,    "ANSI/ETSI PDH"},
-    { 4,    "Reserved"},
-    { 5,    "SDH ITU-T G.707/SONET ANSI T1.105"},
-    { 6,    "Reserved"},
-    { 7,    "Digital Wrapper"},
-    { 8,    "Lambda (photonic)"},
-    { 9,    "Fiber"},
-    { 10,   "Reserved"},
-    { 11,   "FiberChannel"},
-    { 0, NULL }
-};
-
-static struct tok gmpls_payload_values[] = {
-    {  0,   "Unknown"},
-    {  1,   "Reserved"},
-    {  2,   "Reserved"},
-    {  3,   "Reserved"},
-    {  4,   "Reserved"},
-    {  5,   "Asynchronous mapping of E4"},
-    {  6,   "Asynchronous mapping of DS3/T3"},
-    {  7,   "Asynchronous mapping of E3"},
-    {  8,   "Bit synchronous mapping of E3"},
-    {  9,   "Byte synchronous mapping of E3"},
-    { 10,   "Asynchronous mapping of DS2/T2"},
-    { 11,   "Bit synchronous mapping of DS2/T2"},
-    { 12,   "Reserved"},
-    { 13,   "Asynchronous mapping of E1"},
-    { 14,   "Byte synchronous mapping of E1"},
-    { 15,   "Byte synchronous mapping of 31 * DS0"},
-    { 16,   "Asynchronous mapping of DS1/T1"},
-    { 17,   "Bit synchronous mapping of DS1/T1"},
-    { 18,   "Byte synchronous mapping of DS1/T1"},
-    { 19,   "VC-11 in VC-12"},
-    { 20,   "Reserved"},
-    { 21,   "Reserved"},
-    { 22,   "DS1 SF Asynchronous"},
-    { 23,   "DS1 ESF Asynchronous"},
-    { 24,   "DS3 M23 Asynchronous"},
-    { 25,   "DS3 C-Bit Parity Asynchronous"},
-    { 26,   "VT/LOVC"},
-    { 27,   "STS SPE/HOVC"},
-    { 28,   "POS - No Scrambling, 16 bit CRC"},
-    { 29,   "POS - No Scrambling, 32 bit CRC"},
-    { 30,   "POS - Scrambling, 16 bit CRC"},
-    { 31,   "POS - Scrambling, 32 bit CRC"},
-    { 32,   "ATM mapping"},
-    { 33,   "Ethernet"},
-    { 34,   "SONET/SDH"},
-    { 35,   "Reserved (SONET deprecated)"},
-    { 36,   "Digital Wrapper"},
-    { 37,   "Lambda"},
-    { 38,   "ANSI/ETSI PDH"},
-    { 39,   "Reserved"},
-    { 40,   "Link Access Protocol SDH (X.85 and X.86)"},
-    { 41,   "FDDI"},
-    { 42,   "DQDB (ETSI ETS 300 216)"},
-    { 43,   "FiberChannel-3 (Services)"},
-    { 44,   "HDLC"},
-    { 45,   "Ethernet V2/DIX (only)"},
-    { 46,   "Ethernet 802.3 (only)"},
-    { 0, NULL }
-};
+extern struct tok gmpls_link_prot_values[];
+extern struct tok gmpls_switch_cap_values[];
+extern struct tok gmpls_encoding_values[];
+extern struct tok gmpls_payload_values[];