forked from osmocom/wireshark
Re-order 2 value_string arrays so that entries are in ascending order by value.
svn path=/trunk/; revision=43216
This commit is contained in:
Bill Meier
parent
aa0ebee47c
commit
bdebbb9bdf
|
|
@ -292,25 +292,25 @@ static dissector_handle_t tapa_handle;
|
|||
|
||||
#define IPDSFIELD_DSCP_DEFAULT 0x00
|
||||
#define IPDSFIELD_DSCP_CS1 0x08
|
||||
#define IPDSFIELD_DSCP_CS2 0x10
|
||||
#define IPDSFIELD_DSCP_CS3 0x18
|
||||
#define IPDSFIELD_DSCP_CS4 0x20
|
||||
#define IPDSFIELD_DSCP_CS5 0x28
|
||||
#define IPDSFIELD_DSCP_CS6 0x30
|
||||
#define IPDSFIELD_DSCP_CS7 0x38
|
||||
#define IPDSFIELD_DSCP_AF11 0x0A
|
||||
#define IPDSFIELD_DSCP_AF12 0x0C
|
||||
#define IPDSFIELD_DSCP_AF13 0x0E
|
||||
#define IPDSFIELD_DSCP_CS2 0x10
|
||||
#define IPDSFIELD_DSCP_AF21 0x12
|
||||
#define IPDSFIELD_DSCP_AF22 0x14
|
||||
#define IPDSFIELD_DSCP_AF23 0x16
|
||||
#define IPDSFIELD_DSCP_CS3 0x18
|
||||
#define IPDSFIELD_DSCP_AF31 0x1A
|
||||
#define IPDSFIELD_DSCP_AF32 0x1C
|
||||
#define IPDSFIELD_DSCP_AF33 0x1E
|
||||
#define IPDSFIELD_DSCP_CS4 0x20
|
||||
#define IPDSFIELD_DSCP_AF41 0x22
|
||||
#define IPDSFIELD_DSCP_AF42 0x24
|
||||
#define IPDSFIELD_DSCP_AF43 0x26
|
||||
#define IPDSFIELD_DSCP_CS5 0x28
|
||||
#define IPDSFIELD_DSCP_EF 0x2E
|
||||
#define IPDSFIELD_DSCP_CS6 0x30
|
||||
#define IPDSFIELD_DSCP_CS7 0x38
|
||||
|
||||
#define IPDSFIELD_ECT_NOT 0x00
|
||||
#define IPDSFIELD_ECT_1 0x01
|
||||
|
|
@ -1835,25 +1835,25 @@ local_network_control_block_addr_valid_ttl(guint32 addr)
|
|||
const value_string dscp_vals[] = {
|
||||
{ IPDSFIELD_DSCP_DEFAULT, "Default" },
|
||||
{ IPDSFIELD_DSCP_CS1, "Class Selector 1" },
|
||||
{ IPDSFIELD_DSCP_CS2, "Class Selector 2" },
|
||||
{ IPDSFIELD_DSCP_CS3, "Class Selector 3" },
|
||||
{ IPDSFIELD_DSCP_CS4, "Class Selector 4" },
|
||||
{ IPDSFIELD_DSCP_CS5, "Class Selector 5" },
|
||||
{ IPDSFIELD_DSCP_CS6, "Class Selector 6" },
|
||||
{ IPDSFIELD_DSCP_CS7, "Class Selector 7" },
|
||||
{ IPDSFIELD_DSCP_AF11, "Assured Forwarding 11" },
|
||||
{ IPDSFIELD_DSCP_AF12, "Assured Forwarding 12" },
|
||||
{ IPDSFIELD_DSCP_AF13, "Assured Forwarding 13" },
|
||||
{ IPDSFIELD_DSCP_CS2, "Class Selector 2" },
|
||||
{ IPDSFIELD_DSCP_AF21, "Assured Forwarding 21" },
|
||||
{ IPDSFIELD_DSCP_AF22, "Assured Forwarding 22" },
|
||||
{ IPDSFIELD_DSCP_AF23, "Assured Forwarding 23" },
|
||||
{ IPDSFIELD_DSCP_CS3, "Class Selector 3" },
|
||||
{ IPDSFIELD_DSCP_AF31, "Assured Forwarding 31" },
|
||||
{ IPDSFIELD_DSCP_AF32, "Assured Forwarding 32" },
|
||||
{ IPDSFIELD_DSCP_AF33, "Assured Forwarding 33" },
|
||||
{ IPDSFIELD_DSCP_CS4, "Class Selector 4" },
|
||||
{ IPDSFIELD_DSCP_AF41, "Assured Forwarding 41" },
|
||||
{ IPDSFIELD_DSCP_AF42, "Assured Forwarding 42" },
|
||||
{ IPDSFIELD_DSCP_AF43, "Assured Forwarding 43" },
|
||||
{ IPDSFIELD_DSCP_CS5, "Class Selector 5" },
|
||||
{ IPDSFIELD_DSCP_EF, "Expedited Forwarding" },
|
||||
{ IPDSFIELD_DSCP_CS6, "Class Selector 6" },
|
||||
{ IPDSFIELD_DSCP_CS7, "Class Selector 7" },
|
||||
{ 0, NULL }};
|
||||
value_string_ext dscp_vals_ext = VALUE_STRING_EXT_INIT(dscp_vals);
|
||||
|
||||
|
|
|
|||
|
|
@ -477,9 +477,11 @@ enum rsvp_classes {
|
|||
RSVP_CLASS_VENDOR_PRIVATE_12 = 255
|
||||
};
|
||||
|
||||
/* XXX: are any/all of the "missing" values below supposed to have value-strings */
|
||||
static const value_string rsvp_class_vals[] = {
|
||||
{ RSVP_CLASS_NULL, "NULL object"},
|
||||
{ RSVP_CLASS_SESSION, "SESSION object"},
|
||||
|
||||
{ RSVP_CLASS_HOP, "HOP object"},
|
||||
{ RSVP_CLASS_INTEGRITY, "INTEGRITY object"},
|
||||
{ RSVP_CLASS_TIME_VALUES, "TIME VALUES object"},
|
||||
|
|
@ -499,30 +501,42 @@ static const value_string rsvp_class_vals[] = {
|
|||
{ RSVP_CLASS_LABEL_REQUEST, "LABEL REQUEST object"},
|
||||
{ RSVP_CLASS_EXPLICIT_ROUTE, "EXPLICIT ROUTE object"},
|
||||
{ RSVP_CLASS_RECORD_ROUTE, "RECORD ROUTE object"},
|
||||
{ RSVP_CLASS_SESSION_ATTRIBUTE, "SESSION ATTRIBUTE object"},
|
||||
|
||||
{ RSVP_CLASS_HELLO, "HELLO object"},
|
||||
|
||||
{ RSVP_CLASS_MESSAGE_ID, "MESSAGE-ID object"},
|
||||
{ RSVP_CLASS_MESSAGE_ID_ACK, "MESSAGE-ID ACK/NACK object"},
|
||||
{ RSVP_CLASS_MESSAGE_ID_LIST, "MESSAGE-ID LIST object"},
|
||||
{ RSVP_CLASS_HELLO, "HELLO object"},
|
||||
|
||||
/*
|
||||
RSVP_CLASS_DIAGNOSTIC
|
||||
RSVP_CLASS_ROUTE,
|
||||
RSVP_CLASS_DIAG_RESPONSE,
|
||||
RSVP_CLASS_DIAG_SELECT,
|
||||
*/
|
||||
|
||||
{ RSVP_CLASS_RECOVERY_LABEL, "RECOVERY-LABEL object"},
|
||||
{ RSVP_CLASS_UPSTREAM_LABEL, "UPSTREAM-LABEL object"},
|
||||
{ RSVP_CLASS_LABEL_SET, "LABEL-SET object"},
|
||||
{ RSVP_CLASS_PROTECTION, "PROTECTION object"},
|
||||
|
||||
/*
|
||||
RSVP_CLASS_DSBM_IP_ADDRESS
|
||||
RSVP_CLASS_SBM_PRIORITY,
|
||||
RSVP_CLASS_DSBM_TIMER_INTERVALS,
|
||||
RSVP_CLASS_SBM_INFO,
|
||||
*/
|
||||
|
||||
{ RSVP_CLASS_DETOUR, "DETOUR object"},
|
||||
/*
|
||||
RSVP_CLASS_CHALLENGE,
|
||||
*/
|
||||
{ RSVP_CLASS_DIFFSERV, "DIFFSERV object"},
|
||||
{ RSVP_CLASS_CLASSTYPE, "CLASSTYPE object"},
|
||||
{ RSVP_CLASS_SUGGESTED_LABEL, "SUGGESTED-LABEL object"},
|
||||
{ RSVP_CLASS_ACCEPTABLE_LABEL_SET, "ACCEPTABLE-LABEL-SET object"},
|
||||
{ RSVP_CLASS_RESTART_CAP, "RESTART-CAPABILITY object"},
|
||||
{ RSVP_CLASS_DCLASS, "DCLASS object"},
|
||||
{ RSVP_CLASS_LSP_TUNNEL_IF_ID, "LSP-TUNNEL INTERFACE-ID object"},
|
||||
{ RSVP_CLASS_NOTIFY_REQUEST, "NOTIFY-REQUEST object"},
|
||||
{ RSVP_CLASS_ADMIN_STATUS, "ADMIN-STATUS object"},
|
||||
{ RSVP_CLASS_LSP_ATTRIBUTES, "LSP ATTRIBUTES object"},
|
||||
{ RSVP_CLASS_ASSOCIATION, "ASSOCIATION object"},
|
||||
{ RSVP_CLASS_GENERALIZED_UNI, "GENERALIZED-UNI object"},
|
||||
{ RSVP_CLASS_CALL_ID, "CALL-ID object"},
|
||||
{ RSVP_CLASS_DETOUR, "DETOUR object"},
|
||||
{ RSVP_CLASS_FAST_REROUTE, "FAST-REROUTE object"},
|
||||
/*
|
||||
RSVP_CLASS_LSP_REQUIRED_ATTRIBUTES,
|
||||
*/
|
||||
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_1, "VENDOR PRIVATE object (0bbbbbbb: "
|
||||
"reject if unknown)"},
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_2, "VENDOR PRIVATE object (0bbbbbbb: "
|
||||
|
|
@ -531,6 +545,14 @@ static const value_string rsvp_class_vals[] = {
|
|||
"reject if unknown)"},
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_4, "VENDOR PRIVATE object (0bbbbbbb: "
|
||||
"reject if unknown)"},
|
||||
|
||||
/*
|
||||
RSVP_CLASS_NODE_CHAR
|
||||
*/
|
||||
{ RSVP_CLASS_SUGGESTED_LABEL, "SUGGESTED-LABEL object"},
|
||||
{ RSVP_CLASS_ACCEPTABLE_LABEL_SET, "ACCEPTABLE-LABEL-SET object"},
|
||||
{ RSVP_CLASS_RESTART_CAP, "RESTART-CAPABILITY object"},
|
||||
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_5, "VENDOR PRIVATE object (10bbbbbb: "
|
||||
"ignore if unknown)"},
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_6, "VENDOR PRIVATE object (10bbbbbb: "
|
||||
|
|
@ -539,6 +561,35 @@ static const value_string rsvp_class_vals[] = {
|
|||
"ignore if unknown)"},
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_8, "VENDOR PRIVATE object (10bbbbbb: "
|
||||
"ignore if unknown)"},
|
||||
/*
|
||||
RSVP_CLASS_SESSION_ASSOC
|
||||
*/
|
||||
{ RSVP_CLASS_LSP_TUNNEL_IF_ID, "LSP-TUNNEL INTERFACE-ID object"},
|
||||
|
||||
{ RSVP_CLASS_NOTIFY_REQUEST, "NOTIFY-REQUEST object"},
|
||||
{ RSVP_CLASS_ADMIN_STATUS, "ADMIN-STATUS object"},
|
||||
{ RSVP_CLASS_LSP_ATTRIBUTES, "LSP ATTRIBUTES object"},
|
||||
/*
|
||||
RSVP_CLASS_ALARM_SPEC,
|
||||
*/
|
||||
{ RSVP_CLASS_ASSOCIATION, "ASSOCIATION object"},
|
||||
|
||||
{ RSVP_CLASS_FAST_REROUTE, "FAST-REROUTE object"},
|
||||
|
||||
{ RSVP_CLASS_SESSION_ATTRIBUTE, "SESSION ATTRIBUTE object"},
|
||||
|
||||
{ RSVP_CLASS_DCLASS, "DCLASS object"},
|
||||
/*
|
||||
RSVP_CLASS_PACKETCABLE_EXTENSIONS,
|
||||
RSVP_CLASS_ATM_SERVICECLASS,
|
||||
RSVP_CLASS_CALL_OPS,
|
||||
*/
|
||||
{ RSVP_CLASS_GENERALIZED_UNI, "GENERALIZED-UNI object"},
|
||||
{ RSVP_CLASS_CALL_ID, "CALL-ID object"},
|
||||
/*
|
||||
RSVP_CLASS_3GPP2_OBJECT,
|
||||
*/
|
||||
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_9, "VENDOR PRIVATE object (11bbbbbb: "
|
||||
"forward if unknown)"},
|
||||
{ RSVP_CLASS_VENDOR_PRIVATE_10, "VENDOR PRIVATE object (11bbbbbb: "
|
||||
|
|
|
|||
Loading…
Reference in New Issue