osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-atm.c

2089 lines
74 KiB
C
Raw Normal View History

Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/* packet-atm.c
* Routines for ATM packet disassembly
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
dissectors: use SPDX identifiers. Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12 11:23:27 +00:00
* SPDX-License-Identifier: GPL-2.0-or-later
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
Create a way to register "capture" dissectors. Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 04:38:21 +00:00
#include <epan/capture_dissectors.h>
include <wsutil/pint.h> only when needed. svn path=/trunk/; revision=53196
2013-11-09 15:44:29 +00:00
#include <wsutil/pint.h>
Move a pile of protocol-related headers from the top-level source directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
#include <epan/oui.h>
From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
#include <epan/addr_resolv.h>
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
#include <epan/ppptypes.h>
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
#include <epan/expert.h>
Clean up the CRC-10 code. Have the wsutil routine just accumulate the stuff from the buffer handed to us. Have the IUUP dissector deal with the extra stuff. Add a update_crc10_by_bytes_tvb() routine, which is passed a tvbuff, offset, and length, and use that rather than using tvb_get_ptr() in dissectors. Change-Id: Iadd0823c764080e60d1339abb94d2e19150eabfe Reviewed-on: https://code.wireshark.org/review/3509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-08 18:08:35 +00:00
#include <epan/crc10-tvb.h>
The "MPEG-2" CRC-32 is also the ATM CRC-32. Use it in the ATM dissector, and use a tvbuff version, so that we don't do tvb_get_ptr() ourselves. Change-Id: I0bd3594bc739e0cca447ac06f34a471441cf2e70 Reviewed-on: https://code.wireshark.org/review/3513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-08 19:51:32 +00:00
#include <epan/crc32-tvb.h>
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
#include <epan/decode_as.h>
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
#include "packet-atm.h"
ILMI is just SNMP-over-ATM AAL5; if the SNMP dissector is available, dissect ILMI packets with the SNMP dissector. svn path=/trunk/; revision=1054
1999-11-18 07:29:55 +00:00
#include "packet-snmp.h"
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
#include "packet-eth.h"
#include "packet-tr.h"
#include "packet-llc.h"
Sanitize epan includes svn path=/trunk/; revision=29499
2009-08-21 20:25:24 +00:00
#include <epan/prefs.h>
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
#include "packet-pw-atm.h"
ILMI is just SNMP-over-ATM AAL5; if the SNMP dissector is available, dissect ILMI packets with the SNMP dissector. svn path=/trunk/; revision=1054
1999-11-18 07:29:55 +00:00
- [-Wmissing-prototypes] - explicit casts. svn path=/trunk/; revision=48282
2013-03-13 21:14:20 +00:00
void proto_register_atm(void);
void proto_reg_handoff_atm(void);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static int proto_atm = -1;
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
static int hf_atm_aal = -1;
Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-31 16:39:40 +00:00
static int hf_atm_gfc = -1;
Make the VPI and VCI filterable fields. svn path=/trunk/; revision=1126
1999-11-27 06:17:23 +00:00
static int hf_atm_vpi = -1;
static int hf_atm_vci = -1;
For DCT2000, show better transport info: - for FP over AAL2, add CID to AAL tree - for IPPRIM protocols, show IPV4 addresses in src & dst columns svn path=/trunk/; revision=19156
2006-09-05 16:05:23 +00:00
static int hf_atm_cid = -1;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
static int hf_atm_reserved = -1;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static int proto_atm_lane = -1;
ILMI is just SNMP-over-ATM AAL5; if the SNMP dissector is available, dissect ILMI packets with the SNMP dissector. svn path=/trunk/; revision=1054
1999-11-18 07:29:55 +00:00
static int proto_ilmi = -1;
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
static int proto_aal1 = -1;
static int proto_aal3_4 = -1;
static int proto_oamaal = -1;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
static int hf_atm_le_client_client = -1;
static int hf_atm_lan_destination_tag = -1;
static int hf_atm_lan_destination_mac = -1;
static int hf_atm_le_control_tlv_type = -1;
static int hf_atm_le_control_tlv_length = -1;
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
static int hf_atm_lan_destination_route_desc = -1;
static int hf_atm_lan_destination_lan_id = -1;
static int hf_atm_lan_destination_bridge_num = -1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
static int hf_atm_source_atm = -1;
static int hf_atm_target_atm = -1;
static int hf_atm_le_configure_join_frame_lan_type = -1;
static int hf_atm_le_configure_join_frame_max_frame_size = -1;
static int hf_atm_le_configure_join_frame_num_tlvs = -1;
static int hf_atm_le_configure_join_frame_elan_name_size = -1;
static int hf_atm_le_configure_join_frame_elan_name = -1;
static int hf_atm_le_registration_frame_num_tlvs = -1;
static int hf_atm_le_arp_frame_num_tlvs = -1;
static int hf_atm_le_verify_frame_num_tlvs = -1;
static int hf_atm_le_control_marker = -1;
static int hf_atm_le_control_protocol = -1;
static int hf_atm_le_control_version = -1;
static int hf_atm_le_control_opcode = -1;
static int hf_atm_le_control_status = -1;
static int hf_atm_le_control_transaction_id = -1;
static int hf_atm_le_control_requester_lecid = -1;
static int hf_atm_le_control_flags = -1;
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
static int hf_atm_le_control_flag_v2_capable = -1;
static int hf_atm_le_control_flag_selective_multicast = -1;
static int hf_atm_le_control_flag_v2_required = -1;
static int hf_atm_le_control_flag_proxy = -1;
static int hf_atm_le_control_flag_exclude_explorer_frames = -1;
static int hf_atm_le_control_flag_address = -1;
static int hf_atm_le_control_topology_change = -1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
static int hf_atm_traffic_type = -1;
static int hf_atm_traffic_vcmx = -1;
static int hf_atm_traffic_lane = -1;
static int hf_atm_traffic_ipsilon = -1;
static int hf_atm_cells = -1;
static int hf_atm_aal5_uu = -1;
static int hf_atm_aal5_cpi = -1;
static int hf_atm_aal5_len = -1;
static int hf_atm_aal5_crc = -1;
static int hf_atm_payload_type = -1;
static int hf_atm_cell_loss_priority = -1;
static int hf_atm_header_error_check = -1;
static int hf_atm_channel = -1;
static int hf_atm_aa1_csi = -1;
static int hf_atm_aa1_seq_count = -1;
static int hf_atm_aa1_crc = -1;
static int hf_atm_aa1_parity = -1;
static int hf_atm_aa1_payload = -1;
static int hf_atm_aal3_4_seg_type = -1;
static int hf_atm_aal3_4_seq_num = -1;
static int hf_atm_aal3_4_multiplex_id = -1;
static int hf_atm_aal3_4_information = -1;
static int hf_atm_aal3_4_length_indicator = -1;
static int hf_atm_aal3_4_crc = -1;
static int hf_atm_aal_oamcell_type = -1;
static int hf_atm_aal_oamcell_type_fm = -1;
static int hf_atm_aal_oamcell_type_pm = -1;
static int hf_atm_aal_oamcell_type_ad = -1;
static int hf_atm_aal_oamcell_type_ft = -1;
static int hf_atm_aal_oamcell_func_spec = -1;
static int hf_atm_aal_oamcell_crc = -1;
Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-31 16:39:40 +00:00
static int hf_atm_padding = -1;
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_atm = -1;
static gint ett_atm_lane = -1;
static gint ett_atm_lane_lc_lan_dest = -1;
static gint ett_atm_lane_lc_lan_dest_rd = -1;
static gint ett_atm_lane_lc_flags = -1;
Put a list of known OUIs in "oui.h", along with a declaration of "value_string" array for OUIs. Add the OUI for the ATM Forum to that list. Handle the OUI for the ATM Forum in the layer 3 information for ISO TR 9577 in a Broadband Low Layer Information information element (for ATM LANE). Add an initial version of the dissection of TLV values in LANE LE Control frames (I have no frames with TLV values against which to test it, alas). svn path=/trunk/; revision=1385
1999-12-29 05:20:00 +00:00
static gint ett_atm_lane_lc_tlv = -1;
ILMI is just SNMP-over-ATM AAL5; if the SNMP dissector is available, dissect ILMI packets with the SNMP dissector. svn path=/trunk/; revision=1054
1999-11-18 07:29:55 +00:00
static gint ett_ilmi = -1;
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
static gint ett_aal1 = -1;
static gint ett_aal3_4 = -1;
static gint ett_oamaal = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
static expert_field ei_atm_reassembly_failed = EI_INIT;
Keep result of [new_]register_dissector in some dissectors. [2 of x] (don't create new dissector handle if we can use already existing one) svn path=/trunk/; revision=51159
2013-08-05 19:09:44 +00:00
static dissector_handle_t atm_handle;
static dissector_handle_t atm_untruncated_handle;
Export two versions of the Ethereal dissector, for use with encapsulated Ethernet frames, one for encapsulated frames that include an FCS and one for encapsulated frames that don't include an FCS. Use the appropriate versions. In the ISL dissector, do the same sort of processing we do in the Ethernet dissector to figure out whether the frame has a trailer or not and whether it has an FCS or not. svn path=/trunk/; revision=12593
2004-11-24 09:13:52 +00:00
static dissector_handle_t eth_withoutfcs_handle;
Always call the Ethernet and Token Ring dissectors through a dissector handle, and make them static. svn path=/trunk/; revision=2925
2001-01-21 20:16:01 +00:00
static dissector_handle_t tr_handle;
From Anton Ivanov: add support for Frame Relay over ATM. svn path=/trunk/; revision=13883
2005-03-23 20:25:29 +00:00
static dissector_handle_t fr_handle;
Always call the Ethernet and Token Ring dissectors through a dissector handle, and make them static. svn path=/trunk/; revision=2925
2001-01-21 20:16:01 +00:00
static dissector_handle_t llc_handle;
Call the SSCOP dissector through a handle. That lets us get rid of the CHECK_DISPLAY_AS_DATA call and code to set "pinfo->current_proto", as "call_dissector()" does that for us. svn path=/trunk/; revision=3457
2001-05-27 04:50:51 +00:00
static dissector_handle_t sscop_handle;
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
static dissector_handle_t ppp_handle;
Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors. Have a dissector that is passed a "struct eth_phdr" pointer, indicating whether there is an FCS, there is no FCS, or there's maybe an FCS, and an "eth_maybefcs" dissector, to be called from other dissectors. The latter takes no data argument. That obviates the need for callers of the latter to fill in an "eth_phdr" structure. Note in a comment that setting the "assume an FCS" preference overrides a file format handler in Wiretap saying "we have no FCS". I seem to remember that this might be intentional. Ping-Bug: 9933 Change-Id: I600e1351d468ab31d48369edb96832d6da3e480c Reviewed-on: https://code.wireshark.org/review/13432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-20 09:46:34 +00:00
static dissector_handle_t eth_maybefcs_handle;
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
static dissector_handle_t ip_handle;
Always call the Ethernet and Token Ring dissectors through a dissector handle, and make them static. svn path=/trunk/; revision=2925
2001-01-21 20:16:01 +00:00
Froim Rene Pilz: This patch consists also the last issues. Additionally it solves: - For the SSCOP frames the AAL5 decoding was not performed due to an earlier patch. This caused that no SSCOP message was properly decoded. - As the detection between a LANE frame and a SSCOP frame is rather hard a switch within the atm dissector is included which enforce SSCOP dissecting over a LANE frame. At the moment I do not see a better solution for that. svn path=/trunk/; revision=20013
2006-11-29 06:44:07 +00:00
static gboolean dissect_lanesscop = FALSE;
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
static dissector_table_t atm_type_aal2_table;
static dissector_table_t atm_type_aal5_table;
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
static dissector_table_t atm_cell_payload_vpi_vci_table;
static dissector_table_t atm_reassembled_vpi_vci_table;
From Stephen Donnelly: AAL2 preference. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465 svn path=/trunk/; revision=31813
2010-02-07 13:37:51 +00:00
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/*
* See
*
Update URLs. A funny thing happened on the way to the {ATM, MPLS} Forum. Change-Id: I8159f9191737febe3e5c4618bbb72ecb4bfc300b Reviewed-on: https://code.wireshark.org/review/29818 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-25 04:58:49 +00:00
* https://www.broadband-forum.org/index.php?option=com_sppagebuilder&view=page&id=185
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
*
* for a number of ATM Forum specifications, e.g. the LAN Emulation
* over ATM 1.0 spec, whence I got most of this.
*/
/* LE Control opcodes */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define LE_CONFIGURE_REQUEST 0x0001
#define LE_CONFIGURE_RESPONSE 0x0101
#define LE_JOIN_REQUEST 0x0002
#define LE_JOIN_RESPONSE 0x0102
#define READY_QUERY 0x0003
#define READY_IND 0x0103
#define LE_REGISTER_REQUEST 0x0004
#define LE_REGISTER_RESPONSE 0x0104
#define LE_UNREGISTER_REQUEST 0x0005
#define LE_UNREGISTER_RESPONSE 0x0105
#define LE_ARP_REQUEST 0x0006
#define LE_ARP_RESPONSE 0x0106
#define LE_FLUSH_REQUEST 0x0007
#define LE_FLUSH_RESPONSE 0x0107
#define LE_NARP_REQUEST 0x0008
#define LE_TOPOLOGY_REQUEST 0x0009
#define LE_VERIFY_REQUEST 0x000A
#define LE_VERIFY_RESPONSE 0x010A
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static const value_string le_control_opcode_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ LE_CONFIGURE_REQUEST, "LE_CONFIGURE_REQUEST" },
{ LE_CONFIGURE_RESPONSE, "LE_CONFIGURE_RESPONSE" },
{ LE_JOIN_REQUEST, "LE_JOIN_REQUEST" },
{ LE_JOIN_RESPONSE, "LE_JOIN_RESPONSE" },
{ READY_QUERY, "READY_QUERY" },
{ READY_IND, "READY_IND" },
{ LE_REGISTER_REQUEST, "LE_REGISTER_REQUEST" },
{ LE_REGISTER_RESPONSE, "LE_REGISTER_RESPONSE" },
{ LE_UNREGISTER_REQUEST, "LE_UNREGISTER_REQUEST" },
{ LE_UNREGISTER_RESPONSE, "LE_UNREGISTER_RESPONSE" },
{ LE_ARP_REQUEST, "LE_ARP_REQUEST" },
{ LE_ARP_RESPONSE, "LE_ARP_RESPONSE" },
{ LE_FLUSH_REQUEST, "LE_FLUSH_REQUEST" },
{ LE_FLUSH_RESPONSE, "LE_FLUSH_RESPONSE" },
{ LE_NARP_REQUEST, "LE_NARP_REQUEST" },
{ LE_TOPOLOGY_REQUEST, "LE_TOPOLOGY_REQUEST" },
{ LE_VERIFY_REQUEST, "LE_VERIFY_REQUEST" },
{ LE_VERIFY_RESPONSE, "LE_VERIFY_RESPONSE" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* LE Control statuses */
static const value_string le_control_status_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, "Success" },
{ 1, "Version not supported" },
{ 2, "Invalid request parameters" },
{ 4, "Duplicate LAN destination registration" },
{ 5, "Duplicate ATM address" },
{ 6, "Insufficient resources to grant request" },
{ 7, "Access denied" },
{ 8, "Invalid REQUESTOR-ID" },
{ 9, "Invalid LAN destination" },
{ 10, "Invalid ATM address" },
{ 20, "No configuration" },
{ 21, "LE_CONFIGURE error" },
{ 22, "Insufficient information" },
{ 24, "TLV not found" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* LE Control LAN destination tags */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define TAG_NOT_PRESENT 0x0000
#define TAG_MAC_ADDRESS 0x0001
#define TAG_ROUTE_DESCRIPTOR 0x0002
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static const value_string le_control_landest_tag_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ TAG_NOT_PRESENT, "Not present" },
{ TAG_MAC_ADDRESS, "MAC address" },
{ TAG_ROUTE_DESCRIPTOR, "Route descriptor" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* LE Control LAN types */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define LANT_UNSPEC 0x00
#define LANT_802_3 0x01
#define LANT_802_5 0x02
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static const value_string le_control_lan_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ LANT_UNSPEC, "Unspecified" },
{ LANT_802_3, "Ethernet/802.3" },
{ LANT_802_5, "802.5" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
static const value_string le_control_frame_size_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0x00, "Unspecified" },
{ 0x01, "1516/1528/1580/1592" },
{ 0x02, "4544/4556/1580/1592" },
{ 0x03, "9234/9246" },
{ 0x04, "18190/18202" },
{ 0, NULL }
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
};
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
static const value_string atm_channel_vals[] = {
{ 0, "DTE->DCE" },
{ 1, "DCE->DTE" },
{ 0, NULL }
};
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
static const true_false_string tfs_remote_local = { "Remote", "Local" };
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
static const true_false_string tfs_low_high_priority = { "Low priority", "High priority" };
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static void
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
dissect_le_client(tvbuff_t *tvb, proto_tree *tree)
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
{
proto_item *ti;
proto_tree *lane_tree;
if (tree) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
ti = proto_tree_add_protocol_format(tree, proto_atm_lane, tvb, 0, 2, "ATM LANE");
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
lane_tree = proto_item_add_subtree(ti, ett_atm_lane);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_client_client, tvb, 0, 2, ENC_BIG_ENDIAN );
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
}
static void
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree *tree)
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
{
proto_item *td;
proto_tree *dest_tree;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
guint16 tag;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
proto_tree *rd_tree;
convert to proto_tree_add_subtree[_format] Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 20:01:36 +00:00
dest_tree = proto_tree_add_subtree_format(tree, tvb, offset, 8,
ett_atm_lane_lc_lan_dest, NULL, "%s LAN destination", type);
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
tag = tvb_get_ntohs(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(dest_tree, hf_atm_lan_destination_tag, tvb, offset, 2, ENC_BIG_ENDIAN );
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
offset += 2;
switch (tag) {
case TAG_MAC_ADDRESS:
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(dest_tree, hf_atm_lan_destination_mac, tvb, offset, 6, ENC_NA);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
case TAG_ROUTE_DESCRIPTOR:
offset += 4;
convert to proto_tree_add_subtree[_format] Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 20:01:36 +00:00
td = proto_tree_add_item(dest_tree, hf_atm_lan_destination_route_desc, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
rd_tree = proto_item_add_subtree(td, ett_atm_lane_lc_lan_dest_rd);
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
proto_tree_add_item(rd_tree, hf_atm_lan_destination_lan_id, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(rd_tree, hf_atm_lan_destination_bridge_num, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
}
}
Put a list of known OUIs in "oui.h", along with a declaration of "value_string" array for OUIs. Add the OUI for the ATM Forum to that list. Handle the OUI for the ATM Forum in the layer 3 information for ISO TR 9577 in a Broadband Low Layer Information information element (for ATM LANE). Add an initial version of the dissection of TLV values in LANE LE Control frames (I have no frames with TLV values against which to test it, alas). svn path=/trunk/; revision=1385
1999-12-29 05:20:00 +00:00
/*
* TLV values in LE Control frames.
*/
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define TLV_TYPE(oui, ident) (((oui) << 8) | (ident))
#define LE_CONTROL_TIMEOUT TLV_TYPE(OUI_ATM_FORUM, 0x01)
#define LE_MAX_UNK_FRAME_COUNT TLV_TYPE(OUI_ATM_FORUM, 0x02)
#define LE_MAX_UNK_FRAME_TIME TLV_TYPE(OUI_ATM_FORUM, 0x03)
#define LE_VCC_TIMEOUT_PERIOD TLV_TYPE(OUI_ATM_FORUM, 0x04)
#define LE_MAX_RETRY_COUNT TLV_TYPE(OUI_ATM_FORUM, 0x05)
#define LE_AGING_TIME TLV_TYPE(OUI_ATM_FORUM, 0x06)
#define LE_FORWARD_DELAY_TIME TLV_TYPE(OUI_ATM_FORUM, 0x07)
#define LE_EXPECTED_ARP_RESPONSE_TIME TLV_TYPE(OUI_ATM_FORUM, 0x08)
#define LE_FLUSH_TIMEOUT TLV_TYPE(OUI_ATM_FORUM, 0x09)
#define LE_PATH_SWITCHING_DELAY TLV_TYPE(OUI_ATM_FORUM, 0x0A)
#define LE_LOCAL_SEGMENT_ID TLV_TYPE(OUI_ATM_FORUM, 0x0B)
#define LE_MCAST_SEND_VCC_TYPE TLV_TYPE(OUI_ATM_FORUM, 0x0C)
#define LE_MCAST_SEND_VCC_AVGRATE TLV_TYPE(OUI_ATM_FORUM, 0x0D)
#define LE_MCAST_SEND_VCC_PEAKRATE TLV_TYPE(OUI_ATM_FORUM, 0x0E)
#define LE_CONN_COMPLETION_TIMER TLV_TYPE(OUI_ATM_FORUM, 0x0F)
#define LE_CONFIG_FRAG_INFO TLV_TYPE(OUI_ATM_FORUM, 0x10)
#define LE_LAYER_3_ADDRESS TLV_TYPE(OUI_ATM_FORUM, 0x11)
#define LE_ELAN_ID TLV_TYPE(OUI_ATM_FORUM, 0x12)
#define LE_SERVICE_CATEGORY TLV_TYPE(OUI_ATM_FORUM, 0x13)
#define LE_LLC_MUXED_ATM_ADDRESS TLV_TYPE(OUI_ATM_FORUM, 0x2B)
#define LE_X5_ADJUSTMENT TLV_TYPE(OUI_ATM_FORUM, 0x2C)
#define LE_PREFERRED_LES TLV_TYPE(OUI_ATM_FORUM, 0x2D)
Put a list of known OUIs in "oui.h", along with a declaration of "value_string" array for OUIs. Add the OUI for the ATM Forum to that list. Handle the OUI for the ATM Forum in the layer 3 information for ISO TR 9577 in a Broadband Low Layer Information information element (for ATM LANE). Add an initial version of the dissection of TLV values in LANE LE Control frames (I have no frames with TLV values against which to test it, alas). svn path=/trunk/; revision=1385
1999-12-29 05:20:00 +00:00
static const value_string le_tlv_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ LE_CONTROL_TIMEOUT, "Control Time-out" },
{ LE_MAX_UNK_FRAME_COUNT, "Maximum Unknown Frame Count" },
{ LE_MAX_UNK_FRAME_TIME, "Maximum Unknown Frame Time" },
{ LE_VCC_TIMEOUT_PERIOD, "VCC Time-out" },
{ LE_MAX_RETRY_COUNT, "Maximum Retry Count" },
{ LE_AGING_TIME, "Aging Time" },
{ LE_FORWARD_DELAY_TIME, "Forwarding Delay Time" },
{ LE_EXPECTED_ARP_RESPONSE_TIME, "Expected LE_ARP Response Time" },
{ LE_FLUSH_TIMEOUT, "Flush Time-out" },
{ LE_PATH_SWITCHING_DELAY, "Path Switching Delay" },
{ LE_LOCAL_SEGMENT_ID, "Local Segment ID" },
{ LE_MCAST_SEND_VCC_TYPE, "Mcast Send VCC Type" },
{ LE_MCAST_SEND_VCC_AVGRATE, "Mcast Send VCC AvgRate" },
{ LE_MCAST_SEND_VCC_PEAKRATE, "Mcast Send VCC PeakRate" },
{ LE_CONN_COMPLETION_TIMER, "Connection Completion Timer" },
{ LE_CONFIG_FRAG_INFO, "Config Frag Info" },
{ LE_LAYER_3_ADDRESS, "Layer 3 Address" },
{ LE_ELAN_ID, "ELAN ID" },
{ LE_SERVICE_CATEGORY, "Service Category" },
{ LE_LLC_MUXED_ATM_ADDRESS, "LLC-muxed ATM Address" },
{ LE_X5_ADJUSTMENT, "X5 Adjustment" },
{ LE_PREFERRED_LES, "Preferred LES" },
{ 0, NULL },
Put a list of known OUIs in "oui.h", along with a declaration of "value_string" array for OUIs. Add the OUI for the ATM Forum to that list. Handle the OUI for the ATM Forum in the layer 3 information for ISO TR 9577 in a Broadband Low Layer Information information element (for ATM LANE). Add an initial version of the dissection of TLV values in LANE LE Control frames (I have no frames with TLV values against which to test it, alas). svn path=/trunk/; revision=1385
1999-12-29 05:20:00 +00:00
};
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
static void
dissect_le_control_tlvs(tvbuff_t *tvb, int offset, guint num_tlvs,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_tree *tree)
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
{
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
guint32 tlv_type;
guint8 tlv_length;
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
proto_tree *tlv_tree;
while (num_tlvs != 0) {
tlv_type = tvb_get_ntohl(tvb, offset);
tlv_length = tvb_get_guint8(tvb, offset+4);
convert to proto_tree_add_subtree[_format] Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 20:01:36 +00:00
tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, 5+tlv_length, ett_atm_lane_lc_tlv, NULL,
"TLV type: %s", val_to_str(tlv_type, le_tlv_type_vals, "Unknown (0x%08x)"));
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tlv_tree, hf_atm_le_control_tlv_type, tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tlv_tree, hf_atm_le_control_tlv_length, tvb, offset+4, 1, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 5+tlv_length;
num_tlvs--;
}
}
static void
dissect_le_configure_join_frame(tvbuff_t *tvb, int offset, proto_tree *tree)
{
guint8 num_tlvs;
guint8 name_size;
dissect_lan_destination(tvb, offset, "Source", tree);
offset += 8;
dissect_lan_destination(tvb, offset, "Target", tree);
offset += 8;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_source_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_configure_join_frame_lan_type, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_configure_join_frame_max_frame_size, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
num_tlvs = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_configure_join_frame_num_tlvs, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
name_size = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_configure_join_frame_elan_name_size, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_target_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
if (name_size > 32)
name_size = 32;
if (name_size != 0) {
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_configure_join_frame_elan_name, tvb, offset, name_size, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
}
offset += 32;
dissect_le_control_tlvs(tvb, offset, num_tlvs, tree);
}
static void
dissect_le_registration_frame(tvbuff_t *tvb, int offset, proto_tree *tree)
{
guint8 num_tlvs;
dissect_lan_destination(tvb, offset, "Source", tree);
offset += 8;
dissect_lan_destination(tvb, offset, "Target", tree);
offset += 8;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_source_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 2, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 2;
num_tlvs = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_registration_frame_num_tlvs, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 53, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 53;
dissect_le_control_tlvs(tvb, offset, num_tlvs, tree);
}
static void
dissect_le_arp_frame(tvbuff_t *tvb, int offset, proto_tree *tree)
{
guint8 num_tlvs;
dissect_lan_destination(tvb, offset, "Source", tree);
offset += 8;
dissect_lan_destination(tvb, offset, "Target", tree);
offset += 8;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_source_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 2, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 2;
num_tlvs = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_arp_frame_num_tlvs, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_target_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 32, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 32;
dissect_le_control_tlvs(tvb, offset, num_tlvs, tree);
}
static void
dissect_le_verify_frame(tvbuff_t *tvb, int offset, proto_tree *tree)
{
guint8 num_tlvs;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 38, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 38;
num_tlvs = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_le_verify_frame_num_tlvs, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 1, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_target_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 32, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 32;
dissect_le_control_tlvs(tvb, offset, num_tlvs, tree);
}
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40040
2011-11-29 19:50:30 +00:00
static int
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
dissect_le_flush_frame(tvbuff_t *tvb, int offset, proto_tree *tree)
{
dissect_lan_destination(tvb, offset, "Source", tree);
offset += 8;
dissect_lan_destination(tvb, offset, "Target", tree);
offset += 8;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_source_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 4, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 4;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(tree, hf_atm_target_atm, tvb, offset, 20, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 20;
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
proto_tree_add_item(tree, hf_atm_reserved, tvb, offset, 32, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 32;
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40040
2011-11-29 19:50:30 +00:00
return offset;
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
static void
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
dissect_le_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
{
proto_item *ti;
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
proto_tree *lane_tree = NULL;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
int offset = 0;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
proto_item *tf;
proto_tree *flags_tree;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
guint16 opcode;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Don't guard col_set_str (COL_INFO) with col_check svn path=/trunk/; revision=29342
2009-08-09 07:01:26 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "LE Control");
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
if (tree) {
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
ti = proto_tree_add_protocol_format(tree, proto_atm_lane, tvb, offset, 108, "ATM LANE");
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
lane_tree = proto_item_add_subtree(ti, ett_atm_lane);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_marker, tvb, offset, 2, ENC_BIG_ENDIAN );
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
}
offset += 2;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
if (tree) {
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_protocol, tvb, offset, 1, ENC_BIG_ENDIAN );
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
}
offset += 1;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
if (tree) {
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_version, tvb, offset, 1, ENC_BIG_ENDIAN );
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
}
offset += 1;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
opcode = tvb_get_ntohs(tvb, offset);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str(opcode, le_control_opcode_vals,
"Unknown opcode (0x%04X)"));
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
if (tree) {
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_opcode, tvb, offset, 2, ENC_BIG_ENDIAN );
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
}
offset += 2;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
if (opcode == READY_QUERY || opcode == READY_IND) {
/* There's nothing more in this packet. */
return;
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
if (tree) {
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
if (opcode & 0x0100) {
/* Response; decode status. */
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_status, tvb, offset, 2, ENC_BIG_ENDIAN );
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
offset += 2;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN );
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
offset += 4;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(lane_tree, hf_atm_le_control_requester_lecid, tvb, offset, 2, ENC_BIG_ENDIAN );
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
offset += 2;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
tf = proto_tree_add_item(lane_tree, hf_atm_le_control_flags, tvb, offset, 2, ENC_BIG_ENDIAN );
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
flags_tree = proto_item_add_subtree(tf, ett_atm_lane_lc_flags);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
switch (opcode) {
case LE_CONFIGURE_REQUEST:
case LE_CONFIGURE_RESPONSE:
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_v2_capable, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 2;
dissect_le_configure_join_frame(tvb, offset, lane_tree);
break;
case LE_JOIN_REQUEST:
case LE_JOIN_RESPONSE:
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_v2_capable, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
if (opcode == LE_JOIN_REQUEST) {
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_selective_multicast, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
} else {
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_v2_required, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
}
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_proxy, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_exclude_explorer_frames, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
offset += 2;
dissect_le_configure_join_frame(tvb, offset, lane_tree);
break;
case LE_REGISTER_REQUEST:
case LE_REGISTER_RESPONSE:
case LE_UNREGISTER_REQUEST:
case LE_UNREGISTER_RESPONSE:
offset += 2;
dissect_le_registration_frame(tvb, offset, lane_tree);
break;
case LE_ARP_REQUEST:
case LE_ARP_RESPONSE:
case LE_NARP_REQUEST:
if (opcode != LE_NARP_REQUEST) {
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_flag_address, tvb, offset, 2, ENC_BIG_ENDIAN);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
}
offset += 2;
dissect_le_arp_frame(tvb, offset, lane_tree);
break;
case LE_TOPOLOGY_REQUEST:
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
proto_tree_add_item(flags_tree, hf_atm_le_control_topology_change, tvb, offset, 2, ENC_BIG_ENDIAN);
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
offset += 2;
proto_tree_add_item(flags_tree, hf_atm_reserved, tvb, offset, 92, ENC_NA);
Add LANE 2.0 stuff. Show the maximum frame size symbolically. For the various LANE frame types, show only the fields those frame types are specified to contain, and show only the flag bits that are specified for those frame types. Use the ELAN name size when putting the name into the protocol tree, and don't put it in if the name size is 0. svn path=/trunk/; revision=5543
2002-05-24 09:31:06 +00:00
break;
case LE_VERIFY_REQUEST:
case LE_VERIFY_RESPONSE:
offset += 2;
dissect_le_verify_frame(tvb, offset, lane_tree);
break;
case LE_FLUSH_REQUEST:
case LE_FLUSH_RESPONSE:
offset += 2;
dissect_le_flush_frame(tvb, offset, lane_tree);
break;
Put a list of known OUIs in "oui.h", along with a declaration of "value_string" array for OUIs. Add the OUI for the ATM Forum to that list. Handle the OUI for the ATM Forum in the layer 3 information for ISO TR 9577 in a Broadband Low Layer Information information element (for ATM LANE). Add an initial version of the dissection of TLV values in LANE LE Control frames (I have no frames with TLV values against which to test it, alas). svn path=/trunk/; revision=1385
1999-12-29 05:20:00 +00:00
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
}
Create capture dissector tables. They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 21:54:16 +00:00
static gboolean
Standardize the capture dissector function signature. This will make it easier to mold into (capture) dissector tables. Change-Id: Iad63f2c2869782977992a3a072adb020be4b1818 Reviewed-on: https://code.wireshark.org/review/12587 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 14:50:01 +00:00
capture_lane(const guchar *pd, int offset _U_,
Create capture dissector "info" structure (capture_packet_info_t) While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added. Change-Id: I003552c58043c7c2d67aec458187b12b233057e2 Reviewed-on: https://code.wireshark.org/review/12690 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-15 00:25:31 +00:00
int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
{
/* Is it LE Control, 802.3, 802.5, or "none of the above"? */
Create capture dissector "info" structure (capture_packet_info_t) While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added. Change-Id: I003552c58043c7c2d67aec458187b12b233057e2 Reviewed-on: https://code.wireshark.org/review/12690 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-15 00:25:31 +00:00
return try_capture_dissector("atm_lane", pseudo_header->atm.subtype, pd, 2, len, cpinfo, pseudo_header);
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
}
create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-15 13:00:10 +00:00
static int
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
{
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
struct atm_phdr *atm_info = (struct atm_phdr *)data;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
tvbuff_t *next_tvb;
tvbuff_t *next_tvb_le_client;
Convert token-ring dissector to use tvbuffs. Modify ethernet dissector to catch BoundsError if the attempt to create next_tvb with the length specified in the ethernet header throws an exception. In that case, next_tv is created with as many bytes as are available in the frame. Both dissect_tr() and dissect_eth() now have TRY blocks, which means I had to fiddle with 'volatile' and 'static' storage options to get things right (at least according to gcc). svn path=/trunk/; revision=1962
2000-05-15 06:22:07 +00:00
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM LANE");
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/* Is it LE Control, 802.3, 802.5, or "none of the above"? */
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
switch (atm_info->subtype) {
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Replace the "ngsniffer_atm" with an "atm" pseudo-header, which isn't just an image of the ATM Sniffer data. This means that Ethereal doesn't have to know any ATM Sniffer-specific details (that's all hidden in Wiretap), and allows us to add to that pseudo-header fields, traffic types, etc. unknown to ATM Sniffers. Have Wiretap map VPI 0/VCI 5 to the signalling AAL - for some capture files, this might not be necessary, as they may mark all signalling traffic as such, but, on other platforms, we don't know the AAL, so we assume AAL5 except for 0/5 traffic. Doing it in Wiretap lets us hide those details from Ethereal (and lets Ethereal interpret 0/5 traffic as non-signalling traffic, in case that happens to be what it is). We may know that traffic is LANE, but not whether it's LE Control or emulated 802.3/802.5; handle that case. svn path=/trunk/; revision=5302
2002-04-30 08:48:27 +00:00
case TRAF_ST_LANE_LE_CTRL:
Add "tvb_reported_length()" to get the "reported length" of a tvbuff (i.e., the amount of data that was in the packet, even if not all of it was captured), for use when dissecting packets containing data that fills the packet (we want the dissector to try to dissect all of it; if it runs past the end of the captured data, we want it to throw an exception so that we'll put a "Short Frame" note in the protocol tree). This means we always want a tvbuff to have a real reported length value, so we make it an unsigned integer, and don't bother checking it for -1, as it should never be -1. If the reported length passed in to "tvb_set_subset()" is -1, set the reported length to the reported length of the tvbuff of which the new tvbuff will be a subset minus the offset in that tvbuff of the subset, so that "-1" means "what's left of the packet after we chop off the header". This is necessary in order to ensure that all tvbuffs have a real reported length value. Have "dissect_packet()" set the reported length of the top-level tvbuff to the reported length of the frame, so that we start out with a tvbuff with a real reported length value. Have "tvb_offset_exists()" return FALSE if the offset is past the end of the tvbuff. If the offset passed to it is postitive, have "compute_offset_length()" check for that it's not more than one byte past the end of the tvbuff - if it's just past the end, we don't want the check to fail, as we don't want attempts to create a subset tvbuff containing zero bytes to fail; that would be done if a captured packet was all header and no payload, and we'd want the dissector of the payload, not the dissector of the header, to throw an exception, as the problem isn't with the protocol for the header, it's with the protocol for the payload. Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector, and the Q.931 dissector to use tvbuffs. Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's not converted yet). svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
dissect_le_control(tvb, pinfo, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
Replace the "ngsniffer_atm" with an "atm" pseudo-header, which isn't just an image of the ATM Sniffer data. This means that Ethereal doesn't have to know any ATM Sniffer-specific details (that's all hidden in Wiretap), and allows us to add to that pseudo-header fields, traffic types, etc. unknown to ATM Sniffers. Have Wiretap map VPI 0/VCI 5 to the signalling AAL - for some capture files, this might not be necessary, as they may mark all signalling traffic as such, but, on other platforms, we don't know the AAL, so we assume AAL5 except for 0/5 traffic. Doing it in Wiretap lets us hide those details from Ethereal (and lets Ethereal interpret 0/5 traffic as non-signalling traffic, in case that happens to be what it is). We may know that traffic is LANE, but not whether it's LE Control or emulated 802.3/802.5; handle that case. svn path=/trunk/; revision=5302
2002-04-30 08:48:27 +00:00
case TRAF_ST_LANE_802_3:
case TRAF_ST_LANE_802_3_MC:
Don't guard col_set_str (COL_INFO) with col_check svn path=/trunk/; revision=29342
2009-08-09 07:01:26 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "LE Client - Ethernet/802.3");
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
dissect_le_client(tvb, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/* Dissect as Ethernet */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
next_tvb_le_client = tvb_new_subset_remaining(tvb, 2);
Export two versions of the Ethereal dissector, for use with encapsulated Ethernet frames, one for encapsulated frames that include an FCS and one for encapsulated frames that don't include an FCS. Use the appropriate versions. In the ISL dissector, do the same sort of processing we do in the Ethernet dissector to figure out whether the frame has a trailer or not and whether it has an FCS or not. svn path=/trunk/; revision=12593
2004-11-24 09:13:52 +00:00
call_dissector(eth_withoutfcs_handle, next_tvb_le_client, pinfo, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
Replace the "ngsniffer_atm" with an "atm" pseudo-header, which isn't just an image of the ATM Sniffer data. This means that Ethereal doesn't have to know any ATM Sniffer-specific details (that's all hidden in Wiretap), and allows us to add to that pseudo-header fields, traffic types, etc. unknown to ATM Sniffers. Have Wiretap map VPI 0/VCI 5 to the signalling AAL - for some capture files, this might not be necessary, as they may mark all signalling traffic as such, but, on other platforms, we don't know the AAL, so we assume AAL5 except for 0/5 traffic. Doing it in Wiretap lets us hide those details from Ethereal (and lets Ethereal interpret 0/5 traffic as non-signalling traffic, in case that happens to be what it is). We may know that traffic is LANE, but not whether it's LE Control or emulated 802.3/802.5; handle that case. svn path=/trunk/; revision=5302
2002-04-30 08:48:27 +00:00
case TRAF_ST_LANE_802_5:
case TRAF_ST_LANE_802_5_MC:
Don't guard col_set_str (COL_INFO) with col_check svn path=/trunk/; revision=29342
2009-08-09 07:01:26 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "LE Client - 802.5");
Put the LANE packet type in the Info column for ATM LANE traffic. Get rid of an unused variable. svn path=/trunk/; revision=5054
2002-03-31 21:23:47 +00:00
dissect_le_client(tvb, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/* Dissect as Token-Ring */
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
next_tvb_le_client = tvb_new_subset_remaining(tvb, 2);
Always call the Ethernet and Token Ring dissectors through a dissector handle, and make them static. svn path=/trunk/; revision=2925
2001-01-21 20:16:01 +00:00
call_dissector(tr_handle, next_tvb_le_client, pinfo, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
default:
/* Dump it as raw data. */
Don't guard col_set_str (COL_INFO) with col_check svn path=/trunk/; revision=29342
2009-08-09 07:01:26 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "Unknown LANE traffic type");
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
next_tvb = tvb_new_subset_remaining(tvb, 0);
Create call_data_dissector() to call data dissector. This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 00:33:14 +00:00
call_data_dissector(next_tvb, pinfo, tree);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
break;
}
create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-15 13:00:10 +00:00
return tvb_captured_length(tvb);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-15 13:00:10 +00:00
static int
dissect_ilmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
Call the LANE dissector through a handle. Create an ILMI dissector and call it through a handle. Update Gerald's e-mail address. svn path=/trunk/; revision=3465
2001-05-27 07:46:57 +00:00
{
create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-15 13:00:10 +00:00
return dissect_snmp_pdu(tvb, 0, pinfo, tree, proto_ilmi, ett_ilmi, FALSE);
Call the LANE dissector through a handle. Create an ILMI dissector and call it through a handle. Update Gerald's e-mail address. svn path=/trunk/; revision=3465
2001-05-27 07:46:57 +00:00
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
/* AAL types */
static const value_string aal_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ AAL_UNKNOWN, "Unknown AAL" },
{ AAL_1, "AAL1" },
{ AAL_2, "AAL2" },
{ AAL_3_4, "AAL3/4" },
{ AAL_5, "AAL5" },
{ AAL_USER, "User AAL" },
{ AAL_SIGNALLING, "Signalling AAL" },
{ AAL_OAMCELL, "OAM cell" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* AAL5 higher-level traffic types */
static const value_string aal5_hltype_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ TRAF_UNKNOWN, "Unknown traffic type" },
{ TRAF_LLCMX, "LLC multiplexed" },
{ TRAF_VCMX, "VC multiplexed" },
{ TRAF_LANE, "LANE" },
{ TRAF_ILMI, "ILMI" },
{ TRAF_FR, "Frame Relay" },
{ TRAF_SPANS, "FORE SPANS" },
{ TRAF_IPSILON, "Ipsilon" },
From Tobias Witek: This patch extends the ATM parser so as to allow GPRS NS traffic encapsulated in ATM AAL5. Additionally, added support for this into the 'Meta' dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6447 svn path=/trunk/; revision=39394
2011-10-12 18:57:50 +00:00
{ TRAF_GPRS_NS, "GPRS NS" },
From Tobias Witek: Allow dissectors to indicate that an ATM AAL5 frame contains SSCOP. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6717 svn path=/trunk/; revision=40750
2012-01-28 16:34:22 +00:00
{ TRAF_SSCOP, "SSCOP" },
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* Traffic subtypes for VC multiplexed traffic */
static const value_string vcmx_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ TRAF_ST_UNKNOWN, "Unknown VC multiplexed traffic type" },
{ TRAF_ST_VCMX_802_3_FCS, "802.3 FCS" },
{ TRAF_ST_VCMX_802_4_FCS, "802.4 FCS" },
{ TRAF_ST_VCMX_802_5_FCS, "802.5 FCS" },
{ TRAF_ST_VCMX_FDDI_FCS, "FDDI FCS" },
{ TRAF_ST_VCMX_802_6_FCS, "802.6 FCS" },
{ TRAF_ST_VCMX_802_3, "802.3" },
{ TRAF_ST_VCMX_802_4, "802.4" },
{ TRAF_ST_VCMX_802_5, "802.5" },
{ TRAF_ST_VCMX_FDDI, "FDDI" },
{ TRAF_ST_VCMX_802_6, "802.6" },
{ TRAF_ST_VCMX_FRAGMENTS, "Fragments" },
{ TRAF_ST_VCMX_BPDU, "BPDU" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* Traffic subtypes for LANE traffic */
static const value_string lane_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ TRAF_ST_UNKNOWN, "Unknown LANE traffic type" },
{ TRAF_ST_LANE_LE_CTRL, "LE Control" },
{ TRAF_ST_LANE_802_3, "802.3" },
{ TRAF_ST_LANE_802_5, "802.5" },
{ TRAF_ST_LANE_802_3_MC, "802.3 multicast" },
{ TRAF_ST_LANE_802_5_MC, "802.5 multicast" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
/* Traffic subtypes for Ipsilon traffic */
static const value_string ipsilon_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ TRAF_ST_UNKNOWN, "Unknown Ipsilon traffic type" },
{ TRAF_ST_IPSILON_FT0, "Flow type 0" },
{ TRAF_ST_IPSILON_FT1, "Flow type 1" },
{ TRAF_ST_IPSILON_FT2, "Flow type 2" },
{ 0, NULL }
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
};
Create capture dissector tables. They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 21:54:16 +00:00
static gboolean
Fix some warnings/errors of type git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used [-Werror,-Wused-but-marked-unused] proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown")); ^ Added manual change id because file-jpeg.c forced the use of commit -n Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb Fix warnings/errors of type: git/epan/dissectors/packet-ax25-kiss.c:205:52: error: 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused] return capture_ax25( pd, l_offset, len, cpinfo, pseudo_header ); Fix checkhf warnings: Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_netswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_subswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_poll_reply_trailer Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_rdm_universe Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_tod_data_universe Change-Id: Id1fa12afb97a8e9cd4ed0ea25351c3b2639c930e Reviewed-on: https://code.wireshark.org/review/14667 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28 11:37:24 +00:00
capture_atm(const guchar *pd, int offset,
Create capture dissector "info" structure (capture_packet_info_t) While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added. Change-Id: I003552c58043c7c2d67aec458187b12b233057e2 Reviewed-on: https://code.wireshark.org/review/12690 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-15 00:25:31 +00:00
int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
{
if (pseudo_header->atm.aal == AAL_5) {
Create capture dissector "info" structure (capture_packet_info_t) While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added. Change-Id: I003552c58043c7c2d67aec458187b12b233057e2 Reviewed-on: https://code.wireshark.org/review/12690 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-15 00:25:31 +00:00
return try_capture_dissector("atm.aal5.type", pseudo_header->atm.type, pd, offset, len, cpinfo, pseudo_header);
Create capture dissector tables. They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 21:54:16 +00:00
}
return FALSE;
Add a Wiretap routine to process packets captured via libpcap, possibly extracting a pseudo-header, for the use of SunATM captures. Add support for SunATM capture. svn path=/trunk/; revision=5652
2002-06-07 21:11:24 +00:00
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
static void
dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_item *atm_ti, proto_tree *atm_tree, gboolean truncated,
struct atm_phdr *atm_info, gboolean pseudowire_mode)
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
{
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
guint length, reported_length;
guint16 aal5_length;
int pad_length;
tvbuff_t *next_tvb;
guint32 crc;
guint32 calc_crc;
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
gboolean decoded;
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
/*
* This is reassembled traffic, so the cell headers are missing;
Put the traffic type right after the AAL. Dump unknown AAL purportedly-reassembled data as raw data. svn path=/trunk/; revision=6895
2003-01-10 09:46:19 +00:00
* show the traffic type for AAL5 traffic, and the VPI and VCI,
* from the pseudo-header.
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
*/
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (atm_info->aal == AAL_5) {
proto_tree_add_uint(atm_tree, hf_atm_traffic_type, tvb, 0, 0, atm_info->type);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
switch (atm_info->type) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
case TRAF_VCMX:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_traffic_vcmx, tvb, 0, 0, atm_info->subtype);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case TRAF_LANE:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_traffic_lane, tvb, 0, 0, atm_info->subtype);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case TRAF_IPSILON:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_traffic_ipsilon, tvb, 0, 0, atm_info->subtype);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
}
}
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
if (!pseudowire_mode) {
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_vpi, tvb, 0, 0, atm_info->vpi);
proto_tree_add_uint(atm_tree, hf_atm_vci, tvb, 0, 0, atm_info->vci);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
/* Also show vpi/vci in info column */
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, " VPI=%u, VCI=%u",
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->vpi, atm_info->vci);
From Martin Mathieson: - Also show vpi/vci in info column svn path=/trunk/; revision=17859
2006-04-13 22:30:20 +00:00
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
next_tvb = tvb;
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (truncated || atm_info->flags & ATM_REASSEMBLY_ERROR) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
/*
* The packet data does not include stuff such as the AAL5
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
* trailer, either because it was explicitly left out or because
* reassembly failed.
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
*/
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (atm_info->cells != 0) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
/*
* If the cell count is 0, assume it means we don't know how
* many cells it was.
*
* XXX - also assume it means we don't know what was in the AAL5
* trailer. We may, however, find some capture program that can
* give us the AAL5 trailer information but not the cell count,
* in which case we need some other way of indicating whether we
* have the AAL5 trailer information.
*/
if (tree) {
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_cells, tvb, 0, 0, atm_info->cells);
proto_tree_add_uint(atm_tree, hf_atm_aal5_uu, tvb, 0, 0, atm_info->aal5t_u2u >> 8);
proto_tree_add_uint(atm_tree, hf_atm_aal5_cpi, tvb, 0, 0, atm_info->aal5t_u2u & 0xFF);
proto_tree_add_uint(atm_tree, hf_atm_aal5_len, tvb, 0, 0, atm_info->aal5t_len);
proto_tree_add_uint(atm_tree, hf_atm_aal5_crc, tvb, 0, 0, atm_info->aal5t_chksum);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
}
} else {
/*
* The packet data includes stuff such as the AAL5 trailer, if
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
* it wasn't cut off by the snapshot length, and ATM reassembly
* succeeded.
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
* Decode the trailer, if present, and then chop it off.
*/
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
length = tvb_captured_length(tvb);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
reported_length = tvb_reported_length(tvb);
if ((reported_length % 48) == 0) {
/*
* Reported length is a multiple of 48, so we can presumably
* divide it by 48 to get the number of cells.
*/
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_uint(atm_tree, hf_atm_cells, tvb, 0, 0, reported_length/48);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if ((atm_info->aal == AAL_5 || atm_info->aal == AAL_SIGNALLING) &&
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
length >= reported_length) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
/*
* XXX - what if the packet is truncated? Can that happen?
* What if you capture with Windows Sniffer on an ATM link
* and tell it not to save the entire packet? What happens
* to the trailer?
*/
aal5_length = tvb_get_ntohs(tvb, length - 6);
There might well be more than 40 bytes of padding in an AAL5 frame - it doesn't always appear to be the case that the minimum number of cells is used for an AAL5 packet. Instead, do the sanity check on the AAL5 length field - require it to be non-zero and to be less than or equal to the amount of space left over in the packet after the trailer is removed. svn path=/trunk/; revision=7275
2003-03-04 08:20:36 +00:00
Attempt to better handle bogus AAL5 lengths (by assuming that the packet doesn't have padding and the AAL5 trailer). svn path=/trunk/; revision=7269
2003-03-04 03:08:42 +00:00
/*
There might well be more than 40 bytes of padding in an AAL5 frame - it doesn't always appear to be the case that the minimum number of cells is used for an AAL5 packet. Instead, do the sanity check on the AAL5 length field - require it to be non-zero and to be less than or equal to the amount of space left over in the packet after the trailer is removed. svn path=/trunk/; revision=7275
2003-03-04 08:20:36 +00:00
* Check for sanity in the AAL5 length. It must be > 0
* and must be less than the amount of space left after
* we remove the trailer.
*
Add another sanity check - there shouldn't be more than 47 bytes of padding before the AAL5 trailer. svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
* If it's not sane, assume we don't have a trailer.
Attempt to better handle bogus AAL5 lengths (by assuming that the packet doesn't have padding and the AAL5 trailer). svn path=/trunk/; revision=7269
2003-03-04 03:08:42 +00:00
*/
There might well be more than 40 bytes of padding in an AAL5 frame - it doesn't always appear to be the case that the minimum number of cells is used for an AAL5 packet. Instead, do the sanity check on the AAL5 length field - require it to be non-zero and to be less than or equal to the amount of space left over in the packet after the trailer is removed. svn path=/trunk/; revision=7275
2003-03-04 08:20:36 +00:00
if (aal5_length > 0 && aal5_length <= length - 8) {
Add another sanity check - there shouldn't be more than 47 bytes of padding before the AAL5 trailer. svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
/*
* How much padding is there?
*/
pad_length = length - aal5_length - 8;
/*
* There is no reason for more than 47 bytes of padding.
* The most padding you can have would be 7 bytes at the
* end of the next-to-last cell (8 bytes after the end of
* the data means you can fit the trailer in that cell),
* plus 40 bytes in the last cell (with the last 8 bytes
* being padding).
*
* If there's more than 47 bytes of padding, assume we don't
* have a trailer.
*/
if (pad_length <= 47) {
if (tree) {
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_item *ti;
Add another sanity check - there shouldn't be more than 47 bytes of padding before the AAL5 trailer. svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
if (pad_length > 0) {
Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-31 16:39:40 +00:00
proto_tree_add_item(atm_tree, hf_atm_padding, tvb, aal5_length, pad_length, ENC_NA);
Add another sanity check - there shouldn't be more than 47 bytes of padding before the AAL5 trailer. svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
}
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(atm_tree, hf_atm_aal5_uu, tvb, length - 8, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(atm_tree, hf_atm_aal5_cpi, tvb, length - 7, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(atm_tree, hf_atm_aal5_len, tvb, length - 6, 2, ENC_BIG_ENDIAN);
Add another sanity check - there shouldn't be more than 47 bytes of padding before the AAL5 trailer. svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
crc = tvb_get_ntohl(tvb, length - 4);
The "MPEG-2" CRC-32 is also the ATM CRC-32. Use it in the ATM dissector, and use a tvbuff version, so that we don't do tvb_get_ptr() ourselves. Change-Id: I0bd3594bc739e0cca447ac06f34a471441cf2e70 Reviewed-on: https://code.wireshark.org/review/3513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-08 19:51:32 +00:00
calc_crc = crc32_mpeg2_tvb(tvb, length);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
ti = proto_tree_add_uint(atm_tree, hf_atm_aal5_crc, tvb, length - 4, 4, crc);
Fix display of "(correct)"/"(incorrect)" indication for the CRC. svn path=/trunk/; revision=50058
2013-06-19 21:07:22 +00:00
proto_item_append_text(ti, (calc_crc == 0xC704DD7B) ? " (correct)" : " (incorrect)");
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
}
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, 0, aal5_length);
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
}
}
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
/*
* First check whether custom dissection table
* was set up to dissect this VPI+VCI combination
*/
No need to check whether atm_info is null in that code path. All exported (via dissector tables and dissector handles) routines that call dissect_atm_common() first do DISSECTOR_ASSERT(atm_info != NULL), so dissect_atm_common() will never be called iwth a null data pointer. dissect_reassembled_pdu() is called only from dissect_atm_common(), so it also won't ever be called with a non-null data pointer. Fixes Coverity CID 1442299. Change-Id: I3b455ac546a6a0cd6aa8ef184c71fda2ca2a0710 Reviewed-on: https://code.wireshark.org/review/31418 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:05:54 +00:00
if (dissector_try_uint_new(atm_reassembled_vpi_vci_table,
((atm_info->vpi) << 16) | atm_info->vci,
next_tvb, pinfo, tree, TRUE, atm_info))
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
{
return;
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
decoded = FALSE;
/*
* Don't try to dissect the payload of PDUs with a reassembly
* error.
*/
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
switch (atm_info->aal) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
case AAL_SIGNALLING:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (!(atm_info->flags & ATM_REASSEMBLY_ERROR)) {
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
call_dissector(sscop_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case AAL_5:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (!(atm_info->flags & ATM_REASSEMBLY_ERROR)) {
if (dissector_try_uint_new(atm_type_aal5_table, atm_info->type, next_tvb, pinfo, tree, TRUE, atm_info))
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
{
Clean up indentation. Change-Id: I140a6c7ac2f9380335ce9756824319b4d4a5b323 Reviewed-on: https://code.wireshark.org/review/13272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:37:18 +00:00
decoded = TRUE;
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
}
else
{
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
if (tvb_reported_length(next_tvb) > 7) /* sizeof(octet) */
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
{
Fix inconsistent indentation. Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42 Reviewed-on: https://code.wireshark.org/review/8285 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03 22:15:30 +00:00
guint8 octet[8];
tvb_memcpy(next_tvb, octet, 0, sizeof(octet));
if (octet[0] == 0xaa
&& octet[1] == 0xaa
&& octet[2] == 0x03) /* LLC SNAP as per RFC2684 */
{
call_dissector(llc_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if ((pntoh16(octet) & 0xff) == PPP_IP)
{
call_dissector(ppp_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (pntoh16(octet) == 0x00)
{
Expand a comment. Change-Id: I9d749c43727291768a36adc0c1956f73a5374f91 Reviewed-on: https://code.wireshark.org/review/13283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 07:51:41 +00:00
/*
* Assume VC multiplexed bridged Ethernet.
* Whether there's an FCS is an option negotiated
* over the VC, so we call the "do heuristic checks
* to see if there's an FCS" version of the Ethernet
* dissector.
*
* See RFC 2684 section 6.2 "VC Multiplexing of Bridged
* Protocols".
*/
Fix inconsistent indentation. Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42 Reviewed-on: https://code.wireshark.org/review/8285 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03 22:15:30 +00:00
proto_tree_add_item(tree, hf_atm_padding, tvb, 0, 2, ENC_NA);
next_tvb = tvb_new_subset_remaining(tvb, 2);
Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors. Have a dissector that is passed a "struct eth_phdr" pointer, indicating whether there is an FCS, there is no FCS, or there's maybe an FCS, and an "eth_maybefcs" dissector, to be called from other dissectors. The latter takes no data argument. That obviates the need for callers of the latter to fill in an "eth_phdr" structure. Note in a comment that setting the "assume an FCS" preference overrides a file format handler in Wiretap saying "we have no FCS". I seem to remember that this might be intentional. Ping-Bug: 9933 Change-Id: I600e1351d468ab31d48369edb96832d6da3e480c Reviewed-on: https://code.wireshark.org/review/13432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-20 09:46:34 +00:00
call_dissector(eth_maybefcs_handle, next_tvb, pinfo, tree);
Fix inconsistent indentation. Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42 Reviewed-on: https://code.wireshark.org/review/8285 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03 22:15:30 +00:00
decoded = TRUE;
}
else if (octet[2] == 0x03 && /* NLPID */
((octet[3] == 0xcc || /* IPv4 */
octet[3] == 0x8e) || /* IPv6 */
(octet[3] == 0x00 && /* Eth */
octet[4] == 0x80))) /* Eth */
{
/* assume network interworking with FR 2 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (octet[4] == 0x03 && /* NLPID */
((octet[5] == 0xcc || /* IPv4 */
octet[5] == 0x8e) || /* IPv6 */
(octet[5] == 0x00 && /* Eth */
octet[6] == 0x80))) /* Eth */
{
/* assume network interworking with FR 4 byte header */
call_dissector(fr_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
else if (((octet[0] & 0xf0)== 0x40) ||
((octet[0] & 0xf0) == 0x60))
{
call_dissector(ip_handle, next_tvb, pinfo, tree);
decoded = TRUE;
}
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
}
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
}
From Kip McAtee: Added eth, PPP, and IP decodes to the ATM dissector. svn path=/trunk/; revision=25743
2008-07-15 05:46:37 +00:00
break;
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
break;
Put the traffic type right after the AAL. Dump unknown AAL purportedly-reassembled data as raw data. svn path=/trunk/; revision=6895
2003-01-10 09:46:19 +00:00
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
case AAL_2:
From Stephen Donnelly: AAL2 preference. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465 svn path=/trunk/; revision=31813
2010-02-07 13:37:51 +00:00
proto_tree_add_uint(atm_tree, hf_atm_cid, tvb, 0, 0,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->aal2_cid);
From Stephen Donnelly: AAL2 preference. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465 svn path=/trunk/; revision=31813
2010-02-07 13:37:51 +00:00
proto_item_append_text(atm_ti, " (vpi=%u vci=%u cid=%u)",
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->vpi,
atm_info->vci,
atm_info->aal2_cid);
From Stephen Donnelly: AAL2 preference. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465 svn path=/trunk/; revision=31813
2010-02-07 13:37:51 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (!(atm_info->flags & ATM_REASSEMBLY_ERROR)) {
if (atm_info->flags & ATM_AAL2_NOPHDR) {
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
next_tvb = tvb;
} else {
/* Skip first 4 bytes of message
- side
- length
- UUI
Ignoring for now... */
next_tvb = tvb_new_subset_remaining(tvb, 4);
}
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (dissector_try_uint(atm_type_aal2_table, atm_info->type, next_tvb, pinfo, tree))
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
{
Clean up indentation. Change-Id: I140a6c7ac2f9380335ce9756824319b4d4a5b323 Reviewed-on: https://code.wireshark.org/review/13272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:37:18 +00:00
decoded = TRUE;
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
}
Partial implementation of UMTS FP. Currently only works with Catapult DCT2000 format files, as need extra information about packet when decoding. There are a few TODOs (notably E-DCH channels), but the current version gives OK coverage. svn path=/trunk/; revision=19130
2006-09-04 11:04:14 +00:00
}
break;
Put the traffic type right after the AAL. Dump unknown AAL purportedly-reassembled data as raw data. svn path=/trunk/; revision=6895
2003-01-10 09:46:19 +00:00
default:
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
/* Dump it as raw data. */
Put the traffic type right after the AAL. Dump unknown AAL purportedly-reassembled data as raw data. svn path=/trunk/; revision=6895
2003-01-10 09:46:19 +00:00
break;
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
if (!decoded) {
Clean up indentation. Change-Id: I140a6c7ac2f9380335ce9756824319b4d4a5b323 Reviewed-on: https://code.wireshark.org/review/13272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:37:18 +00:00
/* Dump it as raw data. */
Create call_data_dissector() to call data dissector. This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 00:33:14 +00:00
call_data_dissector(next_tvb, pinfo, tree);
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
}
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
}
Check the HEC in ATM cells. svn path=/trunk/; revision=6883
2003-01-09 03:45:34 +00:00
/*
* Charles Michael Heard's HEC code, from
*
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
* http://www.cell-relay.com/cell-relay/publications/software/CRC/32bitCRC.tutorial.html
Check the HEC in ATM cells. svn path=/trunk/; revision=6883
2003-01-09 03:45:34 +00:00
*
* with the syndrome and error position tables initialized with values
* computed by his "gen_syndrome_table()" and "gen_err_posn_table()" routines,
* rather than by calling those routines at run time, and with various data
* type cleanups and changes not to correct the header if a correctible
* error was detected.
*/
#define COSET_LEADER 0x055 /* x^6 + x^4 + x^2 + 1 */
static const guint8 syndrome_table[256] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15,
0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d,
0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65,
0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d,
0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5,
0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd,
0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85,
0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd,
0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2,
0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea,
0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2,
0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a,
0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32,
0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a,
0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42,
0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a,
0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c,
0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4,
0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec,
0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4,
0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c,
0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44,
0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c,
0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34,
0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b,
0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63,
0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b,
0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13,
0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb,
0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83,
0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb,
0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3,
Check the HEC in ATM cells. svn path=/trunk/; revision=6883
2003-01-09 03:45:34 +00:00
};
#define NO_ERROR_DETECTED -128
#define UNCORRECTIBLE_ERROR 128
static const int err_posn_table[256] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
NO_ERROR_DETECTED, 39,
38, UNCORRECTIBLE_ERROR,
37, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 31,
36, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 8,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
30, UNCORRECTIBLE_ERROR,
35, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 23,
7, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
29, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
34, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
22, UNCORRECTIBLE_ERROR,
6, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 0,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
28, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
33, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 10,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 12,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
21, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 19,
5, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 17,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 3,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 15,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
27, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
32, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
9, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 24,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 1,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
11, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
20, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 13,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
18, UNCORRECTIBLE_ERROR,
4, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
16, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, 25,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
2, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
14, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
26, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
UNCORRECTIBLE_ERROR, UNCORRECTIBLE_ERROR,
Check the HEC in ATM cells. svn path=/trunk/; revision=6883
2003-01-09 03:45:34 +00:00
};
/*
* Return an indication of whether there was an error in the cell header
* and, if so, where the error was, if it was correctable.
*/
static int
get_header_err(const guint8 *cell_header)
{
register guint8 syndrome;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
register int i, err_posn;
Check the HEC in ATM cells. svn path=/trunk/; revision=6883
2003-01-09 03:45:34 +00:00
syndrome = 0;
for (i = 0; i < 4; i++)
syndrome = syndrome_table[syndrome ^ cell_header[i]];
syndrome ^= cell_header[4] ^ COSET_LEADER;
err_posn = err_posn_table [syndrome];
if (err_posn < 0)
return NO_ERROR_DETECTED;
else if (err_posn < 40)
return err_posn;
else
return UNCORRECTIBLE_ERROR;
}
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
const value_string atm_pt_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, "User data cell, congestion not experienced, SDU-type = 0" },
{ 1, "User data cell, congestion not experienced, SDU-type = 1" },
{ 2, "User data cell, congestion experienced, SDU-type = 0" },
{ 3, "User data cell, congestion experienced, SDU-type = 1" },
{ 4, "Segment OAM F5 flow related cell" },
{ 5, "End-to-end OAM F5 flow related cell" },
{ 6, "VC resource management cell" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
static const value_string st_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 2, "BOM" },
{ 0, "COM" },
{ 1, "EOM" },
{ 3, "SSM" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
#define OAM_TYPE_FM 1 /* Fault Management */
#define OAM_TYPE_PM 2 /* Performance Management */
#define OAM_TYPE_AD 8 /* Activation/Deactivation */
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
static const value_string oam_type_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ OAM_TYPE_FM, "Fault Management" },
{ OAM_TYPE_PM, "Performance Management" },
{ OAM_TYPE_AD, "Activation/Deactivation" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
static const value_string ft_fm_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, "Alarm Indication Signal" },
{ 1, "Far End Receive Failure" },
{ 8, "OAM Cell Loopback" },
{ 4, "Continuity Check" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
static const value_string ft_pm_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, "Forward Monitoring" },
{ 1, "Backward Reporting" },
{ 2, "Monitoring and Reporting" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
static const value_string ft_ad_vals[] = {
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ 0, "Performance Monitoring" },
{ 1, "Continuity Check" },
{ 0, NULL }
Dissect non-AAL5 packets as single cells. Dissect the U2U data as UU and CPI. svn path=/trunk/; revision=6876
2003-01-08 08:37:10 +00:00
};
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
Wrap the dissect_fddi() call (with a 4th argument) with dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which use the standard 3-argument tvbuffified-dissector argument list. Add a dissector table called "wtap_encap" which is used to call dissectors from dissect_frame(). The switch() statement from this top-level dissector is removed. The link-layer dissectors register themselves with the "wtap_encap" dissector table. The dissectors are now static where possible. svn path=/trunk/; revision=2708
2000-11-29 05:16:15 +00:00
static void
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
dissect_atm_cell_payload(tvbuff_t *tvb, int offset, packet_info *pinfo,
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
proto_tree *tree, guint aal, gboolean fill_columns,
struct atm_phdr *atm_info)
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
{
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
proto_tree *aal_tree;
proto_item *ti;
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
guint8 octet;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
gint length;
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
guint16 aal3_4_hdr, crc10;
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
tvbuff_t *next_tvb;
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
/*
* First check whether custom dissection table
* was set up to dissect this VPI+VCI combination
*/
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer. The only place where it's currently called passes it data. Do a DISSECTOR_ASSERT() check to make sure it's non-null. Remove null-pointer checks that this renders no longer necessary. Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb Reviewed-on: https://code.wireshark.org/review/31419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:42:56 +00:00
if (dissector_try_uint_new(atm_cell_payload_vpi_vci_table,
((atm_info->vpi) << 16) | atm_info->vci,
next_tvb, pinfo, tree, TRUE, atm_info))
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
{
return;
}
If the VCI and payload type indicate that a cell is an OAM cell, dissect it as such. Clear the Info column when dissecting cells for an AAL we handle before dissecting the cell, and set the Info column for OAM cells. svn path=/trunk/; revision=13222
2005-02-01 05:19:53 +00:00
switch (aal) {
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
case AAL_1:
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1");
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
aal_tree = proto_item_add_subtree(ti, ett_aal1);
octet = tvb_get_guint8(tvb, offset);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aa1_csi, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(aal_tree, hf_atm_aa1_seq_count, tvb, offset, 1, ENC_BIG_ENDIAN);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "Sequence count = %u",
(octet >> 4) & 0x7);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aa1_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(aal_tree, hf_atm_aa1_parity, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
offset++;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aa1_payload, tvb, offset, 47, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case AAL_3_4:
/*
* XXX - or should this be the CS PDU?
*/
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4");
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
aal_tree = proto_item_add_subtree(ti, ett_aal3_4);
aal3_4_hdr = tvb_get_ntohs(tvb, offset);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "%s, sequence number = %u",
val_to_str(aal3_4_hdr >> 14, st_vals, "Unknown (%u)"),
(aal3_4_hdr >> 10) & 0xF);
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal3_4_seg_type, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(aal_tree, hf_atm_aal3_4_seq_num, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(aal_tree, hf_atm_aal3_4_multiplex_id, tvb, offset, 2, ENC_BIG_ENDIAN);
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
length = tvb_reported_length_remaining(tvb, offset);
Clean up the CRC-10 code. Have the wsutil routine just accumulate the stuff from the buffer handed to us. Have the IUUP dissector deal with the extra stuff. Add a update_crc10_by_bytes_tvb() routine, which is passed a tvbuff, offset, and length, and use that rather than using tvb_get_ptr() in dissectors. Change-Id: Iadd0823c764080e60d1339abb94d2e19150eabfe Reviewed-on: https://code.wireshark.org/review/3509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-08 18:08:35 +00:00
crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
offset += 2;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal3_4_information, tvb, offset, 44, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
offset += 44;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal3_4_length_indicator, tvb, offset, 2, ENC_BIG_ENDIAN);
ti = proto_tree_add_item(aal_tree, hf_atm_aal3_4_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix display of "(correct)"/"(incorrect)" indication for the CRC. svn path=/trunk/; revision=50058
2013-06-19 21:07:22 +00:00
proto_item_append_text(ti, " (%s)", (crc10 == 0) ? " (correct)" : " (incorrect)");
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case AAL_OAMCELL:
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (fill_columns)
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
{
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL");
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
}
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
ti = proto_tree_add_item(tree, proto_oamaal, tvb, offset, -1, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
aal_tree = proto_item_add_subtree(ti, ett_oamaal);
octet = tvb_get_guint8(tvb, offset);
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (fill_columns)
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
{
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
val_to_str(octet >> 4, oam_type_vals, "Unknown (%u)"));
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
}
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
switch (octet >> 4) {
case OAM_TYPE_FM:
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_fm, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case OAM_TYPE_PM:
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_pm, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
case OAM_TYPE_AD:
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_ad, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
default:
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_ft, tvb, offset, 1, ENC_BIG_ENDIAN);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
}
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
length = tvb_reported_length_remaining(tvb, offset);
Clean up the CRC-10 code. Have the wsutil routine just accumulate the stuff from the buffer handed to us. Have the IUUP dissector deal with the extra stuff. Add a update_crc10_by_bytes_tvb() routine, which is passed a tvbuff, offset, and length, and use that rather than using tvb_get_ptr() in dissectors. Change-Id: Iadd0823c764080e60d1339abb94d2e19150eabfe Reviewed-on: https://code.wireshark.org/review/3509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-08 18:08:35 +00:00
crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
offset += 1;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_func_spec, tvb, offset, 45, ENC_NA);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
offset += 45;
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
ti = proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
Fix display of "(correct)"/"(incorrect)" indication for the CRC. svn path=/trunk/; revision=50058
2013-06-19 21:07:22 +00:00
proto_item_append_text(ti, " (%s)", (crc10 == 0) ? " (correct)" : " (incorrect)");
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
default:
Switch a bunch of dissectors over to using tvb_new_subset_remaining() svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
next_tvb = tvb_new_subset_remaining(tvb, offset);
Create call_data_dissector() to call data dissector. This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 00:33:14 +00:00
call_data_dissector(next_tvb, pinfo, tree);
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
break;
}
}
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
/*
* Check for OAM cells.
* OAM F4 is VCI 3 or 4 and PT 0X0.
* OAM F5 is PT 10X.
*/
gboolean
atm_is_oam_cell(const guint16 vci, const guint8 pt)
{
return (((vci == 3 || vci == 4) && ((pt & 0x5) == 0))
|| ((pt & 0x6) == 0x4));
}
static void
dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree *atm_tree, guint aal, gboolean nni,
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
gboolean crc_stripped, const struct atm_phdr *atm_info)
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
{
int offset;
proto_item *ti;
guint8 octet, pt;
int err;
guint16 vpi, vci;
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
struct atm_phdr atm_info_local;
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
if (!nni) {
/*
* FF: ITU-T I.361 (Section 2.2) defines the cell header format
* and encoding at UNI reference point as:
*
* 8 7 6 5 4 3 2 1
* +-+-+-+-+-+-+-+-+
* | GFC | VPI |
* +-+-+-+-+-+-+-+-+
* | VPI | VCI |
* +-+-+-+-+-+-+-+-+
* | VCI |
* +-+-+-+-+-+-+-+-+
* | VCI | PT |C|
* +-+-+-+-+-+-+-+-+
* | HEC (CRC) |
* +-+-+-+-+-+-+-+-+
*/
octet = tvb_get_guint8(tvb, 0);
proto_tree_add_item(atm_tree, hf_atm_gfc, tvb, 0, 1, ENC_NA);
vpi = (octet & 0xF) << 4;
octet = tvb_get_guint8(tvb, 1);
vpi |= octet >> 4;
proto_tree_add_uint(atm_tree, hf_atm_vpi, tvb, 0, 2, vpi);
} else {
/*
* FF: ITU-T I.361 (Section 2.3) defines the cell header format
* and encoding at NNI reference point as:
*
* 8 7 6 5 4 3 2 1
* +-+-+-+-+-+-+-+-+
* | VPI |
* +-+-+-+-+-+-+-+-+
* | VPI | VCI |
* +-+-+-+-+-+-+-+-+
* | VCI |
* +-+-+-+-+-+-+-+-+
* | VCI | PT |C|
* +-+-+-+-+-+-+-+-+
* | HEC (CRC) |
* +-+-+-+-+-+-+-+-+
*/
octet = tvb_get_guint8(tvb, 0);
vpi = octet << 4;
octet = tvb_get_guint8(tvb, 1);
vpi |= (octet & 0xF0) >> 4;
proto_tree_add_uint(atm_tree, hf_atm_vpi, tvb, 0, 2, vpi);
}
vci = (octet & 0x0F) << 12;
octet = tvb_get_guint8(tvb, 2);
vci |= octet << 4;
octet = tvb_get_guint8(tvb, 3);
vci |= octet >> 4;
proto_tree_add_uint(atm_tree, hf_atm_vci, tvb, 1, 3, vci);
pt = (octet >> 1) & 0x7;
proto_tree_add_item(atm_tree, hf_atm_payload_type, tvb, 3, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(atm_tree, hf_atm_cell_loss_priority, tvb, 3, 1, ENC_BIG_ENDIAN);
if (!crc_stripped) {
/*
* FF: parse the Header Error Check (HEC).
*/
ti = proto_tree_add_item(atm_tree, hf_atm_header_error_check, tvb, 4, 1, ENC_BIG_ENDIAN);
Replace tvb_get_ptr with tvb_memdup. The number of bytes allocated is small enough not to matter. Change-Id: I44c2103a87bd41f21e61d0f27648266fdc2be557 Reviewed-on: https://code.wireshark.org/review/15470 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-17 02:17:33 +00:00
err = get_header_err((const guint8*)tvb_memdup(wmem_packet_scope(), tvb, 0, 5));
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
if (err == NO_ERROR_DETECTED)
proto_item_append_text(ti, " (correct)");
else if (err == UNCORRECTIBLE_ERROR)
proto_item_append_text(ti, " (uncorrectable error)");
else
proto_item_append_text(ti, " (error in bit %d)", err);
offset = 5;
} else {
/*
* FF: in some encapsulation modes (e.g. RFC 4717, ATM N-to-One
* Cell Mode) the Header Error Check (HEC) field is stripped.
* So we do nothing here.
*/
offset = 4;
}
/*
* Check for OAM cells.
* XXX - do this for all AAL values, overriding whatever information
* Wiretap got from the file?
*/
if (aal == AAL_USER || aal == AAL_UNKNOWN) {
if (atm_is_oam_cell(vci,pt)) {
aal = AAL_OAMCELL;
}
}
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
memset(&atm_info_local, 0, sizeof(atm_info_local));
if (atm_info) {
atm_info_local.flags = atm_info->flags;
atm_info_local.aal = atm_info->aal;
atm_info_local.type = atm_info->type;
atm_info_local.subtype = atm_info->subtype;
atm_info_local.vpi = atm_info->vpi;
atm_info_local.vci = atm_info->vci;
atm_info_local.aal2_cid = atm_info->aal2_cid;
atm_info_local.channel = atm_info->channel;
atm_info_local.cells = atm_info->cells;
atm_info_local.aal5t_u2u = atm_info->aal5t_u2u;
atm_info_local.aal5t_len = atm_info->aal5t_len;
atm_info_local.aal5t_chksum = atm_info->aal5t_chksum;
} else {
atm_info_local.aal = aal;
atm_info_local.type = pt;
atm_info_local.vpi = vpi;
atm_info_local.vci = vci;
}
dissect_atm_cell_payload(tvb, offset, pinfo, tree, aal, TRUE, &atm_info_local);
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
}
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
static int
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
gboolean truncated, struct atm_phdr *atm_info, gboolean pseudowire_mode)
Make the AAL for a packet a filterable field. Put the code to handle AAL5 and Signalling AAL traffic, and to handle raw cells, into routines of their own. Don't put the VPI/VCI/cell count information from the pseudo-header into the protocol tree for raw cells - just get the VPI/VCI from the raw cell, and leave out the cell count. Set the Protocol and Info column for AAL1 and AAL3/4 cells. Clean up the names of some of the raw cell fields, as displayed. Make the payload type text match what's in various specs. Display the cell loss priority symbolically. Fix up the code that displays the AAL3/4 trailer information to use the AAL3/4 trailer rather than the AAL3/4 header. Show the number of cells if we have reassembled traffic complete with the AAL5 trailer. svn path=/trunk/; revision=6878
2003-01-08 23:07:44 +00:00
{
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
proto_tree *atm_tree = NULL;
proto_item *atm_ti = NULL;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if ( atm_info->aal == AAL_5 && atm_info->type == TRAF_LANE &&
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
dissect_lanesscop ) {
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->aal = AAL_SIGNALLING;
Froim Rene Pilz: This patch consists also the last issues. Additionally it solves: - For the SSCOP frames the AAL5 decoding was not performed due to an earlier patch. This caused that no SSCOP message was properly decoded. - As the detection between a LANE frame and a SSCOP frame is rather hard a switch within the atm dissector is included which enforce SSCOP dissecting over a LANE frame. At the moment I do not see a better solution for that. svn path=/trunk/; revision=20013
2006-11-29 06:44:07 +00:00
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM");
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
if (!pseudowire_mode) {
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
switch (atm_info->channel) {
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
case 0:
/* Traffic from DTE to DCE. */
Don't guard col_set_str (COL_RES_DL_SRC/COL_RES_DL_DST) with col_check svn path=/trunk/; revision=29343
2009-08-09 07:14:16 +00:00
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
break;
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
case 1:
/* Traffic from DCE to DTE. */
Don't guard col_set_str (COL_RES_DL_SRC/COL_RES_DL_DST) with col_check svn path=/trunk/; revision=29343
2009-08-09 07:14:16 +00:00
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
break;
}
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (atm_info->aal == AAL_5) {
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "AAL5 %s",
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
val_to_str(atm_info->type, aal5_hltype_vals,
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
"Unknown traffic type (%u)"));
} else {
col_add_str(pinfo->cinfo, COL_INFO,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
val_to_str(atm_info->aal, aal_vals,
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
"Unknown AAL (%u)"));
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
if (tree) {
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
atm_ti = proto_tree_add_item(tree, proto_atm, tvb, 0, -1, ENC_NA);
Added E-DCH (HSUPA) channels to FP. Also show VPI/VCI/CID in ATM protocol label. svn path=/trunk/; revision=19189
2006-09-11 12:03:29 +00:00
atm_tree = proto_item_add_subtree(atm_ti, ett_atm);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
From Artem Tamazov: Added: PW ATM 1:1, AAL5 SDU, AAL5 PDU support + BFD fix + PW ATM OAM fix svn path=/trunk/; revision=28881
2009-06-29 19:24:14 +00:00
if (!pseudowire_mode) {
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
proto_tree_add_uint(atm_tree, hf_atm_channel, tvb, 0, 0, atm_info->channel);
if (atm_info->flags & ATM_REASSEMBLY_ERROR)
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
expert_add_info(pinfo, atm_ti, &ei_atm_reassembly_failed);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
Use the new "proto_tree_add_*_format_value" routines. svn path=/trunk/; revision=17316
2006-02-16 11:43:38 +00:00
proto_tree_add_uint_format_value(atm_tree, hf_atm_aal, tvb, 0, 0,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->aal,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
"%s",
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
val_to_str(atm_info->aal, aal_vals,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
"Unknown AAL (%u)"));
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (atm_info->flags & ATM_RAW_CELL) {
The Sniffer file formats include a file to identify raw cells; export that flag in the ATM pseudo-header, and use it to determine whether a frame is a raw cell or a reassembled frame, rather than using the AAL, as you can have raw AAL5 cells in a capture. svn path=/trunk/; revision=6889
2003-01-10 04:04:42 +00:00
/* This is a single cell, with the cell header at the beginning. */
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
if (atm_info->flags & ATM_NO_HEC) {
From Stephen Donnelly: Endace ATM and AAL2 enhancements. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4447 svn path=/trunk/; revision=31766
2010-02-02 04:56:39 +00:00
proto_item_set_len(atm_ti, 4);
} else {
proto_item_set_len(atm_ti, 5);
}
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
dissect_atm_cell(tvb, pinfo, tree, atm_tree,
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
atm_info->aal, FALSE,
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
atm_info->flags & ATM_NO_HEC, atm_info);
The Sniffer file formats include a file to identify raw cells; export that flag in the ATM pseudo-header, and use it to determine whether a frame is a raw cell or a reassembled frame, rather than using the AAL, as you can have raw AAL5 cells in a capture. svn path=/trunk/; revision=6889
2003-01-10 04:04:42 +00:00
} else {
/* This is a reassembled PDU. */
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
/*
* ATM dissector is used as "sub-dissector" for ATM pseudowires.
* In such cases, the dissector data parameter is used to pass info from/to
* PW dissector to ATM dissector. For decoding normal ATM traffic
* data parameter should be NULL.
*/
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_reassembled_pdu(tvb, pinfo, tree, atm_tree, atm_ti, truncated,
atm_info, pseudowire_mode);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
return tvb_reported_length(tvb);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
static int
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_atm_truncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
{
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
struct atm_phdr *atm_info = (struct atm_phdr *)data;
Not passing a struct atm_phdr to an ATM dissector is a bug. Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15 21:35:38 +00:00
DISSECTOR_ASSERT(atm_info != NULL);
ATM: do not try to dissect if pseudo header is not present Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15 15:14:12 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
return dissect_atm_common(tvb, pinfo, tree, TRUE, atm_info, FALSE);
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
}
static int
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_atm_pw_truncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
{
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
struct atm_phdr *atm_info = (struct atm_phdr *)data;
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
Not passing a struct atm_phdr to an ATM dissector is a bug. Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15 21:35:38 +00:00
DISSECTOR_ASSERT(atm_info != NULL);
ATM: do not try to dissect if pseudo header is not present Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15 15:14:12 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
return dissect_atm_common(tvb, pinfo, tree, TRUE, atm_info, TRUE);
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
}
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
static int
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_atm_untruncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
{
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
struct atm_phdr *atm_info = (struct atm_phdr *)data;
Not passing a struct atm_phdr to an ATM dissector is a bug. Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15 21:35:38 +00:00
DISSECTOR_ASSERT(atm_info != NULL);
ATM: do not try to dissect if pseudo header is not present Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15 15:14:12 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
return dissect_atm_common(tvb, pinfo, tree, FALSE, atm_info, FALSE);
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
}
static int
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
dissect_atm_pw_untruncated(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
{
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
struct atm_phdr *atm_info = (struct atm_phdr *)data;
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
Not passing a struct atm_phdr to an ATM dissector is a bug. Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15 21:35:38 +00:00
DISSECTOR_ASSERT(atm_info != NULL);
ATM: do not try to dissect if pseudo header is not present Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15 15:14:12 +00:00
Have various ATM dissectors use the data arguments for pseudo-headers. Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14 00:03:26 +00:00
return dissect_atm_common(tvb, pinfo, tree, FALSE, atm_info, TRUE);
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just used for the DOS-based ATM Sniffer. (That's not a great name, but I couldn't think of a better one.) Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture files where reassembled frames don't have trailers, such as the AAL5 trailer, chopped off. That's what at least some versions of the Windows-based ATM Sniffer appear to have. Map the ATM capture file type for NetXRay captures to WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've reverse-engineered, so far, for the pseudo-header; there's more that needs to be done on it, e.g. getting the channel, AAL type, and traffic type (or inferring them if they're not in the packet header). svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
}
Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. svn path=/trunk/; revision=52877
2013-10-26 19:18:12 +00:00
static int
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_tree *atm_tree;
proto_item *atm_ti;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM");
atm_ti = proto_tree_add_item(tree, proto_atm, tvb, 0, 0, ENC_NA);
atm_tree = proto_item_add_subtree(atm_ti, ett_atm);
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
dissect_atm_cell(tvb, pinfo, tree, atm_tree, AAL_OAMCELL, FALSE, FALSE, NULL);
Clean up the ATM dissection a bit. Have separate dissectors for ATM MPLS pseudo-wire traffic and regular traffic. That way, we can handle the regular traffic dissectors being handed private data, e.g. an ATM pseudo-header from libwiretap. Change-Id: I11e5abfdb1c3a5acc070ddaba8ef53813bc85e1a Reviewed-on: https://code.wireshark.org/review/8921 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-14 21:48:14 +00:00
return tvb_reported_length(tvb);
}
static int
dissect_atm_pw_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
Clean up the comments in the L2TP dissector about RFCs. Clean up indentation a bit. Clean up the L2TPv3 dissection a bit. Make an OAM cell dissector, and have the L2TP dissector call it. svn path=/trunk/; revision=27540
2009-02-25 09:26:27 +00:00
{
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
struct pw_atm_phdr *pw_atm_info = (struct pw_atm_phdr *)data;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer. The only place where it's currently called passes it data. Do a DISSECTOR_ASSERT() check to make sure it's non-null. Remove null-pointer checks that this renders no longer necessary. Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb Reviewed-on: https://code.wireshark.org/review/31419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:42:56 +00:00
DISSECTOR_ASSERT(pw_atm_info != NULL);
Clean up the comments in the L2TP dissector about RFCs. Clean up indentation a bit. Clean up the L2TPv3 dissection a bit. Make an OAM cell dissector, and have the L2TP dissector call it. svn path=/trunk/; revision=27540
2009-02-25 09:26:27 +00:00
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer. The only place where it's currently called passes it data. Do a DISSECTOR_ASSERT() check to make sure it's non-null. Remove null-pointer checks that this renders no longer necessary. Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb Reviewed-on: https://code.wireshark.org/review/31419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:42:56 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM");
Fix whitespace. Change-Id: I87e441d3a00c00d4ec7dff5717899408a8e7ab3a Reviewed-on: https://code.wireshark.org/review/31420 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:44:13 +00:00
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer. The only place where it's currently called passes it data. Do a DISSECTOR_ASSERT() check to make sure it's non-null. Remove null-pointer checks that this renders no longer necessary. Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb Reviewed-on: https://code.wireshark.org/review/31419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-06 19:42:56 +00:00
dissect_atm_cell_payload(tvb, 0, pinfo, tree, AAL_OAMCELL,
pw_atm_info->enable_fill_columns_by_atm_dissector,
&pw_atm_info->info);
Clean up the comments in the L2TP dissector about RFCs. Clean up indentation a bit. Clean up the L2TPv3 dissection a bit. Make an OAM cell dissector, and have the L2TP dissector call it. svn path=/trunk/; revision=27540
2009-02-25 09:26:27 +00:00
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15 15:20:35 +00:00
return tvb_reported_length(tvb);
From Francesco Fondelli: New ATM PW (with/without CW) dissector, RFC 4717 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3375 svn path=/trunk/; revision=27955
2009-04-04 11:48:19 +00:00
}
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
static void atm_prompt(packet_info *pinfo _U_, gchar* result)
{
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Decode AAL2 traffic as");
}
static gpointer atm_value(packet_info *pinfo)
{
ATM: add a cast to pacify the OSX 10.5 x86 buildbot Change-Id: I2bff621b46b4811cf60ebaff8fca7429bed3a91e Reviewed-on: https://code.wireshark.org/review/7973 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-07 15:25:42 +00:00
return GUINT_TO_POINTER((guint)pinfo->pseudo_header->atm.type);
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
}
Clean up the comments in the L2TP dissector about RFCs. Clean up indentation a bit. Clean up the L2TPv3 dissection a bit. Make an OAM cell dissector, and have the L2TP dissector call it. svn path=/trunk/; revision=27540
2009-02-25 09:26:27 +00:00
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
void
proto_register_atm(void)
{
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static hf_register_info hf[] = {
{ &hf_atm_aal,
{ "AAL", "atm.aal", FT_UINT8, BASE_DEC, VALS(aal_vals), 0x0,
NULL, HFILL }},
Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-31 16:39:40 +00:00
{ &hf_atm_gfc,
{ "GFC", "atm.GFC", FT_UINT8, BASE_DEC, NULL, 0xF0,
NULL, HFILL }},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
{ &hf_atm_vpi,
{ "VPI", "atm.vpi", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_vci,
{ "VCI", "atm.vci", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_cid,
{ "CID", "atm.cid", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 10:14:06 +00:00
{ &hf_atm_reserved,
{ "Reserved", "atm.reserved", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
{ &hf_atm_le_client_client,
{ "LE Client", "atm.le_client.client", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_lan_destination_tag,
{ "Tag", "atm.lan_destination.tag", FT_UINT16, BASE_HEX, VALS(le_control_landest_tag_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_lan_destination_mac,
{ "MAC address", "atm.lan_destination.mac", FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_tlv_type,
{ "TLV Type", "atm.le_control.tlv_type", FT_UINT32, BASE_HEX, VALS(le_tlv_type_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_tlv_length,
{ "TLV Length", "atm.le_control.tlv_length", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
{ &hf_atm_lan_destination_route_desc,
{ "Route descriptor", "atm.lan_destination.route_desc", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_lan_destination_lan_id,
{ "LAN ID", "atm.lan_destination.lan_id", FT_UINT16, BASE_DEC, NULL, 0xFFF0,
NULL, HFILL }},
{ &hf_atm_lan_destination_bridge_num,
{ "Bridge number", "atm.lan_destination.bridge_num", FT_UINT16, BASE_DEC, NULL, 0x000F,
NULL, HFILL }},
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
{ &hf_atm_source_atm,
{ "Source ATM address", "atm.source_atm", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_target_atm,
{ "Target ATM address", "atm.target_atm", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_configure_join_frame_lan_type,
{ "LAN type", "atm.le_configure_join_frame.lan_type", FT_UINT8, BASE_HEX, VALS(le_control_lan_type_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_le_configure_join_frame_max_frame_size,
{ "Maximum frame size", "atm.le_configure_join_frame.max_frame_size", FT_UINT8, BASE_HEX, VALS(le_control_frame_size_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_le_configure_join_frame_num_tlvs,
{ "Number of TLVs", "atm.le_configure_join_frame.num_tlvs", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_configure_join_frame_elan_name_size,
{ "ELAN name size", "atm.le_configure_join_frame.elan_name_size", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_registration_frame_num_tlvs,
{ "Number of TLVs", "atm.le_registration_frame.num_tlvs", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_arp_frame_num_tlvs,
{ "Number of TLVs", "atm.le_arp_frame.num_tlvs", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_verify_frame_num_tlvs,
{ "Number of TLVs", "atm.le_verify_frame.num_tlvs", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_configure_join_frame_elan_name,
{ "ELAN name", "atm.le_configure_join_frame.elan_name", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_marker,
{ "Marker", "atm.le_control.marker", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_protocol,
{ "Protocol", "atm.le_control.protocol", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_version,
{ "Version", "atm.le_control.version", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_opcode,
{ "Opcode", "atm.le_control.opcode", FT_UINT16, BASE_HEX, VALS(le_control_opcode_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_status,
{ "Status", "atm.le_control.status", FT_UINT16, BASE_HEX, VALS(le_control_status_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_transaction_id,
{ "Transaction ID", "atm.le_control.transaction_id", FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_requester_lecid,
{ "Requester LECID", "atm.le_control.requester_lecid", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_le_control_flags,
{ "Flags", "atm.le_control.flag", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
{ &hf_atm_le_control_flag_v2_capable,
{ "V2 capable", "atm.le_control.flag.v2_capable", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0002,
NULL, HFILL }},
{ &hf_atm_le_control_flag_selective_multicast,
{ "Selective multicast", "atm.le_control.flag.selective_multicast", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0004,
NULL, HFILL }},
{ &hf_atm_le_control_flag_v2_required,
{ "V2 required", "atm.le_control.flag.v2_required", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0008,
NULL, HFILL }},
{ &hf_atm_le_control_flag_proxy,
{ "Proxy", "atm.le_control.flag.flag_proxy", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0080,
NULL, HFILL }},
{ &hf_atm_le_control_flag_exclude_explorer_frames,
{ "Exclude explorer frames", "atm.le_control.flag.exclude_explorer_frames", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0200,
NULL, HFILL }},
{ &hf_atm_le_control_flag_address,
{ "Address", "atm.le_control.flag.address", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0001,
NULL, HFILL }},
{ &hf_atm_le_control_topology_change,
{ "Topology change", "atm.le_control.flag.topology_change", FT_BOOLEAN, 16, TFS(&tfs_remote_local), 0x0100,
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
NULL, HFILL }},
{ &hf_atm_traffic_type,
{ "Traffic type", "atm.traffic_type", FT_UINT8, BASE_DEC, VALS(aal5_hltype_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_traffic_vcmx,
{ "VC multiplexed traffic type", "atm.traffic.vcmx", FT_UINT8, BASE_DEC, VALS(vcmx_type_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_traffic_lane,
{ "LANE traffic type", "atm.traffic.lane", FT_UINT8, BASE_DEC, VALS(lane_type_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_traffic_ipsilon,
{ "Ipsilon traffic type", "atm.traffic.ipsilon", FT_UINT8, BASE_DEC, VALS(ipsilon_type_vals), 0x0,
NULL, HFILL }},
{ &hf_atm_cells,
{ "Cells", "atm.cells", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal5_uu,
{ "AAL5 UU", "atm.hf_atm.aal5t_uu", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal5_cpi,
Move the setting of pt to where it was before the changes, so it's before the point at which it's added to the protocol tree. Put the ATM channel in the ATM tree rather than the top-level tree. Fix the name for the CPI field (copy-and-pasteo). svn path=/trunk/; revision=48015
2013-03-02 21:01:08 +00:00
{ "AAL5 CPI", "atm.hf_atm.aal5t_cpi", FT_UINT8, BASE_HEX, NULL, 0x0,
Use proto_tree_add_item (or similar) instead of proto_item_add_text. svn path=/trunk/; revision=47950
2013-02-28 20:17:33 +00:00
NULL, HFILL }},
{ &hf_atm_aal5_len,
{ "AAL5 len", "atm.aal5t_len", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal5_crc,
{ "AAL5 CRC", "atm.aal5t_crc", FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_payload_type,
{ "Payload Type", "atm.payload_type", FT_UINT8, BASE_DEC, NULL, 0x0E,
NULL, HFILL }},
{ &hf_atm_cell_loss_priority,
{ "Cell Loss Priority", "atm.cell_loss_priority", FT_BOOLEAN, 8, TFS(&tfs_low_high_priority), 0x01,
NULL, HFILL }},
{ &hf_atm_header_error_check,
{ "Header Error Check", "atm.header_error_check", FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{ &hf_atm_channel,
{ "Channel", "atm.channel", FT_UINT16, BASE_DEC, VALS(atm_channel_vals), 0,
NULL, HFILL }},
{ &hf_atm_aa1_csi,
{ "CSI", "atm.aa1.csi", FT_UINT8, BASE_DEC, NULL, 0x80,
NULL, HFILL }},
{ &hf_atm_aa1_seq_count,
{ "Sequence Count", "atm.aa1.seq_count", FT_UINT8, BASE_DEC, NULL, 0x70,
NULL, HFILL }},
{ &hf_atm_aa1_crc,
{ "CRC", "atm.aa1.crc", FT_UINT8, BASE_DEC, NULL, 0x08,
NULL, HFILL }},
{ &hf_atm_aa1_parity,
{ "Parity", "atm.aa1.parity", FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }},
{ &hf_atm_aa1_payload,
{ "Payload", "atm.aa1.payload", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal3_4_seg_type,
{ "Segment Type", "atm.aal3_4.seg_type", FT_UINT16, BASE_DEC, VALS(st_vals), 0xC000,
NULL, HFILL }},
{ &hf_atm_aal3_4_seq_num,
{ "Sequence Number", "atm.aal3_4.seq_num", FT_UINT16, BASE_DEC, NULL, 0x3C00,
NULL, HFILL }},
{ &hf_atm_aal3_4_multiplex_id,
{ "Multiplex ID", "atm.aal3_4.multiplex_id", FT_UINT16, BASE_DEC, NULL, 0x03FF,
NULL, HFILL }},
{ &hf_atm_aal3_4_information,
{ "Information", "atm.aal3_4.information", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal3_4_length_indicator,
{ "Length Indicator", "atm.aal3_4.length_indicator", FT_UINT16, BASE_DEC, VALS(st_vals), 0xFC00,
NULL, HFILL }},
{ &hf_atm_aal3_4_crc,
{ "CRC", "atm.aal3_4.crc", FT_UINT16, BASE_DEC, NULL, 0x03FF,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_type,
{ "OAM Type", "atm.aal_oamcell.type", FT_UINT8, BASE_DEC, VALS(oam_type_vals), 0xF0,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_type_fm,
{ "Function Type", "atm.aal_oamcell.type.fm", FT_UINT8, BASE_DEC, VALS(ft_fm_vals), 0x0F,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_type_pm,
{ "Function Type", "atm.aal_oamcell.type.pm", FT_UINT8, BASE_DEC, VALS(ft_pm_vals), 0x0F,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_type_ad,
{ "Function Type", "atm.aal_oamcell.type.ad", FT_UINT8, BASE_DEC, VALS(ft_ad_vals), 0x0F,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_type_ft,
{ "Function Type", "atm.aal_oamcell.type.ft", FT_UINT8, BASE_DEC, NULL, 0x0F,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_func_spec,
{ "Function-specific information", "atm.aal_oamcell.func_spec", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_atm_aal_oamcell_crc,
{ "CRC-10", "atm.aal_oamcell.crc", FT_UINT16, BASE_HEX, NULL, 0x3FF,
NULL, HFILL }},
Eliminate proto_tree_add_text from some dissectors. Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-31 16:39:40 +00:00
{ &hf_atm_padding,
{ "Padding", "atm.padding", FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
};
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45059
2012-09-23 00:12:14 +00:00
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
static gint *ett[] = {
&ett_atm,
&ett_ilmi,
&ett_aal1,
&ett_aal3_4,
&ett_oamaal,
&ett_atm_lane,
&ett_atm_lane_lc_lan_dest,
&ett_atm_lane_lc_lan_dest_rd,
&ett_atm_lane_lc_flags,
&ett_atm_lane_lc_tlv,
};
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
static ei_register_info ei[] = {
{ &ei_atm_reassembly_failed, { "atm.reassembly_failed", PI_REASSEMBLE, PI_ERROR, "PDU reassembly failed", EXPFILL }},
};
expert_module_t* expert_atm;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
module_t *atm_module;
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
/* Decode As handling */
static build_valid_func atm_da_build_value[1] = {atm_value};
static decode_as_value_t atm_da_values = {atm_prompt, 1, atm_da_build_value};
decode_as: remove the "title" member from decode_as_t The title of a decode_as_t was used by the GTK UI. It's no longer required for Qt. Change-Id: Ibd9d4acbe9cad2c1af520340d04e550326a97ebe Reviewed-on: https://code.wireshark.org/review/33557 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11 17:18:34 +00:00
static decode_as_t atm_da = {"atm", "atm.aal2.type", 1, 0, &atm_da_values, NULL, NULL,
ATM: fix indent (use spaces) Change-Id: I6d8bae2124a5472448e2f2629340a20f5a899076 Reviewed-on: https://code.wireshark.org/review/8651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 09:39:52 +00:00
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
proto_atm = proto_register_protocol("Asynchronous Transfer Mode", "ATM", "atm");
proto_aal1 = proto_register_protocol("ATM AAL1", "AAL1", "aal1");
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_aal3_4 = proto_register_protocol("ATM AAL3/4", "AAL3/4", "aal3_4");
proto_oamaal = proto_register_protocol("ATM OAM AAL", "OAM AAL", "oamaal");
proto_register_field_array(proto_atm, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
Add an "ATM reassembly failed" flag for capture file readers to provide, and set it in NetXRay/Windows Sniffer files if the putative "ATM reassembly failed" flag is set and, if reassembly failed, don't attempt to dissect the packet. svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
expert_atm = expert_register_protocol(proto_atm);
expert_register_field_array(expert_atm, ei, array_length(ei));
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
proto_ilmi = proto_register_protocol("ILMI", "ILMI", "ilmi");
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
proto_atm_lane = proto_register_protocol("ATM LAN Emulation", "ATM LANE", "lane");
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Fix up dissector tables' UI names. This was inspired by using the Decode-As UI to decode Field "SSL TCP Dissector" Value (port) XXX as YYY. "SSL Port" makes more sense as the UI name. Change-Id: Id6398a5dc79e32bddc4f1bfcf0a468ae1364808f Reviewed-on: https://code.wireshark.org/review/19573 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 02:49:50 +00:00
atm_type_aal2_table = register_dissector_table("atm.aal2.type", "ATM AAL_2 type", proto_atm, FT_UINT32, BASE_DEC);
atm_type_aal5_table = register_dissector_table("atm.aal5.type", "ATM AAL_5 type", proto_atm, FT_UINT32, BASE_DEC);
ATM: add new dissector table The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96 Reviewed-on: https://code.wireshark.org/review/31381 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-05 18:26:01 +00:00
atm_cell_payload_vpi_vci_table = register_dissector_table("atm.cell_payload.vpi_vci", "ATM Cell Payload VPI VCI",
proto_atm, FT_UINT32, BASE_DEC);
atm_reassembled_vpi_vci_table = register_dissector_table("atm.reassembled.vpi_vci", "ATM Reassembled VPI VCI",
proto_atm, FT_UINT32, BASE_DEC);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Create some more capture dissector tables. These were created from capture dissector functions that had switch statements determine "next" protocol/dissector. The registration decreases the need for function declarations in header files. Added new capture dissection tables for IP, IPv6, TCP and UDP as that seems like the next logical place to expand Change-Id: I1ec0cd54eecda4f400669ee5b026bf6e2b46545a Reviewed-on: https://code.wireshark.org/review/12634 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-14 13:48:59 +00:00
register_capture_dissector_table("atm.aal5.type", "ATM AAL_5");
register_capture_dissector_table("atm_lane", "ATM LAN Emulation");
new_register_dissector -> register_dissector for dissector directory. Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 04:04:01 +00:00
atm_handle = register_dissector("atm_truncated", dissect_atm_truncated, proto_atm);
register_dissector("atm_pw_truncated", dissect_atm_pw_truncated, proto_atm);
atm_untruncated_handle = register_dissector("atm_untruncated", dissect_atm_untruncated, proto_atm);
register_dissector("atm_pw_untruncated", dissect_atm_pw_untruncated, proto_atm);
register_dissector("atm_oam_cell", dissect_atm_oam_cell, proto_oamaal);
register_dissector("atm_pw_oam_cell", dissect_atm_pw_oam_cell, proto_oamaal);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
atm_module = prefs_register_protocol ( proto_atm, NULL );
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
prefs_register_bool_preference(atm_module, "dissect_lane_as_sscop", "Dissect LANE as SSCOP",
More spelling fixes, start of second pass of dissectors. Now easier to find errors due to script improvements and more complete dictionary file.
2020-08-30 21:34:34 +00:00
"Autodetection between LANE and SSCOP is hard. As default LANE is preferred",
Minor cleanup: - revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back (3 cases); [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined ad 0x0000000]; - Remove 'if(tree)' around calls to subdissector; - whitespace & formatting. svn path=/trunk/; revision=45635
2012-10-18 16:32:56 +00:00
&dissect_lanesscop);
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
prefs_register_obsolete_preference(atm_module, "unknown_aal2_type");
From Stephen Donnelly: AAL2 preference. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4465 svn path=/trunk/; revision=31813
2010-02-07 13:37:51 +00:00
Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-02 17:38:30 +00:00
register_decode_as(&atm_da);
Add support for reading Full Frontal ATM from an ATM Sniffer capture file, instead of throwing out all but LANE or RFC 1483 data frames and pretending that the former are just Ethernet or Token-Ring frames. Add some level of decoding for ATM LANE, but not all of it; the rest, including decoding non-LANE frames, is left as an exercise for somebody who has captures they want to decode, an interest in decoding them, ATM expertise, and time.... svn path=/trunk/; revision=523
1999-08-20 06:55:20 +00:00
}
Wrap the dissect_fddi() call (with a 4th argument) with dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which use the standard 3-argument tvbuffified-dissector argument list. Add a dissector table called "wtap_encap" which is used to call dissectors from dissect_frame(). The switch() statement from this top-level dissector is removed. The link-layer dissectors register themselves with the "wtap_encap" dissector table. The dissectors are now static where possible. svn path=/trunk/; revision=2708
2000-11-29 05:16:15 +00:00
void
proto_reg_handoff_atm(void)
{
Implement registration of capture dissectors by name Mirror it after protocol dissector API. Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304 Reviewed-on: https://code.wireshark.org/review/18496 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-26 16:07:47 +00:00
capture_dissector_handle_t atm_cap_handle;
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
/*
* Get handles for the Ethernet, Token Ring, Frame Relay, LLC,
* SSCOP, LANE, and ILMI dissectors.
*/
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_atm_lane);
tr_handle = find_dissector_add_dependency("tr", proto_atm_lane);
fr_handle = find_dissector_add_dependency("fr", proto_atm);
llc_handle = find_dissector_add_dependency("llc", proto_atm);
sscop_handle = find_dissector_add_dependency("sscop", proto_atm);
ppp_handle = find_dissector_add_dependency("ppp", proto_atm);
eth_maybefcs_handle = find_dissector_add_dependency("eth_maybefcs", proto_atm);
ip_handle = find_dissector_add_dependency("ip", proto_atm);
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle);
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
dissector_add_uint("atm.aal5.type", TRAF_LANE, create_dissector_handle(dissect_lane, proto_atm_lane));
dissector_add_uint("atm.aal5.type", TRAF_ILMI, create_dissector_handle(dissect_ilmi, proto_ilmi));
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED,
Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces) svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
atm_untruncated_handle);
Implement registration of capture dissectors by name Mirror it after protocol dissector API. Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304 Reviewed-on: https://code.wireshark.org/review/18496 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-26 16:07:47 +00:00
atm_cap_handle = create_capture_dissector_handle(capture_atm, proto_atm);
capture_dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_cap_handle);
atm_cap_handle = create_capture_dissector_handle(capture_lane, proto_atm_lane);
capture_dissector_add_uint("atm.aal5.type", TRAF_LANE, atm_cap_handle);
Wrap the dissect_fddi() call (with a 4th argument) with dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which use the standard 3-argument tvbuffified-dissector argument list. Add a dissector table called "wtap_encap" which is used to call dissectors from dissect_frame(). The switch() statement from this top-level dissector is removed. The link-layer dissectors register themselves with the "wtap_encap" dissector table. The dissectors are now static where possible. svn path=/trunk/; revision=2708
2000-11-29 05:16:15 +00:00
}
Add editor modelines; fix indentation as needed. Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-28 23:25:09 +00:00
/*
HTTPS (almost) everywhere. Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:43:17 +00:00
* Editor modelines - https://www.wireshark.org/tools/modelines.html
Add editor modelines; fix indentation as needed. Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-28 23:25:09 +00:00
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/