diff options
| author | Robert Sauter <sauter@locoslab.com> | 2018-03-10 23:14:12 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-03-11 02:42:41 +0000 |
| commit | fc6b725b18d9d627534c3b61720f5be93315ce09 (patch) | |
| tree | b41baab413459140064bda9659760efe67091c79 /epan | |
| parent | 3ceff6751471edc205894f8f2b6d050f3a803502 (diff) | |
tfs: Add high_normal and low_normal
Change-Id: Ie56e3546fc1bc5da61f95456e15544a2880c819d
Reviewed-on: https://code.wireshark.org/review/26418
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-sflow.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-wisun.c | 3 | ||||
| -rw-r--r-- | epan/tfs.c | 2 | ||||
| -rw-r--r-- | epan/tfs.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 7d21ff2d61..00ef3efe84 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -146,9 +146,7 @@ static const value_string sflow_ifdirection_vals[] = { { 0, NULL} }; -const true_false_string tfs_low_normal = { "Low", "Normal" }; -const true_false_string tfs_high_normal = { "High", "Normal" }; -const true_false_string tfs_minimize_monetary_normal = { "Minimize Monetary", "Normal" }; +static const true_false_string tfs_minimize_monetary_normal = { "Minimize Monetary", "Normal" }; static const value_string sflow_245_header_protocol[] = { { SFLOW_245_HEADER_ETHERNET, "Ethernet"}, diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c index 7554d231e8..9c887a1975 100644 --- a/epan/dissectors/packet-wisun.c +++ b/epan/dissectors/packet-wisun.c @@ -355,7 +355,6 @@ static const true_false_string wisun_netricity_sc_contention_control_tfs = { "Contention-free access", "Contention allowed in next contention state" }; -static const true_false_string wisun_netricity_sc_channel_access_priority_tfs = { "High", "Normal" }; static const int * wisun_format_nested_ie[] = { &hf_wisun_wsie_type, @@ -1474,7 +1473,7 @@ void proto_register_wisun(void) NULL, HFILL } }, { &hf_wisun_netricity_sc_channel_access_priority, - { "Channel access priority", "wisun.netricity.sc.channel_access_priority", FT_BOOLEAN, 8, TFS(&wisun_netricity_sc_channel_access_priority_tfs), 1<<1, + { "Channel access priority", "wisun.netricity.sc.channel_access_priority", FT_BOOLEAN, 8, TFS(&tfs_high_normal), 1<<1, NULL, HFILL } }, { &hf_wisun_netricity_sc_last_segment, diff --git a/epan/tfs.c b/epan/tfs.c index 3acb619fd3..31784dedd9 100644 --- a/epan/tfs.c +++ b/epan/tfs.c @@ -46,6 +46,8 @@ const true_false_string tfs_capable_not_capable = { "Capable", "Not capable" }; const true_false_string tfs_supported_not_supported = { "Supported", "Not supported" }; const true_false_string tfs_used_notused = { "Used", "Not used" }; const true_false_string tfs_high_low = { "High", "Low" }; +const true_false_string tfs_high_normal = { "High", "Normal" }; +const true_false_string tfs_low_normal = { "Low", "Normal" }; const true_false_string tfs_pressed_not_pressed = { "Pressed", "Not pressed" }; const true_false_string tfs_implemented_not_implemented = { "Implemented", "Not Implemented" }; const true_false_string tfs_requested_not_requested = { "Requested", "Not Requested" }; diff --git a/epan/tfs.h b/epan/tfs.h index 14f771a245..13bc828bb9 100644 --- a/epan/tfs.h +++ b/epan/tfs.h @@ -61,6 +61,8 @@ WS_DLL_PUBLIC const true_false_string tfs_capable_not_capable; WS_DLL_PUBLIC const true_false_string tfs_supported_not_supported; WS_DLL_PUBLIC const true_false_string tfs_used_notused; WS_DLL_PUBLIC const true_false_string tfs_high_low; +WS_DLL_PUBLIC const true_false_string tfs_high_normal; +WS_DLL_PUBLIC const true_false_string tfs_low_normal; WS_DLL_PUBLIC const true_false_string tfs_pressed_not_pressed; WS_DLL_PUBLIC const true_false_string tfs_implemented_not_implemented; WS_DLL_PUBLIC const true_false_string tfs_requested_not_requested; |