diff options
38 files changed, 82 insertions, 147 deletions
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 3d73f93939..60494743c1 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -29,7 +29,6 @@ #endif #include <epan/packet.h> -#include <epan/proto.h> #include <epan/prefs.h> #include <epan/tap.h> #include "packet-actrace.h" diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index da3c8e25bf..03d54609eb 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -31,7 +31,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/emem.h> #include <epan/dissectors/packet-tcp.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index a76377d342..8a0b23892f 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -29,9 +29,8 @@ /* includes needed for wireshark */ #include <glib.h> -#include <epan/prefs.h> #include <epan/packet.h> -#include <epan/proto.h> +#include <epan/prefs.h> #include <epan/conversation.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index d8a594ea77..41d9d5519d 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -41,12 +41,11 @@ #endif #include <glib.h> -#include <epan/exceptions.h> #include <epan/packet.h> +#include <epan/exceptions.h> #include <epan/expert.h> #include <epan/emem.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/tfs.h> +#include "packet-tcp.h" /* Generic data */ diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index ec6ce85708..0a5c65623a 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/expert.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index 255980a415..44a34c3019 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -50,7 +50,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <etypes.h> /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index e30a265a89..f298d17425 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -29,10 +29,8 @@ #endif #include <glib.h> -#include <string.h> #include <epan/packet.h> -#include <epan/value_string.h> #include <epan/emem.h> #include <epan/reassemble.h> #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index bfaabeabe5..266d30ce19 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -39,7 +39,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/value_string.h> #include <etypes.h> #include <epan/emem.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 4c5dd3ab7e..bd2bf63e2e 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -34,12 +34,11 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/value_string.h> #include <epan/emem.h> #include <etypes.h> #include <epan/tap.h> -#include <epan/dissectors/packet-btsdp.h> -#include <epan/dissectors/packet-btl2cap.h> +#include "packet-btsdp.h" +#include "packet-btl2cap.h" /* Initialize the protocol and registered fields */ static int proto_btsdp = -1; diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 6cc0731f3b..b295981e04 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -36,7 +36,6 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/emem.h> -#include <epan/proto.h> #include <epan/ipproto.h> #include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index 2d2c0d5904..7c98cc72a9 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -29,8 +29,6 @@ # include "config.h" #endif - - #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -44,11 +42,7 @@ #include <epan/packet.h> #include <epan/tap.h> -#include <epan/proto.h> -#include <etypes.h> - - - +#include <epan/etypes.h> #define OPCODE_NOOP 0x0000 diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index f905286574..e45fc2e065 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -27,12 +27,9 @@ #include "config.h" #endif -#include <stdlib.h> - #include <glib.h> #include <epan/packet.h> -#include <epan/value_string.h> #include <epan/emem.h> /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 657132a0d0..203ef15598 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -32,12 +32,9 @@ # include "config.h" #endif -#include <stdlib.h> - #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/asn1.h> #include "packet-gsm_map.h" diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c index 9ae4334c32..42e77b8812 100644 --- a/epan/dissectors/packet-dpnss-link.c +++ b/epan/dissectors/packet-dpnss-link.c @@ -1,29 +1,29 @@ /* packet-dpnss-link.c * Routines for DPNNS/DASS2 link layer dissection * Copyright 2009, Rolf Fiedler <rolf.fiedler[at]innoventif[dot]de> - * + * * $Id$ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* References: - * BTNR188 + * BTNR188 * ND1301:2001/03 http://www.nicc.org.uk/nicc-public/Public/interconnectstandards/dpnss/nd1301_2004_11.pdf */ @@ -31,12 +31,9 @@ # include "config.h" #endif -#include <stdlib.h> - #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> static dissector_handle_t dpnss_handle; /* DPNSS UI frame dissector */ #define LINK_HEADER_SIZE 3 @@ -110,36 +107,36 @@ dissect_dpnss_link(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) uton = pinfo->pseudo_header->l1event.uton; /* Make entries in src and dst column */ - if (check_col(pinfo->cinfo, COL_DEF_SRC)) + if (check_col(pinfo->cinfo, COL_DEF_SRC)) col_set_str(pinfo->cinfo, COL_DEF_SRC, uton?"TE":"NT"); - if (check_col(pinfo->cinfo, COL_DEF_DST)) + if (check_col(pinfo->cinfo, COL_DEF_DST)) col_set_str(pinfo->cinfo, COL_DEF_DST, uton?"NT":"TE"); item = proto_tree_add_item(tree, proto_dpnss_link, tvb, 0, -1, FALSE); dpnss_link_tree = proto_item_add_subtree(item, ett_dpnss_link); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_framegroup, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_framegroup, tvb, 0, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_crbit, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_crbit, tvb, 0, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_extension, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address_extension, tvb, 0, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_reserved, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_reserved, tvb, 1, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_dlcId, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_dlcId, tvb, 1, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_dlcIdNr, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_dlcIdNr, tvb, 1, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_extension, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_address2_extension, tvb, 1, 1, FALSE); - proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_control_frameType, + proto_tree_add_item(dpnss_link_tree, hf_dpnss_link_control_frameType, tvb, 2, 1, FALSE); octet = tvb_get_guint8(tvb, 2); switch (octet){ case FRAME_TYPE_UI_EVEN: case FRAME_TYPE_UI_ODD: protocol_data_length=tvb_length(tvb)-LINK_HEADER_SIZE; - protocol_data_tvb=tvb_new_subset(tvb, LINK_HEADER_SIZE, - protocol_data_length, + protocol_data_tvb=tvb_new_subset(tvb, LINK_HEADER_SIZE, + protocol_data_length, protocol_data_length); if (dpnss_handle && protocol_data_length>0) { call_dissector(dpnss_handle, protocol_data_tvb, pinfo, tree); @@ -161,43 +158,43 @@ void proto_register_dpnss_link(void) { static hf_register_info hf[] = { - { &hf_dpnss_link_address_framegroup, + { &hf_dpnss_link_address_framegroup, { "Frame Group", "dpnss_link.framegroup", FT_UINT8, BASE_DEC, VALS(dpnss_link_framegroup_vals), 0xfc, NULL, HFILL } }, - { &hf_dpnss_link_address_crbit, + { &hf_dpnss_link_address_crbit, { "C/R Bit", "dpnss_link.crbit", FT_UINT8, BASE_DEC, VALS(dpnss_link_crbit_vals), 0x02, NULL, HFILL } }, - { &hf_dpnss_link_address_extension, - { "Extension", "dpnss_link.extension", + { &hf_dpnss_link_address_extension, + { "Extension", "dpnss_link.extension", FT_UINT8, BASE_DEC, VALS(dpnss_link_extend_vals), 0x01, NULL, HFILL } }, - { &hf_dpnss_link_address2_reserved, + { &hf_dpnss_link_address2_reserved, { "Reserved", "dpnss_link.reserved", FT_UINT8, BASE_DEC, VALS(dpnss_link_reserved_vals), 0x80, NULL, HFILL } }, - { &hf_dpnss_link_address2_dlcId, + { &hf_dpnss_link_address2_dlcId, { "DLC ID", "dpnss_link.dlcId", FT_UINT8, BASE_DEC, VALS(dpnss_link_dlcId_vals), 0x40, NULL, HFILL } }, - { &hf_dpnss_link_address2_dlcIdNr, + { &hf_dpnss_link_address2_dlcIdNr, { "DLC ID Number", "dpnss_link.dlcIdNr", FT_UINT8, BASE_DEC, NULL, 0x3e, NULL, HFILL } }, - { &hf_dpnss_link_address2_extension, - { "Extension", "dpnss_link.extension2", + { &hf_dpnss_link_address2_extension, + { "Extension", "dpnss_link.extension2", FT_UINT8, BASE_DEC, VALS(dpnss_link_extend_vals), 0x01, NULL, HFILL } }, - { &hf_dpnss_link_control_frameType, - { "Frame Type", "dpnss_link.frameType", + { &hf_dpnss_link_control_frameType, + { "Frame Type", "dpnss_link.frameType", FT_UINT8, BASE_DEC, VALS(dpnss_link_frameType_vals), 0xff, NULL, HFILL } } diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 617b3709dd..dc2be14110 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -35,7 +35,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/timestamp.h> -#include <epan/tvbuff.h> #include "packet-frame.h" #include <epan/prefs.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 782f20861b..e6eb7425f9 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -31,13 +31,11 @@ # include "config.h" #endif -#include <stdlib.h> #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/asn1.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index b4c532c72a..a47e6982b0 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -35,7 +35,6 @@ #include <epan/etypes.h> -#include <epan/proto.h> #include <epan/ptvcursor.h> static int proto_homeplug = -1; diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index cd20ea4409..ab341c5347 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -29,15 +29,15 @@ # include "config.h" #endif +#include <string.h> + #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/emem.h> #include <epan/conversation.h> -#include <epan/dissectors/packet-frame.h> #include <epan/prefs.h> #include <epan/etypes.h> -#include <string.h> +#include <epan/dissectors/packet-frame.h> #include "packet-infiniband.h" #define PROTO_TAG_INFINIBAND "Infiniband" diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 2442a8e146..98e4e2657d 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -33,8 +33,6 @@ #include <math.h> #include <glib.h> #include <epan/packet.h> -#include "packet-ipsec.h" -#include "packet-ipv6.h" #include <epan/ip_opts.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> @@ -47,10 +45,11 @@ #include <epan/nlpid.h> #include <epan/arcnet_pids.h> #include <epan/in_cksum.h> -#include <epan/value_string.h> #include <epan/expert.h> #include <epan/emem.h> #include <epan/tap.h> +#include "packet-ipsec.h" +#include "packet-ipv6.h" /* * NOTE: ipv6.nxt is not very useful as we will have chained header. diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index c0eb3e77b9..8bf66bb73a 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -36,7 +36,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/tvbuff.h> #include <epan/prefs.h> /* keeps track of current position in buffer in terms of bit and byte offset */ diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index 41966c4e7b..e9ae3a0755 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -36,10 +36,7 @@ #endif #include <glib.h> -#include <epan/epan.h> #include <epan/packet.h> -#include <epan/proto.h> -#include <epan/tvbuff.h> #include <epan/prefs.h> #include <epan/emem.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index f4c885d64b..f96246e7ba 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -7,17 +7,17 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,13 +29,9 @@ # include "config.h" #endif -#include <stdlib.h> - #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> - #include <epan/prefs.h> @@ -149,7 +145,7 @@ proto_reg_handoff_lge_monitor(void) void proto_register_lge_monitor(void) -{ +{ module_t *lge_monitor_module; @@ -157,17 +153,17 @@ proto_register_lge_monitor(void) static hf_register_info hf[] = { { &hf_lge_monitor_dir, { "Direction", "lge_monitor.dir", - FT_UINT32, BASE_DEC, VALS(lge_monitor_dir_vals), 0x0, + FT_UINT32, BASE_DEC, VALS(lge_monitor_dir_vals), 0x0, NULL, HFILL } }, { &hf_lge_monitor_prot, { "Protocol Identifier", "lge_monitor.prot", - FT_UINT32, BASE_DEC, VALS(lge_monitor_prot_vals), 0x0, + FT_UINT32, BASE_DEC, VALS(lge_monitor_prot_vals), 0x0, NULL, HFILL } }, { &hf_lge_monitor_length, { "Payload Length", "lge_monitor.length", - FT_UINT32, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, }; @@ -185,7 +181,7 @@ proto_register_lge_monitor(void) proto_register_subtree_array(ett, array_length(ett)); /* Register a configuration option for port */ - + lge_monitor_module = prefs_register_protocol(proto_lge_monitor, proto_reg_handoff_lge_monitor); prefs_register_uint_preference(lge_monitor_module, "udp.port", diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index ef99cfc984..8b7c5e1441 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -48,11 +48,8 @@ #include <unistd.h> #endif -#include <stdlib.h> - #include <glib.h> -#include <epan/tvbuff.h> #include <epan/packet.h> #include <prefs.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index a2963b1086..0038899e18 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -13,17 +13,17 @@ * don't bother with the "Copied from" - you don't even need to put * in a "Copied from" if you copied an existing dissector, especially * if the bulk of the code in the new dissector is your code) - * + * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,8 +33,6 @@ # include "config.h" #endif -#include <stdlib.h> - #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -45,9 +43,8 @@ #include <glib.h> -#include <epan/value_string.h> -#include <etypes.h> #include <epan/packet.h> +#include <etypes.h> #include <epan/prefs.h> #define MDSHDR_VERSION_OFFSET 0 @@ -156,7 +153,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti_main, *ti_hdr, *ti_trlr; - proto_item *hidden_item; + proto_item *hidden_item; proto_tree *mdshdr_tree_main, *mdshdr_tree_hdr, *mdshdr_tree_trlr; int offset = 0; guint pktlen; @@ -168,20 +165,20 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDS Header"); - + col_clear(pinfo->cinfo, COL_INFO); sof = tvb_get_guint8 (tvb, offset+MDSHDR_SOF_OFFSET) & 0x0F; pktlen = tvb_get_ntohs (tvb, offset+MDSHDR_PKTLEN_OFFSET) & 0x1FFF; vsan = tvb_get_ntohs (tvb, offset+MDSHDR_VSAN_OFFSET) & 0x0FFF; span_id = (tvb_get_ntohs (tvb, offset+MDSHDR_VSAN_OFFSET) & 0xF000) >> 12; - + /* The Mdshdr trailer is at the end of the frame */ if (tvb_length (tvb) >= MDSHDR_HEADER_SIZE + pktlen /* Avoid header/trailer overlap if something wrong */ && pktlen >= MDSHDR_TRAILER_SIZE ) { - trailer_start = MDSHDR_HEADER_SIZE + pktlen - MDSHDR_TRAILER_SIZE; - + trailer_start = MDSHDR_HEADER_SIZE + pktlen - MDSHDR_TRAILER_SIZE; + eof = tvb_get_guint8 (tvb, trailer_start); tvb_set_reported_length (tvb, MDSHDR_HEADER_SIZE+pktlen); } @@ -199,7 +196,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->sof_eof = PINFO_SOF_FIRST_FRAME; } else if (sof == MDSHDR_SOFf) { - pinfo->sof_eof = PINFO_SOF_SOFF; + pinfo->sof_eof = PINFO_SOF_SOFF; } if (eof != MDSHDR_EOFn) { @@ -208,7 +205,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (eof != MDSHDR_EOFt) { pinfo->sof_eof |= PINFO_EOF_INVALID; } - + /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ if (tree) { @@ -216,7 +213,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* create display subtree for the protocol */ ti_main = proto_tree_add_protocol_format (tree, proto_mdshdr, tvb, 0, MDSHDR_HEADER_SIZE+pktlen, - "MDS Header(%s/%s)", + "MDS Header(%s/%s)", val_to_str(sof, sof_vals, "Unknown(%u)"), val_to_str(eof, eof_vals, "Unknown(%u)")); @@ -230,7 +227,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hidden_item = proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_sof, tvb, MDSHDR_SOF_OFFSET, MDSHDR_SIZE_BYTE, 0); PROTO_ITEM_SET_HIDDEN(hidden_item); - proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_pkt_len, tvb, MDSHDR_PKTLEN_OFFSET, + proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_pkt_len, tvb, MDSHDR_PKTLEN_OFFSET, MDSHDR_SIZE_INT16, 0); proto_tree_add_item (mdshdr_tree_hdr, hf_mdshdr_dstidx, tvb, MDSHDR_DIDX_OFFSET, MDSHDR_SIZE_INT16, 0); @@ -242,7 +239,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, MDSHDR_VSAN_OFFSET, MDSHDR_SIZE_BYTE, span_id); PROTO_ITEM_SET_HIDDEN(hidden_item); - + /* Add Mdshdr Trailer part */ if (tvb_length (tvb) >= MDSHDR_HEADER_SIZE + pktlen && 0 != trailer_start) { @@ -250,17 +247,17 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) MDSHDR_TRAILER_SIZE, "MDS Trailer"); mdshdr_tree_trlr = proto_item_add_subtree (ti_trlr, ett_mdshdr_trlr); - + proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_eof, tvb, trailer_start, MDSHDR_SIZE_BYTE, 0); proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_fccrc, tvb, trailer_start+2, MDSHDR_SIZE_INT32, 0); } else { - proto_tree_add_text (mdshdr_tree_main, tvb, 0, 0, "MDS Trailer: Not Found"); + proto_tree_add_text (mdshdr_tree_main, tvb, 0, 0, "MDS Trailer: Not Found"); } } - + /* If this protocol has a sub-dissector call it here, see section 1.8 */ if (tvb_length (tvb) >= MDSHDR_HEADER_SIZE + pktlen && 0 != pktlen /*if something wrong*/) { @@ -287,7 +284,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_mdshdr(void) -{ +{ /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 7722391dda..e5fcea6689 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -40,9 +40,9 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> + #include <epan/packet.h> #include <epan/emem.h> -#include <epan/proto.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index c1113987c8..bc8602c230 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -36,7 +36,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index fbc6a95763..45f4538173 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -34,8 +34,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> -#include <epan/tfs.h> -#include <epan/proto.h> #include <epan/emem.h> #include <epan/dissectors/packet-udp.h> diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 9c86606483..ffa7a82bf9 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -35,7 +35,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/value_string.h> #include <epan/conversation.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index e817e89ebe..09ab7886ac 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -29,9 +29,6 @@ # include "config.h" #endif -#include <stdlib.h> -#include <ctype.h> -#include <time.h> #include <epan/packet.h> #include <epan/afn.h> #include <epan/ipproto.h> @@ -39,7 +36,6 @@ #include <epan/addr_resolv.h> #include <epan/strutil.h> #include <epan/prefs.h> -#include <epan/proto.h> #include <epan/emem.h> #include <epan/ptvcursor.h> @@ -368,14 +364,14 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) } opts_total_len = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor)+2); - + if (opts_total_len < 4) { proto_tree_add_text(opts_tree, tvb, ptvcursor_current_offset(cursor)+2, 2, "%s Options (Total Length %u - invalid, must be >= 4)", pktname, opts_total_len); return; } - + tf = proto_tree_add_text(ptvcursor_tree(cursor), tvb, ptvcursor_current_offset(cursor), opts_total_len, "%s Options (Total Length %d)", pktname, opts_total_len); opts_tree = proto_item_add_subtree(tf, ett_pgm_opts); @@ -448,7 +444,7 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE); ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE); - + if (genopts_len < PGM_OPT_PARITY_PRM_SIZE) { proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor), 1, genopts_len, @@ -501,12 +497,12 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE); ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE); - + optdata_len = tvb_get_guint8(tvb, ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE); ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE); ptvcursor_add(cursor, hf_pgm_opt_nak_res, 1, FALSE); - + optdata_len -= PGM_OPT_NAK_LIST_SIZE; tvb_memcpy(tvb, (guint8 *)naklist, ptvcursor_current_offset(cursor), optdata_len); firsttime = TRUE; @@ -587,7 +583,7 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) break; default: - proto_tree_add_text(opt_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(opt_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); break; } @@ -714,7 +710,7 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) break; default: - proto_tree_add_text(opt_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(opt_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); break; } @@ -875,7 +871,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, - "%-5s sqn 0x%x gsi %s subtype %s", + "%-5s sqn 0x%x gsi %s subtype %s", pktname, sqn, gsi, pollstname); } } @@ -922,7 +918,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptvcursor_set_tree(cursor, pgm_tree); /* Checksum may be 0 (not available), but not for DATA packets */ - if ((pgmhdr_type != PGM_RDATA_PCKT) && (pgmhdr_type != PGM_ODATA_PCKT) && + if ((pgmhdr_type != PGM_RDATA_PCKT) && (pgmhdr_type != PGM_ODATA_PCKT) && (pgmhdr_cksum == 0)) { proto_tree_add_uint_format(pgm_tree, hf_pgm_main_cksum, tvb, @@ -980,7 +976,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); return; } @@ -1014,7 +1010,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); break; } @@ -1033,7 +1029,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); return; } @@ -1059,7 +1055,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, + proto_tree_add_text(type_tree, tvb, ptvcursor_current_offset(cursor), -1, "Can't handle this address format"); break; } @@ -1088,7 +1084,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pgmhdr_opts & PGM_OPT) dissect_pgmopts(cursor, pktname); - if (isdata) + if (isdata) decode_pgm_ports(tvb, ptvcursor_current_offset(cursor), pinfo, tree, pgmhdr_sport, pgmhdr_dport); } } @@ -1403,7 +1399,7 @@ proto_register_pgm(void) /* * Register configuration preferences for UDP encapsulation * (Note: Initially the ports are set to zero and the ports - * are not registered so the dissecting of PGM + * are not registered so the dissecting of PGM * encapsulated in UDP packets is off by default; * dissector_add_handle is called so that pgm * is available for 'decode-as' diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c index 4d8027537a..0d07683bd4 100644 --- a/epan/dissectors/packet-q708.c +++ b/epan/dissectors/packet-q708.c @@ -30,8 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/value_string.h> - #include "packet-q708.h" static int proto_q708 = -1; diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index d0b61ea3e3..1ae6ec7920 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -28,7 +28,6 @@ #endif #include <glib.h> -#include <epan/proto.h> #include <epan/packet.h> #include "packet-ip.h" diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index bb0995f168..42494ebf2a 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -35,7 +35,6 @@ #include <epan/packet.h> -#include <epan/proto.h> #include <epan/etypes.h> #include <epan/ipproto.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 5b69b7cda4..ecc4d09ac6 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -31,10 +31,8 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> -#include <epan/value_string.h> #include <epan/expert.h> #include <epan/ptvcursor.h> -#include <epan/tvbuff.h> /* roofnet packet type constants */ diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 02a15d04ba..f1ca488f8d 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -38,7 +38,6 @@ #include <ctype.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/lapd_sapi.h> #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 9c70594a41..8a5262628b 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -101,7 +101,6 @@ #include <glib.h> -#include <epan/tvbuff.h> #include <epan/packet.h> #include <prefs.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 217d76dca3..c555cf1595 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -34,17 +34,15 @@ # include "config.h" #endif -#include <stdlib.h> #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/tvbuff.h> -#include "packet-tcp.h" #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/expert.h> +#include "packet-tcp.h" /* Initialize the protocol and registered fields */ static int proto_slsk = -1; diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 5571387a3b..4d00af2583 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -38,7 +38,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> -#include <epan/proto.h> #include "packet-tte.h" diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 926f2e7e26..ef3f4fb6b1 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -37,7 +37,6 @@ #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> -#include <epan/value_string.h> #include "packet-ieee802154.h" #include "packet-zbee.h" |