diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-11-17 21:45:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-22 16:47:47 +0000 |
| commit | fb9a356e46c5adbc74e9d117463c0fb2b4778afe (patch) | |
| tree | 810603de442ebb9454352263247654e30120db36 /epan/dissectors/packet-mbtcp.c | |
| parent | ba67963fd4ef287124cd9bf8f35a22d8a5663a11 (diff) | |
Add prefs_get_uint_value and prefs_get_range_value
This allows dissectors to not need to know about the internal preference structure.
Change-Id: I1ae67248cd0b0132aefc225ea0a9befaf9afdde2
Reviewed-on: https://code.wireshark.org/review/18864
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mbtcp.c')
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index bd1acec65d..178ae4f418 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -67,7 +67,6 @@ #include "packet-tcp.h" #include "packet-mbtcp.h" #include <epan/prefs.h> -#include <epan/prefs-int.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> /* For CRC verification */ #include <epan/proto_data.h> @@ -1586,22 +1585,16 @@ static void apply_mbtcp_prefs(void) { /* Modbus/RTU uses the port preference to determine request/response */ - pref_t *tcp_port = prefs_find_preference(prefs_find_module("mbtcp"), "tcp.port"); - pref_t *udp_port = prefs_find_preference(prefs_find_module("mbudp"), "udp.port"); - - global_mbus_tcp_port = *tcp_port->varp.uint; - global_mbus_udp_port = *udp_port->varp.uint; + global_mbus_tcp_port = prefs_get_uint_value("mbtcp", "tcp.port"); + global_mbus_udp_port = prefs_get_uint_value("mbudp", "udp.port"); } static void apply_mbrtu_prefs(void) { /* Modbus/RTU uses the port preference to determine request/response */ - pref_t *rtu_tcp_port = prefs_find_preference(prefs_find_module("mbrtu"), "tcp.port"); - pref_t *rtu_udp_port = prefs_find_preference(prefs_find_module("mbrtu"), "udp.port"); - - global_mbus_tcp_rtu_port = *rtu_tcp_port->varp.uint; - global_mbus_udp_rtu_port = *rtu_udp_port->varp.uint; + global_mbus_tcp_rtu_port = prefs_get_uint_value("mbrtu", "tcp.port"); + global_mbus_udp_rtu_port = prefs_get_uint_value("mbrtu", "udp.port"); } /* Register the protocol with Wireshark */ |