osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TFS: Mutualize Response/Request TFS 

move tfs_response_request to epan/tfs.[ch] and use this

Change-Id: I29d5894fade721b5234649a7c2d83dd1d6a19a0d
Reviewed-on: https://code.wireshark.org/review/8930
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2015-06-15 20:18:33 +02:00 committed by Anders Broman
parent cedaa0d7f3
commit 5a4f44a93e
7 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-aoe.c
View File

@ -78,11 +78,6 @@ static const true_false_string tfs_aflags_w = {
"No write to device"
};
static const true_false_string tfs_response = {
"Response",
"Request"
};
static const true_false_string tfs_error = {
"Error",
"No error"
@ -432,7 +427,7 @@ proto_register_aoe(void)
{ "Sector Count", "aoe.sector_count", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
{ &hf_aoe_flags_response,
{ "Response flag", "aoe.response", FT_BOOLEAN, 8, TFS(&tfs_response), AOE_FLAGS_RESPONSE, "Whether this is a response PDU or not", HFILL}},
{ "Response flag", "aoe.response", FT_BOOLEAN, 8, TFS(&tfs_response_request), AOE_FLAGS_RESPONSE, "Whether this is a response PDU or not", HFILL}},
{ &hf_aoe_flags_error,
{ "Error flag", "aoe.flags_error", FT_BOOLEAN, 8, TFS(&tfs_error), AOE_FLAGS_ERROR, "Whether this is an error PDU or not", HFILL}},
{ &hf_aoe_major,

2
epan/dissectors/packet-daytime.c
View File

@ -34,8 +34,6 @@ void proto_reg_handoff_daytime(void);
static dissector_handle_t daytime_handle;
static const true_false_string tfs_response_request = { "Response", "Request" };
static header_field_info *hfi_daytime = NULL;
#define DAYTIME_HFI_INIT HFI_INIT(proto_daytime)

1
epan/dissectors/packet-isup.c
View File

@ -6466,7 +6466,6 @@ dissect_isup_call_transfer_reference_parameter(tvbuff_t *parameter_tvb, proto_tr
/* ------------------------------------------------------------------
Dissector Parameter Loop prevention
*/
static const true_false_string tfs_response_request = { "Response", "Request"};
static void
dissect_isup_loop_prevention_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)

5
epan/dissectors/packet-nat-pmp.c
View File

@ -162,11 +162,6 @@ static const value_string result_vals[] = {
{ 0, NULL }
};
const true_false_string tfs_response_request = {
"Response",
"Request"
};
static const value_string pcp_opcode_vals[] = {
{ 0, "Announce" },
{ 1, "Map" },

2
epan/dissectors/packet-time.c
View File

@ -39,8 +39,6 @@ static const enum_val_t time_display_types[] = {
{ NULL, NULL, 0 }
};
static const true_false_string tfs_response_request = { "Response", "Request" };
static int proto_time = -1;
static int hf_time_time = -1;
static int hf_time_response = -1;

1
epan/tfs.c
View File

@ -85,4 +85,5 @@ const true_false_string tfs_asynchronous_synchronous = { "Asynchronous", "Synchr
const true_false_string tfs_protocol_sensative_bit_transparent = { "Protocol sensitive", "Bit transparent" };
const true_false_string tfs_full_half = { "Full", "Half" };
const true_false_string tfs_acknowledged_not_acknowledged = { "Acknowledged", "Not Acknowledged" };
const true_false_string tfs_response_request = { "Response", "Request" };

1
epan/tfs.h
View File

@ -100,6 +100,7 @@ WS_DLL_PUBLIC const true_false_string tfs_asynchronous_synchronous;
WS_DLL_PUBLIC const true_false_string tfs_protocol_sensative_bit_transparent;
WS_DLL_PUBLIC const true_false_string tfs_full_half;
WS_DLL_PUBLIC const true_false_string tfs_acknowledged_not_acknowledged;
WS_DLL_PUBLIC const true_false_string tfs_response_request;
#ifdef __cplusplus
}