aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-06-15 20:18:33 +0200
committerAnders Broman <a.broman58@gmail.com>2015-06-15 19:55:58 +0000
commit5a4f44a93e931319cf519493438972e60b2a36e5 (patch)
tree6dd7c0369b907f3157c12b88043f54145a551bf8
parentcedaa0d7f3f9de1e4559e32eb1713b30bdec11f3 (diff)
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>
-rw-r--r--epan/dissectors/packet-aoe.c7
-rw-r--r--epan/dissectors/packet-daytime.c2
-rw-r--r--epan/dissectors/packet-isup.c1
-rw-r--r--epan/dissectors/packet-nat-pmp.c5
-rw-r--r--epan/dissectors/packet-time.c2
-rw-r--r--epan/tfs.c1
-rw-r--r--epan/tfs.h1
7 files changed, 3 insertions, 16 deletions
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 624cb79980..df51b47bf0 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -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,
diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c
index 3b0f5fd4f5..3fe67184e5 100644
--- a/epan/dissectors/packet-daytime.c
+++ b/epan/dissectors/packet-daytime.c
@@ -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)
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index cc12561770..b0ebe7a645 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -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)
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index c1962dcdbd..587264467a 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -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" },
diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c
index 23fee5fba8..a7f4cdff61 100644
--- a/epan/dissectors/packet-time.c
+++ b/epan/dissectors/packet-time.c
@@ -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;
diff --git a/epan/tfs.c b/epan/tfs.c
index 769069fd4e..0c09e85838 100644
--- a/epan/tfs.c
+++ b/epan/tfs.c
@@ -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" };
diff --git a/epan/tfs.h b/epan/tfs.h
index d7487f9545..38501170a3 100644
--- a/epan/tfs.h
+++ b/epan/tfs.h
@@ -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
}