osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/packet-llc.c

578 lines
16 KiB
C
Raw Normal View History

Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* packet-llc.c
* Routines for IEEE 802.2 LLC layer
Hopefully the last time I have to change my e-mail address. svn path=/trunk/; revision=4199
2001-11-13 23:55:44 +00:00
* Gilbert Ramirez <gram@alumni.rice.edu>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
*
From Joerg Mayer: get rid of unused function arguments. svn path=/trunk/; revision=5053
2002-03-31 21:09:00 +00:00
* $Id: packet-llc.c,v 1.96 2002/03/31 21:09:00 guy Exp $
Added ID tags to the beginning of each source file. svn path=/trunk/; revision=7
1998-09-16 03:22:19 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* Ethereal - Network traffic analyzer
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
* By Gerald Combs <gerald@ethereal.com>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
* OSPF alignment fixes (Gerald) * FDDI support (Laurent, Guy) svn path=/trunk/; revision=36
1998-10-10 03:32:20 +00:00
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include <glib.h>
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>
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
#include "oui.h"
Add a "dissect_xdlc_control()" routine, to dissect the control field of SDLC-derived protocols such as HDLC and derivatives of it such as LAPB, IEEE 802.2 LLC, and so on. Have the LLC and LAPB dissectors use it. Make "dissect_numeric_bitfield()" put the low-order bit of the bitfield in the low-order bit of an integer when printing it, so that the right value is printed. svn path=/trunk/; revision=434
1999-08-04 04:37:46 +00:00
#include "xdlc.h"
Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco IOS 9.0 and bridged frame relay and update packet-llc.c accordingly. Add CDP handler to capture_llc() in packet-llc.c. svn path=/trunk/; revision=1524
2000-01-22 21:49:50 +00:00
#include "etypes.h"
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
#include "llcsaps.h"
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
#include "bridged_pids.h"
Create a header file for every packet-*.c file. Prune the packet.h file. This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
2000-02-15 21:06:58 +00:00
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-netbios.h"
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/sna-utils.h>
Create a header file for every packet-*.c file. Prune the packet.h file. This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
2000-02-15 21:06:58 +00:00
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
#include "packet-llc.h"
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_llc = -1;
static int hf_llc_dsap = -1;
static int hf_llc_ssap = -1;
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
static int hf_llc_dsap_ig = -1;
static int hf_llc_ssap_cr = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int hf_llc_ctrl = -1;
static int hf_llc_type = -1;
static int hf_llc_oui = -1;
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
static int hf_llc_pid = -1;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +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_llc = -1;
static gint ett_llc_ctrl = -1;
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
static dissector_table_t subdissector_table;
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors. Add a new subdissector table in the LLC dissector for protocol IDs with a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that table, rather than calling them via a switch statement. Register the ISL dissector by name, and have the Ethernet dissector call it via a handle. Fix the handling of the checksum field in the CDP dissector. The strings in CDP are counted, not null-terminated; treat them as such. Fix the handling of the encapsulated frame CRC, and the encapsulated frame, in the ISL dissector, at least for Ethernet frames; it may not be correct for encapsulated Token Ring frames. svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
static dissector_table_t cisco_subdissector_table;
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
static dissector_handle_t bpdu_handle;
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
static dissector_handle_t eth_handle;
static dissector_handle_t fddi_handle;
static dissector_handle_t tr_handle;
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
static dissector_handle_t data_handle;
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
typedef void (capture_func_t)(const u_char *, int, int, packet_counts *);
Have "sap_capture_func()" return "capture_data" rather than "dissect_data"; if you call "dissect_data()" with an argument list of the type expected by a "capture_XXX()" routine, it won't do the right thing (and may do the wrong thing, e.g. crash). Have "sap_capture_func()" (and "sap_dissect_func()") return function pointers rather than "void *"s, so that I don't make a mistake like the above in the future.... svn path=/trunk/; revision=219
1999-03-22 03:44:44 +00:00
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
/* The SAP info is split into two tables, one value_string table and one
* table of sap_info. This is so that the value_string can be used in the
* header field registration.
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
*/
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
struct sap_info {
I removed the ncp code from packet-ipx.c and created packet-ncp.c. Now that I've started concentrating on the NetWare modules again, packet-ncp.c is going to start to grow. I also added IPX RIP to packet-ipx.c. Additionally, I added the END_OF_FRAME macro to packet.h, which is useful for many dissect() routines. (and I already modified packet-bootp.c and packet-data.c to use this macro) svn path=/trunk/; revision=22
1998-09-23 05:25:12 +00:00
guint8 sap;
Have "sap_capture_func()" return "capture_data" rather than "dissect_data"; if you call "dissect_data()" with an argument list of the type expected by a "capture_XXX()" routine, it won't do the right thing (and may do the wrong thing, e.g. crash). Have "sap_capture_func()" (and "sap_dissect_func()") return function pointers rather than "void *"s, so that I don't make a mistake like the above in the future.... svn path=/trunk/; revision=219
1999-03-22 03:44:44 +00:00
capture_func_t *capture_func;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
};
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
/*
* Group/Individual bit, in the DSAP.
*/
#define DSAP_GI_BIT 0x01
/*
* Command/Response bit, in the SSAP.
*
* The low-order bit of the SSAP apparently determines whether this
* is a request or a response. (RFC 1390, "Transmission of IP and
* ARP over FDDI Networks", says
*
* Command frames are identified by having the low order
* bit of the SSAP address reset to zero. Response frames
* have the low order bit of the SSAP address set to one.
*
* and a page I've seen seems to imply that's part of 802.2.)
*/
#define SSAP_CR_BIT 0x01
/*
* Mask to extrace the SAP number from the DSAP or the SSAP.
*/
#define SAP_MASK 0xFE
/*
* These are for SSAP and DSAP, wth last bit always zero.
*** empty log message *** svn path=/trunk/; revision=1325
1999-12-14 07:22:56 +00:00
* XXX - some DSAPs come in separate "individual" and "group" versions,
* with the last bit 0 and 1, respectively (e.g., LLC Sub-layer Management,
Add some new SAP values from http://www.optimized.com/COMPENDI/REF-SAP.htm svn path=/trunk/; revision=1529
2000-01-24 02:44:52 +00:00
* IBM SNA Path Control, IBM Net Management), but, whilst 0xFE is
*** empty log message *** svn path=/trunk/; revision=1325
1999-12-14 07:22:56 +00:00
* the ISO Network Layer Protocol, 0xFF is the Global LSAP.
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
*/
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
static const value_string sap_vals[] = {
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
{ SAP_NULL, "NULL LSAP" },
{ SAP_LLC_SLMGMT, "LLC Sub-Layer Management" },
{ SAP_SNA_PATHCTRL, "SNA Path Control" },
{ SAP_IP, "TCP/IP" },
{ SAP_SNA1, "SNA" },
{ SAP_SNA2, "SNA" },
{ SAP_PROWAY_NM_INIT, "PROWAY (IEC955) Network Management and Initialization" },
{ SAP_TI, "Texas Instruments" },
{ SAP_BPDU, "Spanning Tree BPDU" },
{ SAP_RS511, "EIA RS-511 Manufacturing Message Service" },
X.25-over-LLC support, from Paul Ionescu. svn path=/trunk/; revision=2829
2001-01-05 19:07:38 +00:00
{ SAP_X25, "ISO 8208 (X.25 over 802.2)" },
/*
* XXX - setting the group bit of SAP_X25 make 0x7F; is this just
* a group version of that?
*/
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
{ 0x7F, "ISO 802.2" },
{ SAP_XNS, "XNS" },
{ SAP_NESTAR, "Nestar" },
{ SAP_PROWAY_ASLM, "PROWAY (IEC955) Active Station List Maintenance" },
{ SAP_ARP, "ARP" }, /* XXX - hand to "dissect_arp()"? */
{ SAP_SNAP, "SNAP" },
{ SAP_VINES1, "Banyan Vines" },
{ SAP_VINES2, "Banyan Vines" },
{ SAP_NETWARE, "NetWare" },
{ SAP_NETBIOS, "NetBIOS" },
{ SAP_IBMNM, "IBM Net Management" },
{ SAP_RPL1, "Remote Program Load" },
{ SAP_UB, "Ungermann-Bass" },
{ SAP_RPL2, "Remote Program Load" },
{ SAP_OSINL, "ISO Network Layer" },
{ SAP_GLOBAL, "Global LSAP" },
{ 0x00, NULL }
I moved the list of dissect() functions into the table of SAPs. It removes the ugly case statement at the end of dissect_llc. svn path=/trunk/; revision=14
1998-09-17 18:43:11 +00:00
};
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
static struct sap_info saps[] = {
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
{ SAP_IP, capture_ip },
{ SAP_NETWARE, capture_ipx },
{ SAP_NETBIOS, capture_netbios },
{ 0x00, NULL}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
};
I moved the list of dissect() functions into the table of SAPs. It removes the ugly case statement at the end of dissect_llc. svn path=/trunk/; revision=14
1998-09-17 18:43:11 +00:00
Note the document that specified the PIDs for VTP and DRiP that go along with Cisco's "wacky proprietary protocols atop LLC/SNAP" OUI, and put in "#if 0"ed out code for Cisco's DRiP. svn path=/trunk/; revision=1604
2000-02-05 09:34:33 +00:00
/*
* See
*
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/vlan.htm
*
* for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO.
*/
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
const value_string oui_vals[] = {
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
{ OUI_ENCAP_ETHER, "Encapsulated Ethernet" },
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
/*
http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
*/
Cisco CDP packets appears to be sent as LLC packets with an OUI of 0x00000c and a protocol ID of 0x2000 - we used to recognize those as CDP because we ignored the OUI and treated all LLC packets as SNAP-encapsulated packets, and treated 0x2000 as an Ethertype, but we now treat only encapsulated-Ethernet and Apple packets as SNAP-encapsulated (and arguably we should handle Apple separately). svn path=/trunk/; revision=1452
2000-01-12 19:37:24 +00:00
{ OUI_CISCO, "Cisco" },
Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco IOS 9.0 and bridged frame relay and update packet-llc.c accordingly. Add CDP handler to capture_llc() in packet-llc.c. svn path=/trunk/; revision=1524
2000-01-22 21:49:50 +00:00
{ OUI_CISCO_90, "Cisco IOS 9.0 Compatible" },
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
{ OUI_BRIDGED, "Frame Relay or ATM bridged frames" },
/* RFC 2427, RFC 2684 */
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
{ OUI_ATM_FORUM, "ATM Forum" },
Add DOCSIS BPDU patch from Johannes Hennecke <Johannes.Hennecke@elsa.de>. svn path=/trunk/; revision=1826
2000-04-10 14:45:30 +00:00
{ OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
Some Cisco 802.11 bridges apparently change the OUI of packets from 000000 to 000078, so treat LLC packets with that OUI the same way we treat LLC packets with 000000. svn path=/trunk/; revision=3496
2001-06-01 23:04:37 +00:00
{ OUI_APPLE_ATALK, "Apple (AppleTalk)" },
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
{ 0, NULL }
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
};
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Have "sap_capture_func()" return "capture_data" rather than "dissect_data"; if you call "dissect_data()" with an argument list of the type expected by a "capture_XXX()" routine, it won't do the right thing (and may do the wrong thing, e.g. crash). Have "sap_capture_func()" (and "sap_dissect_func()") return function pointers rather than "void *"s, so that I don't make a mistake like the above in the future.... svn path=/trunk/; revision=219
1999-03-22 03:44:44 +00:00
static capture_func_t *
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
sap_capture_func(u_char sap) {
I moved the list of dissect() functions into the table of SAPs. It removes the ugly case statement at the end of dissect_llc. svn path=/trunk/; revision=14
1998-09-17 18:43:11 +00:00
int i=0;
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
/* look for the second record where sap == 0, which should
* be the last record
*/
while (saps[i].sap > 0 || i == 0) {
I moved the list of dissect() functions into the table of SAPs. It removes the ugly case statement at the end of dissect_llc. svn path=/trunk/; revision=14
1998-09-17 18:43:11 +00:00
if (saps[i].sap == sap) {
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
return saps[i].capture_func;
}
i++;
}
Well, that was dumb. I didn't have to add a "capture_data()" routine; I just had to make "sap_capture_func()" return NULL if it didn't find an entry for the SAP it was passed. svn path=/trunk/; revision=220
1999-03-22 03:56:34 +00:00
return NULL;
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
}
void
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
capture_llc(const u_char *pd, int offset, int len, packet_counts *ld) {
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
int is_snap;
Have "get_xdlc_control()" and "dissect_xdlc_control()" return the xDLC control field, so that its caller can not only determine from it whether the frame has a payload, but can also determine how long the control field is. Put macros in "xdlc.h" to determine both of those. Have "capture_llc()" and "dissect_llc()" use that information appropriately. svn path=/trunk/; revision=727
1999-09-26 20:31:51 +00:00
guint16 control;
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
int llc_header_len;
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
guint32 oui;
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
guint16 etype;
Have "sap_capture_func()" return "capture_data" rather than "dissect_data"; if you call "dissect_data()" with an argument list of the type expected by a "capture_XXX()" routine, it won't do the right thing (and may do the wrong thing, e.g. crash). Have "sap_capture_func()" (and "sap_dissect_func()") return function pointers rather than "void *"s, so that I don't make a mistake like the above in the future.... svn path=/trunk/; revision=219
1999-03-22 03:44:44 +00:00
capture_func_t *capture;
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data packets as SNAP-encapsulated Ethernet; instead, they use one of their *own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....) Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated Ethernet OUI of 00-00-00, and identify it as an Apple OUI. Add checks to make sure we actually have a full LLC header and, if it's a SNAP frame, that we have a full SNAP header as well. For non-SNAP frames, list both the DSAP and the SSAP in the Info column, and, for SNAP frames, list the OUI and PID. svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
ld->other++;
return;
}
Add some new SAP values from http://www.optimized.com/COMPENDI/REF-SAP.htm svn path=/trunk/; revision=1529
2000-01-24 02:44:52 +00:00
is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
llc_header_len = 2; /* DSAP + SSAP */
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
/*
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
* XXX - the page referred to in the comment above about the
* Command/Response bit also implies that LLC Type 2 always
* uses extended operation, so we don't need to determine
* whether it's basic or extended operation; is that the case?
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
*/
From Joerg Mayer: get rid of unused function arguments. svn path=/trunk/; revision=5053
2002-03-31 21:09:00 +00:00
control = get_xdlc_control(pd, offset+2, pd[offset+1] & SSAP_CR_BIT);
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
Handle the length of the LLC(+SNAP) header correctly for SNAP frames. svn path=/trunk/; revision=728
1999-09-26 20:40:00 +00:00
if (is_snap)
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len)) {
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data packets as SNAP-encapsulated Ethernet; instead, they use one of their *own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....) Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated Ethernet OUI of 00-00-00, and identify it as an Apple OUI. Add checks to make sure we actually have a full LLC header and, if it's a SNAP frame, that we have a full SNAP header as well. For non-SNAP frames, list both the DSAP and the SSAP in the Info column, and, for SNAP frames, list the OUI and PID. svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
ld->other++;
return;
}
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
if (is_snap) {
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
oui = pd[offset+3] << 16 | pd[offset+4] << 8 | pd[offset+5];
xDLC frames other than I and UI frames may have a payload, e.g. TEST frames; rename "XDLC_HAS_PAYLOAD()" to "XDLC_IS_INFORMATION()", and if the frame isn't an "information" frame, dissect its payload (if any) as data. svn path=/trunk/; revision=1528
2000-01-24 02:05:39 +00:00
if (XDLC_IS_INFORMATION(control)) {
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
etype = pntohs(&pd[offset+6]);
switch (oui) {
case OUI_ENCAP_ETHER:
The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078; various Cisco documents indicate that 0000F8 is used on at least some Cisco boxes for bridging Ethernet frames onto 802.x+LLC frames. svn path=/trunk/; revision=3498
2001-06-02 03:04:12 +00:00
case OUI_CISCO_90:
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data packets as SNAP-encapsulated Ethernet; instead, they use one of their *own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....) Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated Ethernet OUI of 00-00-00, and identify it as an Apple OUI. Add checks to make sure we actually have a full LLC header and, if it's a SNAP frame, that we have a full SNAP header as well. For non-SNAP frames, list both the DSAP and the SSAP in the Info column, and, for SNAP frames, list the OUI and PID. svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
case OUI_APPLE_ATALK:
/* No, I have no idea why Apple used
one of their own OUIs, rather than
OUI_ENCAP_ETHER, and an Ethernet
packet type as protocol ID, for
AppleTalk data packets - but used
OUI_ENCAP_ETHER and an Ethernet
The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078; various Cisco documents indicate that 0000F8 is used on at least some Cisco boxes for bridging Ethernet frames onto 802.x+LLC frames. svn path=/trunk/; revision=3498
2001-06-02 03:04:12 +00:00
packet type for AARP packets. */
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
capture_ethertype(etype, pd, offset+8, len,
In "dissect_eth()", update "pi.len" and "pi.captured_len" regardless of whether we're building a protocol tree or not. Make "dissect_eth()" use "BYTES_ARE_IN_FRAME()" to see if we have a full Ethernet header - it can be called with a non-zero offset, if Ethernet frames are encapsulated inside other frames (e.g., ATM LANE). Make capture routines take an "offset" argument if the corresponding dissect routine takes one (for symmetry, and for Cisco ISL or any other protocol that encapsulates Ethernet or Token-Ring frames inside other frames). Pass the frame lengths to capture routines via the "pi" structure, rather than as an in-line argument, so that they can macros such as "BYTES_ARE_IN_FRAME()" the way the corresponding dissect routines do. Make capture routines update "pi.len" and "pi.captured_len" the same way the corresponding diseect routines do, if the capture routines then call other capture routines. Make "capture_vlan()" count as "other" frames that are too short, the way other capture routines do. svn path=/trunk/; revision=1525
2000-01-23 08:55:37 +00:00
ld);
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
break;
Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco IOS 9.0 and bridged frame relay and update packet-llc.c accordingly. Add CDP handler to capture_llc() in packet-llc.c. svn path=/trunk/; revision=1524
2000-01-22 21:49:50 +00:00
case OUI_CISCO:
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
capture_ethertype(etype, pd, offset + 8, len,
ld);
Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco IOS 9.0 and bridged frame relay and update packet-llc.c accordingly. Add CDP handler to capture_llc() in packet-llc.c. svn path=/trunk/; revision=1524
2000-01-22 21:49:50 +00:00
break;
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
default:
ld->other++;
break;
}
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
}
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
}
else {
xDLC frames other than I and UI frames may have a payload, e.g. TEST frames; rename "XDLC_HAS_PAYLOAD()" to "XDLC_IS_INFORMATION()", and if the frame isn't an "information" frame, dissect its payload (if any) as data. svn path=/trunk/; revision=1528
2000-01-24 02:05:39 +00:00
if (XDLC_IS_INFORMATION(control)) {
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
capture = sap_capture_func(pd[offset]);
/* non-SNAP */
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
offset += llc_header_len;
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
if (capture) {
Make the capture routines take an additional argument giving the amount of packet data captured. Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the packet" argument. Add some length checks to capture routines. svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
capture(pd, offset, len, ld);
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
}
else {
ld->other++;
}
When doing a capture, decode enough of the incoming packets to correctly update the packet counts and percentages in the dialog box popped up during a capture, even for non-Ethernet captures. svn path=/trunk/; revision=184
1999-02-09 00:35:38 +00:00
}
}
}
Have the TR MAC and LLC dissectors register themselves, make them static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
2001-01-03 10:34:42 +00:00
static void
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *llc_tree = NULL;
Have "get_xdlc_control()" and "dissect_xdlc_control()" return the xDLC control field, so that its caller can not only determine from it whether the frame has a payload, but can also determine how long the control field is. Put macros in "xdlc.h" to determine both of those. Have "capture_llc()" and "dissect_llc()" use that information appropriately. svn path=/trunk/; revision=727
1999-09-26 20:31:51 +00:00
proto_item *ti = NULL;
I moved the list of dissect() functions into the table of SAPs. It removes the ugly case statement at the end of dissect_llc. svn path=/trunk/; revision=14
1998-09-17 18:43:11 +00:00
int is_snap;
Have "get_xdlc_control()" and "dissect_xdlc_control()" return the xDLC control field, so that its caller can not only determine from it whether the frame has a payload, but can also determine how long the control field is. Put macros in "xdlc.h" to determine both of those. Have "capture_llc()" and "dissect_llc()" use that information appropriately. svn path=/trunk/; revision=727
1999-09-26 20:31:51 +00:00
guint16 control;
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
int llc_header_len;
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
guint8 dsap, ssap;
tvbuff_t *next_tvb;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
Clear the Info column before fetching anything from the packet, so that if we throw an exception, the stuff from the protocol atop which LLC runs isn't still there. svn path=/trunk/; revision=2826
2001-01-05 08:43:30 +00:00
}
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data packets as SNAP-encapsulated Ethernet; instead, they use one of their *own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....) Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated Ethernet OUI of 00-00-00, and identify it as an Apple OUI. Add checks to make sure we actually have a full LLC header and, if it's a SNAP frame, that we have a full SNAP header as well. For non-SNAP frames, list both the DSAP and the SSAP in the Info column, and, for SNAP frames, list the OUI and PID. svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
dsap = tvb_get_guint8(tvb, 0);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (tree) {
Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOL items to the protocol tree; it's interpreted as "the rest of the data in the tvbuff". This can be used if 1) the item covers the entire packet or the remaining payload in the packet or 2) the item's length won't be known until it's dissected, and will be then set with "proto_item_set_len()" - if an exception is thrown in the dissection, it means the item ran *past* the end of the tvbuff, so saying it runs to the end of the tvbuff is reasonable. Convert a number of "proto_tree_add_XXX()" calls using "tvb_length_remaining()", values derived from the result of "tvb_length()", or 0 (in the case of items whose length is unknown) to use -1 instead (using 0 means that if an exception is thrown, selecting the item highlights nothing; using -1 means it highlights all the data for that item that's available). In some places where "tvb_length()" or "tvb_length_remaining()" was used to determine how large a packet is, use "tvb_reported_length()" or "tvb_reported_length_remaining()", instead - the first two calls indicate how much captured data was in the packet, the latter two calls indicate how large the packet actually was (and the fact that using the latter could cause BoundsError exceptions to be thrown is a feature - if such an exception is thrown, the frame really *was* short, and it should be tagged as such). Replace some "proto_tree_add_XXX()" calls with equivalent "proto_tree_add_item()" calls. Fix some indentation. svn path=/trunk/; revision=4578
2002-01-20 22:12:39 +00:00
ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE);
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
llc_tree = proto_item_add_subtree(ti, ett_llc);
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0,
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
1, dsap & SAP_MASK);
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
proto_tree_add_boolean(llc_tree, hf_llc_dsap_ig, tvb, 0,
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
1, dsap & DSAP_GI_BIT);
In the FDDI and LLC dissectors, extract fields as we use them, so that we don't get an exception (and thus a "Short Frame" or "Malformed Frame" entry) until we get to a field that isn't in the frame. svn path=/trunk/; revision=2021
2000-05-28 22:02:17 +00:00
} else
llc_tree = NULL;
ssap = tvb_get_guint8(tvb, 1);
if (tree) {
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
proto_tree_add_uint(llc_tree, hf_llc_ssap, tvb, 1,
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
1, ssap & SAP_MASK);
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
proto_tree_add_boolean(llc_tree, hf_llc_ssap_cr, tvb, 1,
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
1, ssap & SSAP_CR_BIT);
Add a "dissect_xdlc_control()" routine, to dissect the control field of SDLC-derived protocols such as HDLC and derivatives of it such as LAPB, IEEE 802.2 LLC, and so on. Have the LLC and LAPB dissectors use it. Make "dissect_numeric_bitfield()" put the low-order bit of the bitfield in the low-order bit of an integer when printing it, so that the right value is printed. svn path=/trunk/; revision=434
1999-08-04 04:37:46 +00:00
} else
llc_tree = NULL;
In the FDDI and LLC dissectors, extract fields as we use them, so that we don't get an exception (and thus a "Short Frame" or "Malformed Frame" entry) until we get to a field that isn't in the frame. svn path=/trunk/; revision=2021
2000-05-28 22:02:17 +00:00
is_snap = (dsap == SAP_SNAP) && (ssap == SAP_SNAP);
llc_header_len = 2; /* DSAP + SSAP */
Add a "dissect_xdlc_control()" routine, to dissect the control field of SDLC-derived protocols such as HDLC and derivatives of it such as LAPB, IEEE 802.2 LLC, and so on. Have the LLC and LAPB dissectors use it. Make "dissect_numeric_bitfield()" put the low-order bit of the bitfield in the low-order bit of an integer when printing it, so that the right value is printed. svn path=/trunk/; revision=434
1999-08-04 04:37:46 +00:00
/*
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
* XXX - the page referred to in the comment above about the
* Command/Response bit also implies that LLC Type 2 always
* uses extended operation, so we don't need to determine
* whether it's basic or extended operation; is that the case?
Add a "dissect_xdlc_control()" routine, to dissect the control field of SDLC-derived protocols such as HDLC and derivatives of it such as LAPB, IEEE 802.2 LLC, and so on. Have the LLC and LAPB dissectors use it. Make "dissect_numeric_bitfield()" put the low-order bit of the bitfield in the low-order bit of an integer when printing it, so that the right value is printed. svn path=/trunk/; revision=434
1999-08-04 04:37:46 +00:00
*/
Convert LAPD and V.120 dissector to use tvbuff. Convert xdlc dissector-helper, too. svn path=/trunk/; revision=2030
2000-05-31 03:58:56 +00:00
control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
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
hf_llc_ctrl, ett_llc_ctrl,
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
ssap & SSAP_CR_BIT, TRUE);
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
Handle the length of the LLC(+SNAP) header correctly for SNAP frames. svn path=/trunk/; revision=728
1999-09-26 20:40:00 +00:00
if (is_snap)
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
Have "get_xdlc_control()" and "dissect_xdlc_control()" return the xDLC control field, so that its caller can not only determine from it whether the frame has a payload, but can also determine how long the control field is. Put macros in "xdlc.h" to determine both of those. Have "capture_llc()" and "dissect_llc()" use that information appropriately. svn path=/trunk/; revision=727
1999-09-26 20:31:51 +00:00
if (tree)
"XDLC_CONTROL_LEN()" actually returned the length of the entire xDLC header, under the assumption that the address field was two octets. It should return the length of the *control* field, and leave it up to its caller to add in the length of the address field. (The address field appears to be one byte in SNA, not two bytes.) svn path=/trunk/; revision=1006
1999-11-11 08:04:06 +00:00
proto_item_set_len(ti, llc_header_len);
Add a "dissect_xdlc_control()" routine, to dissect the control field of SDLC-derived protocols such as HDLC and derivatives of it such as LAPB, IEEE 802.2 LLC, and so on. Have the LLC and LAPB dissectors use it. Make "dissect_numeric_bitfield()" put the low-order bit of the bitfield in the low-order bit of an integer when printing it, so that the right value is printed. svn path=/trunk/; revision=434
1999-08-04 04:37:46 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (is_snap) {
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
"dissect_llc()" is called for RFC 2684 LLC Encapsulation over ATM, so LLC *does* have to support bridged frames over ATM; the correct bridge padding is 2 (well, except for bridged 802.6 frames, but, if we ever support that, we just wouldn't add "bridge_pad" to "offset+5" when constructing the next tvbuff). svn path=/trunk/; revision=2874
2001-01-11 07:24:17 +00:00
hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
else {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO,
Include the control-field information in the Info column for LLC frames. svn path=/trunk/; revision=2370
2000-08-25 06:31:25 +00:00
"; DSAP %s %s, SSAP %s %s",
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
val_to_str(dsap & SAP_MASK, sap_vals, "%02x"),
dsap & DSAP_GI_BIT ?
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
"Group" : "Individual",
Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943
2000-05-11 22:04:18 +00:00
val_to_str(ssap & SAP_MASK, sap_vals, "%02x"),
ssap & SSAP_CR_BIT ?
The "llc_ctrl_vals[]" value_string table isn't used to generate the protocol tree text for the control field - that protocol tree entry is added by "dissect_xdlc_control()", which uses "proto_tree_add_uint_format()" - and it's not a simple enumerated field (which is why "proto_tree_add_uint_format()" is used, to show all the various bits of the field). Eliminate it. svn path=/trunk/; revision=1825
2000-04-09 18:33:26 +00:00
"Response" : "Command"
Provide #defines for the Group/Individual bit in the DSAP, the Command/Response bit in the SSAP, and the mask that extracts the rest of the {D,S}SAP. svn path=/trunk/; revision=1316
1999-12-13 23:39:59 +00:00
);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length' in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET so far; support for TVBUFF_COMPOSITE is coming soon. Throw either ReportedBoundsError or BoundsError. A ReportedBoundsError is reported as "Malformed Frame" since the protocol stated that a certain number of bytes should be available but they weren't. A BoundsError is reported as a "Short Frame" since the snaplen was too short. Register proto_short (BoundsError) and proto_malformed (ReportedBounds) so searches can be made on "short" and "malformed". svn path=/trunk/; revision=1965
2000-05-16 04:44:14 +00:00
next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1);
xDLC frames other than I and UI frames may have a payload, e.g. TEST frames; rename "XDLC_HAS_PAYLOAD()" to "XDLC_IS_INFORMATION()", and if the frame isn't an "information" frame, dissect its payload (if any) as data. svn path=/trunk/; revision=1528
2000-01-24 02:05:39 +00:00
if (XDLC_IS_INFORMATION(control)) {
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
/* non-SNAP */
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
/* do lookup with the subdissector table */
if (!dissector_try_port(subdissector_table, dsap,
Allow either old-style (pre-tvbuff) or new-style (tvbuffified) dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". svn path=/trunk/; revision=2218
2000-08-07 03:21:25 +00:00
next_tvb, pinfo, tree)) {
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
The only LLC frame types that should be dissected based on their SAP or, if the SAPs are SNAP, based on their ethertype are I frames and UI frames; others don't have payload to be dissected as belonging to other protocols. svn path=/trunk/; revision=555
1999-08-23 22:47:13 +00:00
}
The "llc_ctrl_vals[]" value_string table isn't used to generate the protocol tree text for the control field - that protocol tree entry is added by "dissect_xdlc_control()", which uses "proto_tree_add_uint_format()" - and it's not a simple enumerated field (which is why "proto_tree_add_uint_format()" is used, to show all the various bits of the field). Eliminate it. svn path=/trunk/; revision=1825
2000-04-09 18:33:26 +00:00
} else {
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
The "llc_ctrl_vals[]" value_string table isn't used to generate the protocol tree text for the control field - that protocol tree entry is added by "dissect_xdlc_control()", which uses "proto_tree_add_uint_format()" - and it's not a simple enumerated field (which is why "proto_tree_add_uint_format()" is used, to show all the various bits of the field). Eliminate it. svn path=/trunk/; revision=1825
2000-04-09 18:33:26 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
/*
* Dissect SNAP header; used elsewhere, e.g. in the Frame Relay dissector.
*/
void
dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
proto_tree *snap_tree, int control, int hf_oui, int hf_type, int hf_pid,
int bridge_pad)
{
guint32 oui;
guint16 etype;
tvbuff_t *next_tvb;
oui = tvb_get_ntoh24(tvb, offset);
etype = tvb_get_ntohs(tvb, offset+3);
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO,
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
"; SNAP, OUI 0x%06X (%s), PID 0x%04X",
oui, val_to_str(oui, oui_vals, "Unknown"), etype);
}
if (tree) {
proto_tree_add_uint(snap_tree, hf_oui, tvb, offset, 3, oui);
}
switch (oui) {
case OUI_ENCAP_ETHER:
The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078; various Cisco documents indicate that 0000F8 is used on at least some Cisco boxes for bridging Ethernet frames onto 802.x+LLC frames. svn path=/trunk/; revision=3498
2001-06-02 03:04:12 +00:00
case OUI_CISCO_90:
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
case OUI_APPLE_ATALK:
/* No, I have no idea why Apple used
one of their own OUIs, rather than
OUI_ENCAP_ETHER, and an Ethernet
packet type as protocol ID, for
AppleTalk data packets - but used
OUI_ENCAP_ETHER and an Ethernet
The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078; various Cisco documents indicate that 0000F8 is used on at least some Cisco boxes for bridging Ethernet frames onto 802.x+LLC frames. svn path=/trunk/; revision=3498
2001-06-02 03:04:12 +00:00
packet type for AARP packets. */
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
if (XDLC_IS_INFORMATION(control)) {
ethertype(etype, tvb, offset+5,
Pull the handling of trailers in Ethernet (as opposed to 802.3) frames into "ethertype()". svn path=/trunk/; revision=2915
2001-01-18 07:44:41 +00:00
pinfo, tree, snap_tree, hf_type, -1);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
} else {
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
}
break;
case OUI_BRIDGED:
/*
* MAC frames bridged over ATM (RFC 2684) or Frame Relay
* (RFC 2427).
*
* We have to figure out how much padding to put
* into the frame. We were handed a "bridge_pad"
* argument which should be 0 for Frame Relay and
* 2 for ATM; we add to that the amount of padding
* common to both bridging types.
*/
if (tree) {
proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
etype);
}
switch (etype) {
case BPID_ETH_WITH_FCS:
case BPID_ETH_WITHOUT_FCS:
next_tvb = tvb_new_subset(tvb, offset+5+bridge_pad,
-1, -1);
call_dissector(eth_handle, next_tvb, pinfo, tree);
break;
case BPID_802_5_WITH_FCS:
case BPID_802_5_WITHOUT_FCS:
/*
* We treat the last padding byte as the Access
* Control byte, as that's what the Token
* Ring dissector expects the first byte to
* be.
*/
next_tvb = tvb_new_subset(tvb, offset+5+bridge_pad,
-1, -1);
call_dissector(tr_handle, next_tvb, pinfo, tree);
break;
case BPID_FDDI_WITH_FCS:
case BPID_FDDI_WITHOUT_FCS:
next_tvb = tvb_new_subset(tvb, offset+5+1+bridge_pad,
-1, -1);
call_dissector(fddi_handle, next_tvb, pinfo, tree);
break;
case BPID_BPDU:
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
call_dissector(bpdu_handle, next_tvb, pinfo, tree);
break;
default:
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
break;
}
break;
case OUI_CISCO:
/* So are all CDP packets LLC packets
with an OUI of OUI_CISCO and a
protocol ID of 0x2000, or
are some of them raw or encapsulated
Ethernet? */
if (tree) {
proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
etype);
}
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
if (XDLC_IS_INFORMATION(control)) {
/* do lookup with the subdissector table */
/* for future reference, 0x0102 is Cisco DRIP */
if (!dissector_try_port(cisco_subdissector_table,
etype, next_tvb, pinfo, tree))
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
} else
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
break;
case OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */
if (tree) {
proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
etype);
}
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
call_dissector(bpdu_handle, next_tvb, pinfo, tree);
break;
default:
if (tree) {
proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
etype);
}
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
call_dissector(data_handle,next_tvb, pinfo, tree);
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
break;
}
}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
void
proto_register_llc(void)
{
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
static struct true_false_string ig_bit = { "Group", "Individual" };
static struct true_false_string cr_bit = { "Response", "Command" };
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
static hf_register_info hf[] = {
{ &hf_llc_dsap,
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ "DSAP", "llc.dsap", FT_UINT8, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
VALS(sap_vals), 0x0, "", HFILL }},
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ &hf_llc_dsap_ig,
{ "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
&ig_bit, 0x0, "Individual/Group", HFILL }},
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_llc_ssap,
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ "SSAP", "llc.ssap", FT_UINT8, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
VALS(sap_vals), 0x0, "", HFILL }},
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ &hf_llc_ssap_cr,
{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
&cr_bit, 0x0, "Command/Response", HFILL }},
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_llc_ctrl,
For I and S frames, the LLC control field is 2 bytes, so make it FT_UINT16 (that won't break things for U frames, where it's 1 byte). svn path=/trunk/; revision=1838
2000-04-13 02:36:35 +00:00
{ "Control", "llc.control", FT_UINT16, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
NULL, 0x0, "", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
/* registered here but handled in ethertype.c */
{ &hf_llc_type,
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ "Type", "llc.type", FT_UINT16, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
VALS(etype_vals), 0x0, "", HFILL }},
Modified the proto_register_field_array usage again. Thanks to Guy's suggestion, this new method using a static array should use less memory and be faster. It also has a nice side-effect of making the source-code more readble, IMHO. Changed the print routines to look for protocol proto_data instead of looking at the text label as they did before, hoping that the data hex dump field item starts with "Data (". Added the -G keyword to ethereal to make it dump a glossary of display filter keywords to stdout and exit. This data is then formatted with the doc/dfilter2pod perl program to pod format, which is combined with doc/ethereal.pod.template to create doc/ethereal.pod, from which the ethereal manpage is created. This way we can keep the manpage up-to-date with a list of fields that can be filtered on. svn path=/trunk/; revision=364
1999-07-15 15:33:52 +00:00
{ &hf_llc_oui,
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ "Organization Code", "llc.oui", FT_UINT24, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
VALS(oui_vals), 0x0, "", HFILL }},
Don't assume that the OUI of all SNAP frames is 00-00-00; treat only frames with an OUI of 00-00-00 as SNAP-encapsulated Ethernet, and, for other SNAP frames, display the protocol ID as hex and dissect the payload as data. svn path=/trunk/; revision=1217
1999-12-05 09:45:32 +00:00
{ &hf_llc_pid,
Break out IG and CR bits of SSAP and DSAP Handle figuring out correct dsap/ssap if the last bit is 0/1 svn path=/trunk/; revision=1315
1999-12-13 21:48:18 +00:00
{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
From Joerg Mayer: explicitly fill in all members of a "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
NULL, 0x0, "", HFILL }}
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +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[] = {
&ett_llc,
&ett_llc_ctrl,
};
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
proto_llc = proto_register_protocol("Logical-Link Control", "LLC", "llc");
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
proto_register_field_array(proto_llc, hf, array_length(hf));
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
proto_register_subtree_array(ett, array_length(ett));
Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectors for protocols that run inside 802.2 LLC register themselves with it using "dissector_add()". Make various dissectors static if they can be, and remove from header files declarations of those dissectors. svn path=/trunk/; revision=1872
2000-04-17 00:32:43 +00:00
/* subdissector code */
Attach a descriptive name field type and base to dissector tables; that specifies how the selector values used as keys in those tables are to be displayed, and the title to use when displaying the table. Use that information in the code to display the initial and current entries of various dissector tables. Have the dissector for BACnet APDUs register itself by name, and have the BACnet NPDU dissector call it iff the BAC_CONTROL_NET bit isn't set, rather than doing it with a dissector table. svn path=/trunk/; revision=4358
2001-12-08 06:41:48 +00:00
subdissector_table = register_dissector_table("llc.dsap",
"LLC SAP", FT_UINT8, BASE_HEX);
cisco_subdissector_table = register_dissector_table("llc.cisco_pid",
"Cisco OUI PID", FT_UINT16, BASE_HEX);
Have the TR MAC and LLC dissectors register themselves, make them static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
2001-01-03 10:34:42 +00:00
Add an additional "protocol index" argument to "{old_}dissector_add()", "{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
2001-01-09 06:32:10 +00:00
register_dissector("llc", dissect_llc, proto_llc);
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
}
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
void
proto_reg_handoff_llc(void)
{
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
dissector_handle_t llc_handle;
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
/*
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
* Get handles for the BPDU, Ethernet, FDDI, and Token Ring
* dissectors.
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
*/
bpdu_handle = find_dissector("bpdu");
Make the stuff to handle SNAP frames (OUI, PID, payload) a routine of its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-10 09:07:35 +00:00
eth_handle = find_dissector("eth");
fddi_handle = find_dissector("fddi");
tr_handle = find_dissector("tr");
Moved from using dissect_data to using call_dissector() svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
data_handle = find_dissector("data");
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors. Add a new subdissector table in the LLC dissector for protocol IDs with a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that table, rather than calling them via a switch statement. Register the ISL dissector by name, and have the Ethernet dissector call it via a handle. Fix the handling of the checksum field in the CDP dissector. The strings in CDP are counted, not null-terminated; treat them as such. Fix the handling of the encapsulated frame CRC, and the encapsulated frame, in the ISL dissector, at least for Ethernet frames; it may not be correct for encapsulated Token Ring frames. svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
Make "dissector_add()", "dissector_delete()", and "dissector_change()" take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
llc_handle = find_dissector("llc");
dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
Tvbuffify the STP dissector, have it register itself and have the LLC dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
2000-11-16 07:35:43 +00:00
}