forked from osmocom/wireshark
Various minor changes:
- Create/use some extended value_strings - Remove unneeded #includes; - Do whitespace changes; - Add editor modelines. Change-Id: I2e1ea37dddfd5e8656c90c0d45a6596c4912bb2c Reviewed-on: https://code.wireshark.org/review/4065 Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
parent
4567134a56
commit
cc286bad25
|
@ -260,6 +260,7 @@ static const value_string a11_types[] = {
|
|||
|
||||
{0, NULL},
|
||||
};
|
||||
static value_string_ext a11_types_ext = VALUE_STRING_EXT_INIT(a11_types);
|
||||
|
||||
static const value_string a11_ses_ptype_vals[] = {
|
||||
{0x8881, "Unstructured Byte Stream"},
|
||||
|
@ -312,7 +313,7 @@ static const value_string a11_reply_codes[]= {
|
|||
{142, "Registration Denied - nonexistent A10 or IP flow"},
|
||||
{0, NULL},
|
||||
};
|
||||
|
||||
static value_string_ext a11_reply_codes_ext = VALUE_STRING_EXT_INIT(a11_reply_codes);
|
||||
|
||||
static const value_string a11_ack_status[]= {
|
||||
{0x00, "Update Accepted"},
|
||||
|
@ -328,6 +329,7 @@ static const value_string a11_ack_status[]= {
|
|||
{0xff, "Update Denied - handoff in progress"},
|
||||
{0, NULL},
|
||||
};
|
||||
static value_string_ext a11_ack_status_ext = VALUE_STRING_EXT_INIT(a11_ack_status);
|
||||
|
||||
typedef enum {
|
||||
MH_AUTH_EXT = 32,
|
||||
|
@ -357,11 +359,12 @@ static const value_string a11_ext_types[]= {
|
|||
{RU_AUTH_EXT, "Registration Update Authentication Extension"},
|
||||
{MN_NAI_EXT, "Mobile Node NAI Extension"},
|
||||
{MF_CHALLENGE_EXT, "MN-FA Challenge Extension"},
|
||||
{NVSE_EXT, "Normal Vendor/Organization Specific Extension"},
|
||||
{OLD_NVSE_EXT, "Normal Vendor/Organization Specific Extension (OLD)"},
|
||||
{NVSE_EXT, "Normal Vendor/Organization Specific Extension"},
|
||||
{BCMCS_EXT, "BCMCS Session Extension"},
|
||||
{0, NULL},
|
||||
};
|
||||
static value_string_ext a11_ext_types_ext = VALUE_STRING_EXT_INIT(a11_ext_types);
|
||||
|
||||
static const value_string a11_ext_stypes[]= {
|
||||
{1, "MN AAA Extension"},
|
||||
|
@ -462,6 +465,7 @@ static const value_string a11_ext_app[]= {
|
|||
{0xB001, "System Identifiers (BSID / HRPD Subnet)"},
|
||||
{0, NULL},
|
||||
};
|
||||
static value_string_ext a11_ext_app_ext = VALUE_STRING_EXT_INIT(a11_ext_app);
|
||||
|
||||
#if 0
|
||||
static const value_string a11_airlink_types[]= {
|
||||
|
@ -497,7 +501,6 @@ static const value_string a11_rohc_profile_vals[] =
|
|||
{ 0x0003, "ROHC ESP" }, /*RFC 3095*/
|
||||
{ 0x0004, "ROHC IP" }, /*RFC 3843*/
|
||||
{ 0x0005, "ROHC LLA" }, /*RFC 3242*/
|
||||
{ 0x0105, "ROHC LLA with R-mode" }, /*RFC 3408*/
|
||||
{ 0x0006, "ROHC TCP" }, /*RFC 4996*/
|
||||
{ 0x0007, "ROHC RTP/UDP-Lite" }, /*RFC 4019*/
|
||||
{ 0x0008, "ROHC UDP-Lite" }, /*RFC 4019*/
|
||||
|
@ -505,10 +508,12 @@ static const value_string a11_rohc_profile_vals[] =
|
|||
{ 0x0102, "ROHCv2 UDP" }, /*RFC 5225*/
|
||||
{ 0x0103, "ROHCv2 ESP" }, /*RFC 5225*/
|
||||
{ 0x0104, "ROHCv2 IP" }, /*RFC 5225*/
|
||||
{ 0x0105, "ROHC LLA with R-mode" }, /*RFC 3408*/
|
||||
{ 0x0107, "ROHCv2 RTP/UDP-Lite" }, /*RFC 5225*/
|
||||
{ 0x0108, "ROHCv2 UDP-Lite" }, /*RFC 5225*/
|
||||
{ 0, NULL },
|
||||
};
|
||||
static value_string_ext a11_rohc_profile_vals_ext = VALUE_STRING_EXT_INIT(a11_rohc_profile_vals);
|
||||
|
||||
#define NUM_ATTR (sizeof(attrs)/sizeof(struct radius_attribute))
|
||||
|
||||
|
@ -1331,7 +1336,7 @@ dissect_a11_extensions( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tre
|
|||
|
||||
ext_tree = proto_tree_add_subtree_format(exts_tree, tvb, offset, ext_len + hdrLen,
|
||||
ett_a11_ext, NULL, "Extension: %s",
|
||||
val_to_str(ext_type, a11_ext_types,
|
||||
val_to_str_ext(ext_type, &a11_ext_types_ext,
|
||||
"Unknown Extension %u"));
|
||||
|
||||
proto_tree_add_uint(ext_tree, hf_a11_ext_type, tvb, offset, 1, ext_type);
|
||||
|
@ -1551,7 +1556,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
|
|||
return 0; /* not enough data to check message type */
|
||||
|
||||
type = tvb_get_guint8(tvb, offset);
|
||||
if (try_val_to_str(type, a11_types) == NULL)
|
||||
if (try_val_to_str_ext(type, &a11_types_ext) == NULL)
|
||||
return 0; /* not a known message type */
|
||||
|
||||
/* Make entries in Protocol column and Info column on summary display */
|
||||
|
@ -2072,7 +2077,7 @@ proto_register_a11(void)
|
|||
static hf_register_info hf[] = {
|
||||
{ &hf_a11_type,
|
||||
{ "Message Type", "a11.type",
|
||||
FT_UINT8, BASE_DEC, VALS(a11_types), 0,
|
||||
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_types_ext, 0,
|
||||
"A11 Message Type", HFILL }
|
||||
},
|
||||
{ &hf_a11_flags,
|
||||
|
@ -2117,12 +2122,12 @@ proto_register_a11(void)
|
|||
},
|
||||
{ &hf_a11_code,
|
||||
{ "Reply Code", "a11.code",
|
||||
FT_UINT8, BASE_DEC, VALS(a11_reply_codes), 0,
|
||||
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_reply_codes_ext, 0,
|
||||
"A11 Registration Reply code", HFILL }
|
||||
},
|
||||
{ &hf_a11_status,
|
||||
{ "Reply Status", "a11.ackstat",
|
||||
FT_UINT8, BASE_DEC, VALS(a11_ack_status), 0,
|
||||
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_ack_status_ext, 0,
|
||||
"A11 Registration Ack Status", HFILL }
|
||||
},
|
||||
{ &hf_a11_life,
|
||||
|
@ -2153,7 +2158,7 @@ proto_register_a11(void)
|
|||
},
|
||||
{ &hf_a11_ext_type,
|
||||
{ "Extension Type", "a11.ext.type",
|
||||
FT_UINT8, BASE_DEC, VALS(a11_ext_types), 0,
|
||||
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_ext_types_ext, 0,
|
||||
"Mobile IP Extension Type", HFILL }
|
||||
},
|
||||
{ &hf_a11_ext_stype,
|
||||
|
@ -2228,7 +2233,7 @@ proto_register_a11(void)
|
|||
},
|
||||
{ &hf_a11_vse_apptype,
|
||||
{ "Application Type", "a11.ext.apptype",
|
||||
FT_UINT8, BASE_HEX, VALS(a11_ext_app), 0,
|
||||
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &a11_ext_app_ext, 0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_a11_vse_ppaddr,
|
||||
|
@ -2263,7 +2268,7 @@ proto_register_a11(void)
|
|||
},
|
||||
{ &hf_a11_vse_code,
|
||||
{ "Reply Code", "a11.ext.code",
|
||||
FT_UINT8, BASE_DEC, VALS(a11_reply_codes), 0,
|
||||
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &a11_reply_codes_ext, 0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
/* XXX: Is this the correct filter name ?? */
|
||||
|
@ -2596,7 +2601,7 @@ proto_register_a11(void)
|
|||
|
||||
{ &hf_a11_ase_forward_profile,
|
||||
{ "Forward Profile", "a11.ext.ase.forwardprofile",
|
||||
FT_UINT16, BASE_DEC, VALS(a11_rohc_profile_vals), 0,
|
||||
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &a11_rohc_profile_vals_ext, 0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
|
||||
|
@ -2633,7 +2638,7 @@ proto_register_a11(void)
|
|||
|
||||
{ &hf_a11_ase_reverse_profile,
|
||||
{ "Reverse Profile", "a11.ext.ase.reverseprofile",
|
||||
FT_UINT16, BASE_DEC, VALS(a11_rohc_profile_vals), 0,
|
||||
FT_UINT16, BASE_DEC | BASE_EXT_STRING, &a11_rohc_profile_vals_ext, 0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_a11_aut_flow_prof_sub_type,
|
||||
|
@ -2753,3 +2758,16 @@ proto_reg_handoff_a11(void)
|
|||
/* 3GPP2-Authorized-Flow-Profile-IDs(131) */
|
||||
radius_register_avp_dissector(VENDOR_THE3GPP2, 131, dissect_3gpp2_radius_aut_flow_profile_ids);
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -143,6 +143,7 @@ static const value_string artnet_opcode_vals[] = {
|
|||
{ ARTNET_OP_IP_PROG_REPLY, "ArtIpProgReply" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext artnet_opcode_vals_ext = VALUE_STRING_EXT_INIT(artnet_opcode_vals);
|
||||
|
||||
static const value_string artnet_oem_code_vals[] = {
|
||||
{ 0x0000, "Artistic Licence:DMX-Hub:4x DMX in,4x DMX out" },
|
||||
|
@ -2465,13 +2466,13 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
opcode = tvb_get_letohs(tvb, offset);
|
||||
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%04x)",
|
||||
val_to_str_const(opcode, artnet_opcode_vals, "Unknown"), opcode);
|
||||
val_to_str_ext_const(opcode, &artnet_opcode_vals_ext, "Unknown"), opcode);
|
||||
|
||||
if (tree) {
|
||||
proto_tree_add_uint(artnet_header_tree, hf_artnet_header_opcode, tvb,
|
||||
offset, 2, opcode);
|
||||
|
||||
proto_item_append_text(ti, ", Opcode: %s (0x%04x)", val_to_str_const(opcode, artnet_opcode_vals, "Unknown"), opcode);
|
||||
proto_item_append_text(ti, ", Opcode: %s (0x%04x)", val_to_str_ext_const(opcode, &artnet_opcode_vals_ext, "Unknown"), opcode);
|
||||
}
|
||||
offset += 2;
|
||||
|
||||
|
@ -3193,7 +3194,7 @@ proto_register_artnet(void) {
|
|||
{ &hf_artnet_header_opcode,
|
||||
{ "Opcode",
|
||||
"artnet.header.opcode",
|
||||
FT_UINT16, BASE_HEX, VALS(artnet_opcode_vals), 0x0,
|
||||
FT_UINT16, BASE_HEX | BASE_EXT_STRING, &artnet_opcode_vals_ext, 0x0,
|
||||
"Art-Net message type", HFILL }},
|
||||
|
||||
{ &hf_artnet_header_protver,
|
||||
|
@ -4336,3 +4337,16 @@ proto_reg_handoff_artnet(void) {
|
|||
|
||||
heur_dissector_add("udp", dissect_artnet_heur, proto_artnet);
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 2
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
||||
* :indentSize=2:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -1440,3 +1440,16 @@ typedef enum
|
|||
sgsap_elem_idx_t;
|
||||
|
||||
#endif /* __PACKET_GSM_A_COMMON_H__ */
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -110,13 +110,15 @@ const value_string gsm_a_dtap_msg_gmm_strings[] = {
|
|||
{ 0x12, "Authentication and Ciphering Req" },
|
||||
{ 0x13, "Authentication and Ciphering Resp" },
|
||||
{ 0x14, "Authentication and Ciphering Rej" },
|
||||
{ 0x1c, "Authentication and Ciphering Failure" },
|
||||
{ 0x15, "Identity Request" },
|
||||
{ 0x16, "Identity Response" },
|
||||
{ 0x1c, "Authentication and Ciphering Failure" },
|
||||
{ 0x20, "GMM Status" },
|
||||
{ 0x21, "GMM Information" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext gsm_a_dtap_msg_gmm_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_dtap_msg_gmm_strings);
|
||||
|
||||
|
||||
const value_string gsm_a_dtap_msg_sm_strings[] = {
|
||||
{ 0x41, "Activate PDP Context Request" },
|
||||
|
@ -150,6 +152,8 @@ const value_string gsm_a_dtap_msg_sm_strings[] = {
|
|||
{ 0x5d, "Notification" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext gsm_a_dtap_msg_sm_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_dtap_msg_sm_strings);
|
||||
|
||||
|
||||
static const value_string gsm_gm_elem_strings[] = {
|
||||
/* GPRS Mobility Management Information Elements 10.5.5 */
|
||||
|
@ -7074,7 +7078,7 @@ get_gmm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf_idx
|
|||
{
|
||||
gint idx;
|
||||
|
||||
*msg_str = try_val_to_str_idx((guint32) (oct & DTAP_GMM_IEI_MASK), gsm_a_dtap_msg_gmm_strings, &idx);
|
||||
*msg_str = try_val_to_str_idx_ext((guint32) (oct & DTAP_GMM_IEI_MASK), &gsm_a_dtap_msg_gmm_strings_ext, &idx);
|
||||
*hf_idx = hf_gsm_a_dtap_msg_gmm_type;
|
||||
if (*msg_str != NULL) {
|
||||
*ett_tree = ett_gsm_dtap_msg_gmm[idx];
|
||||
|
@ -7089,7 +7093,7 @@ get_sm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf_idx,
|
|||
{
|
||||
gint idx;
|
||||
|
||||
*msg_str = try_val_to_str_idx((guint32) (oct & DTAP_SM_IEI_MASK), gsm_a_dtap_msg_sm_strings, &idx);
|
||||
*msg_str = try_val_to_str_idx_ext((guint32) (oct & DTAP_SM_IEI_MASK), &gsm_a_dtap_msg_sm_strings_ext, &idx);
|
||||
*hf_idx = hf_gsm_a_dtap_msg_sm_type;
|
||||
if (*msg_str != NULL) {
|
||||
*ett_tree = ett_gsm_dtap_msg_sm[idx];
|
||||
|
@ -7111,12 +7115,12 @@ proto_register_gsm_a_gm(void)
|
|||
static hf_register_info hf[] = {
|
||||
{ &hf_gsm_a_dtap_msg_gmm_type,
|
||||
{ "DTAP GPRS Mobility Management Message Type", "gsm_a.dtap.msg_gmm_type",
|
||||
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_gmm_strings), 0x0,
|
||||
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &gsm_a_dtap_msg_gmm_strings_ext, 0x0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_gsm_a_dtap_msg_sm_type,
|
||||
{ "DTAP GPRS Session Management Message Type", "gsm_a.dtap.msg_sm_type",
|
||||
FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_sm_strings), 0x0,
|
||||
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &gsm_a_dtap_msg_sm_strings_ext, 0x0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_gsm_a_gm_elem_id,
|
||||
|
|
|
@ -1203,12 +1203,12 @@ proto_reg_handoff_igmp(void)
|
|||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: t
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 noexpandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=false:
|
||||
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
||||
* :indentSize=8:tabSize=8:noTabs=false:
|
||||
*/
|
||||
|
||||
|
|
|
@ -3631,3 +3631,15 @@ proto_reg_handoff_megaco(void)
|
|||
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -1432,3 +1432,15 @@ proto_reg_handoff_mux27010(void)
|
|||
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -55,7 +55,6 @@
|
|||
#include <wsutil/crc8.h>
|
||||
#include <wsutil/crc16.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
|
@ -361,6 +360,7 @@ static const value_string sod_idx_names[] = {
|
|||
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext sod_idx_names_ext = VALUE_STRING_EXT_INIT(sod_idx_names);
|
||||
|
||||
static const value_string abort_codes[] = {
|
||||
|
||||
|
@ -405,6 +405,7 @@ static const value_string abort_codes[] = {
|
|||
|
||||
{ 0, NULL }
|
||||
};
|
||||
static value_string_ext abort_codes_ext = VALUE_STRING_EXT_INIT(abort_codes);
|
||||
|
||||
static const true_false_string opensafety_message_direction = { "Request", "Response" };
|
||||
#define OPENSAFETY_REQUEST TRUE
|
||||
|
@ -1068,15 +1069,15 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
|
|||
|
||||
item = proto_tree_add_uint_format_value(ssdo_payload, hf_oss_ssdo_sod_index, new_tvb,
|
||||
0, 0, 0x1018, "0x%04X (%s)", 0x1018,
|
||||
val_to_str_const( ((guint32) (0x1018 << 16) ),
|
||||
sod_idx_names, "Unknown") );
|
||||
val_to_str_ext_const( ((guint32) (0x1018 << 16) ),
|
||||
&sod_idx_names_ext, "Unknown") );
|
||||
sod_tree = proto_item_add_subtree(item, ett_opensafety_ssdo_sodentry);
|
||||
PROTO_ITEM_SET_GENERATED(item);
|
||||
|
||||
item = proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, 0, 0,
|
||||
0x06, "0x%02X (%s)", 0x06,
|
||||
val_to_str_const(((guint32) (0x1018 << 16) + 0x06),
|
||||
sod_idx_names, "Unknown") );
|
||||
val_to_str_ext_const(((guint32) (0x1018 << 16) + 0x06),
|
||||
&sod_idx_names_ext, "Unknown") );
|
||||
PROTO_ITEM_SET_GENERATED(item);
|
||||
|
||||
entry = tvb_get_letohl ( new_tvb, 0 );
|
||||
|
@ -1114,8 +1115,8 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
|
|||
|
||||
item = proto_tree_add_uint_format_value(ssdo_payload, hf_oss_ssdo_sod_index, new_tvb,
|
||||
ctr, 2, ssdoIndex, "0x%04X (%s)", ssdoIndex,
|
||||
val_to_str_const( ((guint32) (dispSSDOIndex << 16) ),
|
||||
sod_idx_names, "Unknown") );
|
||||
val_to_str_ext_const( ((guint32) (dispSSDOIndex << 16) ),
|
||||
&sod_idx_names_ext, "Unknown") );
|
||||
if ( ssdoIndex != dispSSDOIndex )
|
||||
PROTO_ITEM_SET_GENERATED ( item );
|
||||
|
||||
|
@ -1128,8 +1129,8 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_
|
|||
{
|
||||
proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, ctr + 2, 1,
|
||||
ssdoSubIndex, "0x%02X (%s)", ssdoSubIndex,
|
||||
val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex),
|
||||
sod_idx_names, "Unknown") );
|
||||
val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex),
|
||||
&sod_idx_names_ext, "Unknown") );
|
||||
}
|
||||
else
|
||||
proto_tree_add_uint_format_value(sod_tree, hf_oss_ssdo_sod_subindex, new_tvb, ctr + 2, 1,
|
||||
|
@ -1349,17 +1350,17 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto
|
|||
|
||||
proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_sod_index, message_tvb, db0Offset + 1, 2,
|
||||
ssdoIndex, "0x%04X (%s)", ssdoIndex,
|
||||
val_to_str_const(((guint32) (ssdoIndex << 16)), sod_idx_names, "Unknown") );
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_const(((guint32) (ssdoIndex << 16)), sod_idx_names, "Unknown"));
|
||||
val_to_str_ext_const(((guint32) (ssdoIndex << 16)), &sod_idx_names_ext, "Unknown") );
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_ext_const(((guint32) (ssdoIndex << 16)), &sod_idx_names_ext, "Unknown"));
|
||||
|
||||
/* Some SOD downloads (0x101A for instance) don't have sub-indeces */
|
||||
if ( ssdoSubIndex != 0x0 )
|
||||
{
|
||||
proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_sod_subindex, message_tvb, db0Offset + 3, 1,
|
||||
ssdoSubIndex, "0x%02X (%s)", ssdoSubIndex,
|
||||
val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), sod_idx_names, "Unknown") );
|
||||
val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), &sod_idx_names_ext, "Unknown") );
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",
|
||||
val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), sod_idx_names, "Unknown"));
|
||||
val_to_str_ext_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), &sod_idx_names_ext, "Unknown"));
|
||||
}
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "]" );
|
||||
payloadOffset += 3;
|
||||
|
@ -1371,8 +1372,8 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto
|
|||
|
||||
proto_tree_add_uint_format_value(ssdo_tree, hf_oss_ssdo_abort_code, message_tvb, frameStart1 + OSS_FRAME_POS_DATA + 4, 4, abortcode,
|
||||
"0x%04X %04X - %s", (guint16)(abortcode >> 16), (guint16)(abortcode),
|
||||
val_to_str_const(abortcode, abort_codes, "Unknown"));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_const(abortcode, abort_codes, "Unknown"));
|
||||
val_to_str_ext_const(abortcode, &abort_codes_ext, "Unknown"));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_ext_const(abortcode, &abort_codes_ext, "Unknown"));
|
||||
|
||||
|
||||
} else {
|
||||
|
|
|
@ -2780,3 +2780,15 @@ proto_register_rdm(void)
|
|||
register_dissector("rdm", dissect_rdm, proto_rdm);
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: t
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
||||
* :indentSize=8:tabSize=8:noTabs=false:
|
||||
*/
|
||||
|
|
|
@ -4814,3 +4814,16 @@ proto_reg_handoff_zbee_zcl_appl_ctrl(void)
|
|||
(zbee_zcl_fn_cmd_id)dissect_zcl_appl_ctrl_cmd_id
|
||||
);
|
||||
} /*proto_reg_handoff_zbee_zcl_appl_ctrl*/
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
13
epan/gcp.c
13
epan/gcp.c
|
@ -768,3 +768,16 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
16
epan/gcp.h
16
epan/gcp.h
|
@ -31,9 +31,6 @@
|
|||
#include <epan/prefs.h>
|
||||
#include <epan/asn1.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/dissectors/packet-ber.h>
|
||||
#include <epan/dissectors/packet-q931.h>
|
||||
#include <epan/dissectors/packet-mtp3.h>
|
||||
|
@ -212,3 +209,16 @@ extern const gchar* gcp_msg_to_str(gcp_msg_t* m, gboolean persistent);
|
|||
{ &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -2645,3 +2645,16 @@ int DissectorTable_register(lua_State* L) {
|
|||
WSLUA_REGISTER_CLASS(DissectorTable);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
@ -1693,3 +1693,16 @@ gzwfile_geterr(GZWFILE_T state)
|
|||
return state->err;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue