diff options
author | Michael Mann <mmann78@netscape.net> | 2015-04-03 11:09:17 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-04-08 02:49:07 +0000 |
commit | 1858b81e7be98b8fb06ac80094a5328aec2b2bc4 (patch) | |
tree | 3961408a05cb9d20b4a9d477824ca493969bb40e | |
parent | 7ca04728c35560530304e7f2266bc9f01e020267 (diff) |
Remove RTAC Serial preference that doubled for Decode As.
Just use Decode As directly.
Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7
Reviewed-on: https://code.wireshark.org/review/7902
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-cp2179.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-dnp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-lg8979.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-mbtcp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-rtacser.c | 41 | ||||
-rw-r--r-- | epan/dissectors/packet-rtacser.h | 42 | ||||
-rw-r--r-- | epan/dissectors/packet-selfm.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-synphasor.c | 3 |
9 files changed, 12 insertions, 90 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 817c199c19..1d4895ff34 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1645,7 +1645,6 @@ DISSECTOR_INCLUDES = \ packet-rquota.h \ packet-rrc.h \ packet-rsvp.h \ - packet-rtacser.h \ packet-rtcp.h \ packet-rtp.h \ packet-rtps.h \ diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 5d91ca8ce5..ad9e150389 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -52,7 +52,6 @@ F = 16-bit CRC #include "config.h" #include <epan/packet.h> -#include "packet-rtacser.h" #include <epan/conversation.h> #include <epan/prefs.h> @@ -1397,7 +1396,7 @@ proto_reg_handoff_cp2179(void) cp2179_port = global_cp2179_tcp_port; dissector_add_uint("tcp.port", cp2179_port, cp2179_handle); - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_CP2179, cp2179_handle); + dissector_add_for_decode_as("rtacser.data", cp2179_handle); } /* diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index ae0a5a1441..86bfc21e41 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -35,7 +35,6 @@ #include <epan/prefs.h> #include <epan/reassemble.h> #include "packet-tcp.h" -#include "packet-rtacser.h" #include <epan/expert.h> #include <epan/to_str.h> #include <epan/crc16-tvb.h> @@ -4549,7 +4548,7 @@ proto_reg_handoff_dnp3(void) dnp3_udp_handle = new_create_dissector_handle(dissect_dnp3_udp, proto_dnp3); dissector_add_uint("tcp.port", TCP_PORT_DNP, dnp3_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_DNP, dnp3_udp_handle); - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_DNP3, dnp3_udp_handle); + dissector_add_for_decode_as("rtacser.data", dnp3_udp_handle); } /* diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c index cd077145da..a0bf807a67 100644 --- a/epan/dissectors/packet-lg8979.c +++ b/epan/dissectors/packet-lg8979.c @@ -28,7 +28,6 @@ #include <epan/packet.h> #include "packet-tcp.h" #include <epan/prefs.h> -#include "packet-rtacser.h" void proto_register_lg8979(void); @@ -1549,7 +1548,7 @@ proto_reg_handoff_lg8979(void) lg8979_port = global_lg8979_tcp_port; - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_LG8979, lg8979_handle); + dissector_add_for_decode_as("rtacser.data", lg8979_handle); } /* diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index d8df2489f2..9cee3dbfdb 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -76,7 +76,6 @@ #include <epan/packet.h> #include "packet-tcp.h" #include "packet-mbtcp.h" -#include "packet-rtacser.h" #include <epan/prefs.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> /* For CRC verification */ @@ -1880,7 +1879,7 @@ proto_reg_handoff_mbrtu(void) mbrtu_port = global_mbus_rtu_port; dissector_add_uint("mbtcp.prot_id", MODBUS_PROTOCOL_ID, modbus_handle); - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_MODBUS, mbrtu_handle); + dissector_add_for_decode_as("rtacser.data", mbrtu_handle); } diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index d49e034434..64fdb2f6ab 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -64,7 +64,6 @@ #include <epan/prefs.h> #include <epan/decode_as.h> #include <wiretap/wtap.h> -#include "packet-rtacser.h" void proto_register_rtacser(void); @@ -85,9 +84,6 @@ static int hf_rtacser_footer = -1; static gint ett_rtacser = -1; static gint ett_rtacser_cl = -1; -/* Globals for RTAC Serial Preferences */ -static guint global_rtacser_payload_proto = RTACSER_PAYLOAD_NONE; /* No Payload, by default */ - static dissector_table_t subdissector_table; static dissector_handle_t data_handle; @@ -102,15 +98,6 @@ static dissector_handle_t data_handle; #define RTACSER_CTRL_RING 0x20 #define RTACSER_CTRL_MBOK 0x40 -/* Payload Protocol Types */ -#define RTACSER_PAYLOAD_NONE 0 -#define RTACSER_PAYLOAD_SELFM 1 -#define RTACSER_PAYLOAD_DNP3 2 -#define RTACSER_PAYLOAD_MODBUS 3 -#define RTACSER_PAYLOAD_SYNPHASOR 4 -#define RTACSER_PAYLOAD_LG8979 5 -#define RTACSER_PAYLOAD_CP2179 6 - /* Event Types */ static const value_string rtacser_eventtype_vals[] = { { 0x00, "STATUS_CHANGE" }, @@ -127,17 +114,6 @@ static const value_string rtacser_eventtype_vals[] = { { 0, NULL } }; -static const enum_val_t rtacser_payload_proto_type[] = { - { "NONE ", "NONE ", RTACSER_PAYLOAD_NONE }, - { "SEL FM ", "SEL FM ", RTACSER_PAYLOAD_SELFM }, - { "DNP3 ", "DNP3 ", RTACSER_PAYLOAD_DNP3 }, - { "MODBUS RTU", "MODBUS RTU", RTACSER_PAYLOAD_MODBUS }, - { "SYNPHASOR ", "SYNPHASOR ", RTACSER_PAYLOAD_SYNPHASOR }, - { "L&G 8979 ", "L&G 8979 ", RTACSER_PAYLOAD_LG8979 }, - { "CP 2179 ", "CP 2179 ", RTACSER_PAYLOAD_CP2179 }, - { NULL, NULL, 0 } -}; - static void rtacser_ppi_prompt(packet_info *pinfo _U_, gchar* result) { @@ -145,9 +121,9 @@ rtacser_ppi_prompt(packet_info *pinfo _U_, gchar* result) } static gpointer -rtacser_ppi_value(packet_info *pinfo) +rtacser_ppi_value(packet_info *pinfo _U_) { - return p_get_proto_data(pinfo->pool, pinfo, proto_rtacser, 0 ); + return 0; } /******************************************************************************************************/ @@ -235,11 +211,11 @@ dissect_rtacser_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(rtacser_tree, hf_rtacser_footer, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - p_add_proto_data(pinfo->pool, pinfo, proto_rtacser, 0, GUINT_TO_POINTER(global_rtacser_payload_proto)); - if (tvb_reported_length_remaining(tvb, offset) > 0) { payload_tvb = tvb_new_subset_remaining(tvb, RTACSER_HEADER_LEN); - if (!dissector_try_uint(subdissector_table, global_rtacser_payload_proto, payload_tvb, pinfo, tree)){ + /* Functionality for choosing subdissector is controlled through Decode As as CAN doesn't + have a unique identifier to determine subdissector */ + if (!dissector_try_uint(subdissector_table, 0, payload_tvb, pinfo, tree)){ call_dissector(data_handle, payload_tvb, pinfo, tree); } } @@ -327,12 +303,7 @@ proto_register_rtacser(void) rtacser_module = prefs_register_protocol(proto_rtacser, proto_reg_handoff_rtacser); /* RTAC Serial Preference - Payload Protocol in use */ - prefs_register_enum_preference(rtacser_module, "rtacserial_payload_proto", - "Payload Protocol Type", - "Payload Protocol Type", - &global_rtacser_payload_proto, - rtacser_payload_proto_type, - TRUE); + prefs_register_obsolete_preference(rtacser_module, "rtacserial_payload_proto"); register_decode_as(&rtacser_da_ppi); } diff --git a/epan/dissectors/packet-rtacser.h b/epan/dissectors/packet-rtacser.h deleted file mode 100644 index 68ea024d39..0000000000 --- a/epan/dissectors/packet-rtacser.h +++ /dev/null @@ -1,42 +0,0 @@ -/* packet-rtacser.h - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -/* Payload Protocol Types */ -#define RTACSER_PAYLOAD_NONE 0 -#define RTACSER_PAYLOAD_SELFM 1 -#define RTACSER_PAYLOAD_DNP3 2 -#define RTACSER_PAYLOAD_MODBUS 3 -#define RTACSER_PAYLOAD_SYNPHASOR 4 -#define RTACSER_PAYLOAD_LG8979 5 -#define RTACSER_PAYLOAD_CP2179 6 - -/* - * 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: - */ diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index ae4d4aa5da..a80198780c 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -69,7 +69,6 @@ #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> -#include "packet-rtacser.h" void proto_register_selfm(void); @@ -3058,7 +3057,7 @@ proto_reg_handoff_selfm(void) selfm_port = global_selfm_tcp_port; dissector_add_uint("tcp.port", selfm_port, selfm_handle); - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_SELFM, selfm_handle); + dissector_add_for_decode_as("rtacser.data", selfm_handle); } /* diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index a3f962a2ff..0eb7224f77 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -31,7 +31,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include "packet-tcp.h" -#include "packet-rtacser.h" #define PROTOCOL_NAME "IEEE C37.118 Synchrophasor Protocol" #define PROTOCOL_SHORT_NAME "SYNCHROPHASOR" @@ -1385,7 +1384,7 @@ void proto_reg_handoff_synphasor(void) if (!initialized) { synphasor_tcp_handle = new_create_dissector_handle(dissect_tcp, proto_synphasor); - dissector_add_uint("rtacser.data", RTACSER_PAYLOAD_SYNPHASOR, synphasor_udp_handle); + dissector_add_for_decode_as("rtacser.data", synphasor_udp_handle); initialized = TRUE; } else { |