Reformat value_string, its comments and whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31415 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 1916632a21a04d5d24703bac68553b6035190268..5b1decf8f02cf4c5f697822a09aa196d8a5c3817 100644 (file)
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -48,85 +48,85 @@ static dissector_table_t ethertype_dissector_table;
 static dissector_handle_t data_handle;
 
 const value_string etype_vals[] = {
-    {ETHERTYPE_IP,                                             "IP"                            },
-    {ETHERTYPE_IPv6,                                   "IPv6"                          },
-    {ETHERTYPE_WLCCP,                                  "Cisco Wireless Lan Context Control Protocol"           },
-    {ETHERTYPE_CENTRINO_PROMISC,               "IEEE 802.11 (Centrino promiscuous)" },
-    {ETHERTYPE_XNS_IDP,                                        "XNS Internet Datagram Protocol" },
-    {ETHERTYPE_X25L3,                                  "X.25 Layer 3"                  },
-    {ETHERTYPE_ARP,                                            "ARP"                           },
-    {ETHERTYPE_WOL,                                            "Wake on LAN"                   },
-    {ETHERTYPE_WMX_M2M,                                        "WiMax Mac-to-Mac"              },
-    {ETHERTYPE_EPL_V1,                                 "EPL_V1"                                },
-    {ETHERTYPE_REVARP,                                 "RARP"                          },
-    {ETHERTYPE_DEC_LB,                                 "DEC LanBridge"                 },
-    {ETHERTYPE_ATALK,                                  "Appletalk"                     },
-    {ETHERTYPE_SNA,                                            "SNA-over-Ethernet"             },
-    {ETHERTYPE_DLR,                                       "EtherNet/IP Device Level Ring" },
-    {ETHERTYPE_AARP,                                   "AARP"                          },
-    {ETHERTYPE_IPX,                                            "Netware IPX/SPX"               },
-    {ETHERTYPE_VINES_IP,                               "Vines IP"                      },
-    {ETHERTYPE_VINES_ECHO,                             "Vines Echo"                    },
-    {ETHERTYPE_TRAIN,                                  "Netmon Train"                  },
-    {ETHERTYPE_LOOP,                                   "Loopback"                      }, /* Ethernet Loopback */
-    {ETHERTYPE_FOUNDRY,                                        "Foundry proprietary"           },
-    {ETHERTYPE_WCP,                                            "Wellfleet Compression Protocol" },
-    {ETHERTYPE_STP,                                            "Spanning Tree Protocol"        },
-    {ETHERTYPE_ISMP,                                   "Cabletron Interswitch Message Protocol" },
-    {ETHERTYPE_ISMP_TBFLOOD,                   "Cabletron SFVLAN 1.8 Tag-Based Flood" },
-                               /* for ISMP, see RFC 2641, RFC 2642, RFC 2643 */
-    {ETHERTYPE_QNX_QNET6,                              "QNX 6 QNET protocol"           },
-                               /* In www.iana.org/assignments/ethernet-numbers, 8203-8205 description is Quantum Software. 
-                                * Now the company is called QNX Software Systems.
-                                */ 
-    {ETHERTYPE_PPPOED,                                 "PPPoE Discovery"               },
-    {ETHERTYPE_PPPOES,                                 "PPPoE Session"                 },
-    {ETHERTYPE_INTEL_ANS,                              "Intel ANS probe"               },
-    {ETHERTYPE_MS_NLB_HEARTBEAT,               "MS NLB heartbeat"      },
-    {ETHERTYPE_HOMEPLUG,                               "Homeplug"                      },
-    {ETHERTYPE_VLAN,                                   "802.1Q Virtual LAN"            },
-    {ETHERTYPE_IEEE_802_1AD,                   "802.1ad Provider Bridge (Q-in-Q)"},
-    {ETHERTYPE_IEEE_802_1AH,                   "802.1ah Provider Backbone Bridge (mac-in-mac)"},
-    {ETHERTYPE_EAPOL,                                  "802.1X Authentication"         },
-    {ETHERTYPE_RSN_PREAUTH,                            "802.11i Pre-Authentication"    },
-    {ETHERTYPE_MPLS,                                   "MPLS label switched packet"    },
-    {ETHERTYPE_MPLS_MULTI,                             "MPLS multicast label switched packet" },
-    {ETHERTYPE_3C_NBP_DGRAM,                   "3Com NBP Datagram"             },
-    {ETHERTYPE_DEC,                                            "DEC proto"                     },
-    {ETHERTYPE_DNA_DL,                                 "DEC DNA Dump/Load"             },
-    {ETHERTYPE_DNA_RC,                                 "DEC DNA Remote Console"        },
-    {ETHERTYPE_DNA_RT,                                 "DEC DNA Routing"               },
-    {ETHERTYPE_LAT,                                            "DEC LAT"                       },
-    {ETHERTYPE_DEC_DIAG,                               "DEC Diagnostics"               },
-    {ETHERTYPE_DEC_CUST,                               "DEC Customer use"              },
-    {ETHERTYPE_DEC_SCA,                                        "DEC LAVC/SCA"                  },
-    {ETHERTYPE_DEC_LAST,                               "DEC LAST"                      },
-    {ETHERTYPE_ETHBRIDGE,                              "Transparent Ethernet bridging" },
-    {ETHERTYPE_CGMP,                                   "Cisco Group Management Protocol" },
-    {ETHERTYPE_MAC_CONTROL,                            "MAC Control" },
-    {ETHERTYPE_SLOW_PROTOCOLS,                 "Slow Protocols" },
-    {ETHERTYPE_RTMAC,                                  "Real-Time Media Access Control" },
-    {ETHERTYPE_RTCFG,                                  "Real-Time Configuration Protocol" },
-    {ETHERTYPE_CDMA2000_A10_UBS,               "CDMA2000 A10 Unstructured byte stream" },
-    {ETHERTYPE_PROFINET,                               "PROFINET"},
-    {ETHERTYPE_AOE,                                            "ATA over Ethernet" },
-    {ETHERTYPE_ECATF,                                  "EtherCAT frame" },
-    {ETHERTYPE_TELKONET,                               "Telkonet powerline" },
-    {ETHERTYPE_EPL_V2,                                 "ETHERNET Powerlink v2" },
-    {ETHERTYPE_XIMETA,                                 "XiMeta Technology" },
-    {ETHERTYPE_CSM_ENCAPS,                             "CSM_ENCAPS Protocol" },
-    {ETHERTYPE_IEEE802_OUI_EXTENDED,   "IEEE 802a OUI Extended Ethertype" },
-    {ETHERTYPE_IEC61850_GOOSE,                 "IEC 61850/GOOSE" },
-    {ETHERTYPE_IEC61850_GSE,                   "IEC 61850/GSE management services" },
-    {ETHERTYPE_IEC61850_SV,                            "IEC 61850/SV (Sampled Value Transmission" },
-    {ETHERTYPE_TIPC,                                   "Transparent Inter Process Communication" },
-    {ETHERTYPE_LLDP,                                   "802.1 Link Layer Discovery Protocol (LLDP)" },
-    {ETHERTYPE_3GPP2,                                  "CDMA2000 A10 3GPP2 Packet" },
-    {ETHERTYPE_TTE_PCF,                                        "TTEthernet Protocol Control Frame" },
-    {ETHERTYPE_LLTD,                                   "Link Layer Topology Discovery (LLTD)" },
-    {ETHERTYPE_WSMP,                                   "(WAVE) Short Message Protocol (WSM)" },
-    {ETHERTYPE_COBRANET,                               "Cirrus Cobranet Packet" },
-    {ETHERTYPE_NSRP,                                   "Juniper Netscreen Redundant Protocol" },
+  { ETHERTYPE_IP, "IP" },
+  { ETHERTYPE_IPv6, "IPv6" },
+  { ETHERTYPE_WLCCP, "Cisco Wireless Lan Context Control Protocol" },
+  { ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" },
+  { ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
+  { ETHERTYPE_X25L3, "X.25 Layer 3" },
+  { ETHERTYPE_ARP, "ARP" },
+  { ETHERTYPE_WOL, "Wake on LAN" },
+  { ETHERTYPE_WMX_M2M, "WiMax Mac-to-Mac" },
+  { ETHERTYPE_EPL_V1, "EPL_V1" },
+  { ETHERTYPE_REVARP, "RARP" },
+  { ETHERTYPE_DEC_LB, "DEC LanBridge" },
+  { ETHERTYPE_ATALK, "Appletalk" },
+  { ETHERTYPE_SNA, "SNA-over-Ethernet" },
+  { ETHERTYPE_DLR, "EtherNet/IP Device Level Ring" },
+  { ETHERTYPE_AARP, "AARP" },
+  { ETHERTYPE_IPX, "Netware IPX/SPX" },
+  { ETHERTYPE_VINES_IP, "Vines IP" },
+  { ETHERTYPE_VINES_ECHO, "Vines Echo" },
+  { ETHERTYPE_TRAIN, "Netmon Train" },
+    /* Ethernet Loopback */
+  { ETHERTYPE_LOOP, "Loopback" },
+  { ETHERTYPE_FOUNDRY, "Foundry proprietary" },
+  { ETHERTYPE_WCP, "Wellfleet Compression Protocol" },
+  { ETHERTYPE_STP, "Spanning Tree Protocol" },
+    /* for ISMP, see RFC 2641, RFC 2642, RFC 2643 */
+  { ETHERTYPE_ISMP, "Cabletron Interswitch Message Protocol" },
+  { ETHERTYPE_ISMP_TBFLOOD, "Cabletron SFVLAN 1.8 Tag-Based Flood" },
+    /* In www.iana.org/assignments/ethernet-numbers, 8203-8205 description is
+     * Quantum Software.  Now the company is called QNX Software Systems. */
+  { ETHERTYPE_QNX_QNET6, "QNX 6 QNET protocol" },
+  { ETHERTYPE_PPPOED, "PPPoE Discovery" },
+  { ETHERTYPE_PPPOES, "PPPoE Session" },
+  { ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
+  { ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
+  { ETHERTYPE_HOMEPLUG, "Homeplug" },
+  { ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
+  { ETHERTYPE_IEEE_802_1AD, "802.1ad Provider Bridge (Q-in-Q)" },
+  { ETHERTYPE_IEEE_802_1AH, "802.1ah Provider Backbone Bridge (mac-in-mac)" },
+  { ETHERTYPE_EAPOL, "802.1X Authentication" },
+  { ETHERTYPE_RSN_PREAUTH, "802.11i Pre-Authentication" },
+  { ETHERTYPE_MPLS, "MPLS label switched packet" },
+  { ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
+  { ETHERTYPE_3C_NBP_DGRAM, "3Com NBP Datagram" },
+  { ETHERTYPE_DEC, "DEC proto" },
+  { ETHERTYPE_DNA_DL, "DEC DNA Dump/Load" },
+  { ETHERTYPE_DNA_RC, "DEC DNA Remote Console" },
+  { ETHERTYPE_DNA_RT, "DEC DNA Routing" },
+  { ETHERTYPE_LAT, "DEC LAT" },
+  { ETHERTYPE_DEC_DIAG, "DEC Diagnostics" },
+  { ETHERTYPE_DEC_CUST, "DEC Customer use" },
+  { ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
+  { ETHERTYPE_DEC_LAST, "DEC LAST" },
+  { ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
+  { ETHERTYPE_CGMP, "Cisco Group Management Protocol" },
+  { ETHERTYPE_MAC_CONTROL, "MAC Control" },
+  { ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" },
+  { ETHERTYPE_RTMAC, "Real-Time Media Access Control" },
+  { ETHERTYPE_RTCFG, "Real-Time Configuration Protocol" },
+  { ETHERTYPE_CDMA2000_A10_UBS, "CDMA2000 A10 Unstructured byte stream" },
+  { ETHERTYPE_PROFINET, "PROFINET"},
+  { ETHERTYPE_AOE, "ATA over Ethernet" },
+  { ETHERTYPE_ECATF, "EtherCAT frame" },
+  { ETHERTYPE_TELKONET, "Telkonet powerline" },
+  { ETHERTYPE_EPL_V2, "ETHERNET Powerlink v2"  },
+  { ETHERTYPE_XIMETA, "XiMeta Technology" },
+  { ETHERTYPE_CSM_ENCAPS, "CSM_ENCAPS Protocol" },
+  { ETHERTYPE_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" },
+  { ETHERTYPE_IEC61850_GOOSE, "IEC 61850/GOOSE" },
+  { ETHERTYPE_IEC61850_GSE, "IEC 61850/GSE management services" },
+  { ETHERTYPE_IEC61850_SV, "IEC 61850/SV (Sampled Value Transmission" },
+  { ETHERTYPE_TIPC, "Transparent Inter Process Communication" },
+  { ETHERTYPE_LLDP, "802.1 Link Layer Discovery Protocol (LLDP)" },
+  { ETHERTYPE_3GPP2, "CDMA2000 A10 3GPP2 Packet" },
+  { ETHERTYPE_TTE_PCF, "TTEthernet Protocol Control Frame" },
+  { ETHERTYPE_LLTD, "Link Layer Topology Discovery (LLTD)" },
+  { ETHERTYPE_WSMP, "(WAVE) Short Message Protocol (WSM)" },
+  { ETHERTYPE_COBRANET, "Cirrus Cobranet Packet" },
+  { ETHERTYPE_NSRP, "Juniper Netscreen Redundant Protocol" },
     /*
      * NDISWAN on Windows translates Ethernet frames from higher-level
      * protocols into PPP frames to hand to the PPP driver, and translates
@@ -142,18 +142,19 @@ const value_string etype_vals[] = {
      * protocols internal to PPP, so we list as "Ethernet" protocol
      * types the PPP protocol types we've seen.
      */
-    {PPP_IPCP,                                 "PPP IP Control Protocol" },
-    {PPP_LCP,                                  "PPP Link Control Protocol" },
-    {PPP_PAP,                                  "PPP Password Authentication Protocol" },
-    {PPP_CCP,                                  "PPP Compression Control Protocol" },
-    {ETHERTYPE_LLT,                            "Veritas Low Latency Transport (not officially registered)"},
-    {ETHERTYPE_CFM,                            "IEEE 802.1ag Connectivity Fault Management (CFM) protocol" },
-    {ETHERTYPE_FCOE,                   "Fibre Channel over Ethernet" },
-    {ETHERTYPE_FIP,                            "FCoE Initialization Protocol" },
-    {ETHERTYPE_PTP,                            "PTPv2 over Ethernet (IEEE1588)"},
-    {ETHERTYPE_PRP,                            "Parallel Redundancy Protocol (IEC62439 Chapter 6)"},
-    {ETHERTYPE_FLIP,                           "Flow Layer Internal Protocol"},
-    {0,                                                NULL } };
+  { PPP_IPCP, "PPP IP Control Protocol" },
+  { PPP_LCP, "PPP Link Control Protocol" },
+  { PPP_PAP, "PPP Password Authentication Protocol" },
+  { PPP_CCP, "PPP Compression Control Protocol" },
+  { ETHERTYPE_LLT, "Veritas Low Latency Transport (not officially registered)" },
+  { ETHERTYPE_CFM, "IEEE 802.1ag Connectivity Fault Management (CFM) protocol" },
+  { ETHERTYPE_FCOE, "Fibre Channel over Ethernet" },
+  { ETHERTYPE_FIP, "FCoE Initialization Protocol" },
+  { ETHERTYPE_PTP, "PTPv2 over Ethernet (IEEE1588)" },
+  { ETHERTYPE_PRP, "Parallel Redundancy Protocol (IEC62439 Chapter 6)" },
+  { ETHERTYPE_FLIP, "Flow Layer Internal Protocol" },
+  { 0, NULL }
+};
 
 static void add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree,
     int trailer_id, tvbuff_t *tvb, tvbuff_t *next_tvb, int offset_after_etype,