aboutsummaryrefslogtreecommitdiffstats
path: root/packet-llc.c
AgeCommit message (Collapse)AuthorFilesLines
2004-07-18Move dissectors to epan/dissectors directory.Gilbert Ramirez1-750/+0
Also move ncp222.py, x11-fields, process-x11-fields.pl, make-reg-dotc, and make-reg-dotc.py. Adjust #include lines in files that include packet-*.h files. svn path=/trunk/; revision=11410
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-01-18Add arguments to "dissect_xdlc_control()" to specify value_stringGuy Harris1-2/+2
tables, for use in the top-level item for the control field, for unnumbered frame function codes for commands and responses. If the argument is null, default to the standard tables. Use "dissect_xdlc_control()" and the #defines from "xdlc.h" for IrDA. Use the reported length rather than the data length in the IrDA dissector when iterating over the data in an IrDA packet. Make "dissect_xid()" update the column information as well as the protocol tree. Put the slot number into the protocol tree only for command frames - "the slot number field is undefined in discovery XID response frames", to quote the IrLAP spec. svn path=/trunk/; revision=9713
2004-01-03Have "dissect_xdlc_control()" take a pointer to a structure containingGuy Harris1-1/+88
pointers to hf_ values, so the subfields of the control field are put into the protocol tree as filterable items. Change the protocols that use it appropriately. Export "dissect_xdlc_control()" to plugins. svn path=/trunk/; revision=9531
2003-10-01Have a pseudo-header for Ethernet packets, giving the size of the FCS -Guy Harris1-2/+2
0 means "there is no FCS in the packet data", 4 means "there is an FCS in the packet data", -1 means "I don't know whether there's an FCS in the packet data, guess based on the packet size". Assume that Ethernet encapsulated inside other protocols has no FCS, by having the "eth" dissector assume that (and not check for an Ethernet pseudo-header). Have "ethertype()" take an argument giving the FCS size; pass 0 when appropriate. Fix up Wiretap routines to set the pseudo-header. This means we no longer use the "generic" seek-and-read routine, so get rid of it. svn path=/trunk/; revision=8574
2003-09-03As with the Cisco OUI, so with the Nortel OUI.Guy Harris1-24/+2
svn path=/trunk/; revision=8352
2003-09-03Fix up the API for adding support for new OUI's to the LLC dissector.Guy Harris1-39/+26
Use that API to create the table for the Cisco OUI 00:00:0C. svn path=/trunk/; revision=8351
2003-09-02Use "dissect_xdlc_control()" to dissect the control field of Frame RelayGuy Harris1-2/+2
packets that have one. Add an argument to "dissect_xdlc_control()" to indicate whether it should append the information to the Info field or just put it in the Info field. Use the #defines for the DLCI bitfields to extract the DLCI bits when constructing the DLCI. svn path=/trunk/; revision=8335
2003-08-28Add an API to let a dissector register a dissector table and field for aGuy Harris1-3/+72
given OUI; the field is used when the PID for that OUI is put into the protocol tree, and the dissector table is used to find a dissector for that PID. Not yet used, thus not yet tested; API is subject to change. (Eventually, several of the cases in the big switch statement in "dissect_llc()" should be handled by registering information for those OUIs.) svn path=/trunk/; revision=8291
2003-08-28From Giles Scott: Nortel/SynOptics Network Management Protocol support.Guy Harris1-1/+23
svn path=/trunk/; revision=8290
2003-06-10Add support for some additional SAPs for Netware and OSI.Guy Harris1-4/+10
svn path=/trunk/; revision=7824
2003-04-18Handle non-SNAP LLC Vines packets as such when capturing.Guy Harris1-1/+7
svn path=/trunk/; revision=7485
2003-03-02From Jochen Friedrich: add support for:Guy Harris1-3/+3
HP extended 802.2 LLC HP-UX remote management over HP extended 802.2 LLC SNMP over HP extended 802.2 LLC. svn path=/trunk/; revision=7253
2003-02-13From Jochen Friedrich:Guy Harris1-10/+32
Fixed handling of NLP header in SNA XID handoff table for LLC, and XID dissection for SNA format 3 HPR optional segments in SNA Most important control vectors in SNA Route setup messages in SNA Additional LLC DSAPs for SNA svn path=/trunk/; revision=7131
2003-01-25From Dave Richards: BACNET-over-ARCNET is BACNET-over-802.2-over-ARCNET,Guy Harris1-1/+8
not BACNET-directly-over-ARCNET. svn path=/trunk/; revision=7000
2002-12-10Move the handling of the Network_Header for full FC frames into the FCGuy Harris1-1/+4
dissector, and have the LLC dissector register itself as the dissector for IP-over-FC frames, as the payload is just an LLC 802.2 header plus payload for the protocol specified by that header. In the dissector for IP-over-FC as a Wiretap link-layer type, have its top-level item be a protocol item rather than a text item, and don't register it as the dissector for IP-over-FC frames from the FC dissector - it assumes what it's handed includes the Network_Header, but for full FC frames, the FC dissector has already consumed the Network_Header. Move the definitions of the value_string tables out of the header file; most of them are used only in one file, so define them in that file, and for "fc_fc4_val", define it in "packet-fc.c", make it not static, and declare it in "packet-fc.h". Use FALSE, rather than 0, as the last argument to "proto_tree_add_item()" calls that add a big-endian value. Fix one "proto_tree_add_uint()" call that was supposed to be a "proto_tree_add_item()" call. Use "%u", not "%d", to display unsigned values. svn path=/trunk/; revision=6773
2002-12-08Do LLC handoff from the IP-over-FC dissector the way it's done for otherGuy Harris1-2/+1
protocols using 802.2 LLC. svn path=/trunk/; revision=6765
2002-12-08From Dinesh Dutt: Add Fibre Channel support, including FCIP, Basic FCGerald Combs1-1/+2
header, Extended Link Service, Interswitch Link Service, FCP, and IPFC. svn path=/trunk/; revision=6757
2002-11-16From Dave Richards: support BACNET over 802.2.Guy Harris1-1/+2
svn path=/trunk/; revision=6644
2002-11-05Show the SAP values in RPL packets symbolically if possible.Guy Harris1-2/+2
svn path=/trunk/; revision=6564
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-19/+19
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-6/+2
equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
2002-05-29From Jochen Friedrich: RFC 2353 SNA-over-LLC-over-UDP support, and RFC 2043Guy Harris1-1/+16
SNA-over-PPP and SNA-over-LLC-over-PPP support. svn path=/trunk/; revision=5587
2002-04-24From Joerg Mayer: get rid of extra arguments to capture routines.Guy Harris1-43/+17
svn path=/trunk/; revision=5233
2002-03-31From Joerg Mayer: get rid of unused function arguments.Guy Harris1-3/+2
svn path=/trunk/; revision=5053
2002-01-21Include files from the "epan" directory and subdirectories thereof withGuy Harris1-3/+3
"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-20Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOLGuy Harris1-2/+2
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
2001-12-10Move the pointer to the "column_info" structure in the "frame_data"Guy Harris1-9/+9
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-08Attach a descriptive name field type and base to dissector tables; thatGuy Harris1-3/+5
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-03Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris1-3/+5
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-11-25Moved from using dissect_data to using call_dissector()Ed Warnicke1-8/+10
svn path=/trunk/; revision=4264
2001-11-20Make the capture routines take an additional argument giving the amountGuy Harris1-11/+10
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-13Hopefully the last time I have to change my e-mail address.Gilbert Ramirez1-2/+2
svn path=/trunk/; revision=4199
2001-06-18From Joerg Mayer: explicitly fill in all members of aGuy Harris1-9/+9
"header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-02The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078;Guy Harris1-14/+5
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-01Some Cisco 802.11 bridges apparently change the OUI of packets fromGuy Harris1-4/+15
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-03-30NLPID's of 0x08 and 0x09 should be labeled as Q.933 and LMI,Guy Harris1-2/+1
respectively, not Q.931 and Q.2931, in Frame Relay. When dissecting Q.933-style multiprotocol encapsulated Frame Relay frames, use the "osinl" dissector table to check for OSI network layer protocols, include the NLPID in the tvbuff you hand to "dissector_try_port()" with that dissector table, and put the NLPID into the protocol tree as an invisible item - the NLPID is considered part of the PDU for those protocols, so you have to include it in the tvbuff, and the dissector will put it into the protocol tree. Also, make sure the top-level entry for the Frame Relay protocol includes all the bytes preceding the payload, and none of the payload bytes. Export a routine to do Q.933-style dissection, and have the WCP dissector call it, rather than duplicating that code in the WCP dissector. Don't register OSI network layer protocols with the "fr.ietf" dissector table; it's now sufficient to register them with the "osinl" dissector table, as the Frame Relay dissector now checks that. Get rid of unnecessary checks for protocols being enabled (if the dissector is always called through handles or dissector tables, the common code for handles and dissector tables will do the checks for you). Get rid of some unnecessary #includes. svn path=/trunk/; revision=3211
2001-03-22Move appletalk- and sna-related address routines out of the dissectorsGilbert Ramirez1-2/+2
and into epan. svn path=/trunk/; revision=3160
2001-01-21Remove some more "CHECK_DISPLAY_AS_DATA()" calls and code to setGuy Harris1-5/+1
"pinfo->current_proto", in dissectors always called through dissector tables and handles. Make the IEEE 802.11 dissector static, as it's not called externally. Clear the Info column in the Linux cooked capture and 802.1q VLAN dissectors, before extracting anything from the packet, so that if an exception is thrown, the Info column doesn't reflect the previous protocol. Don't extract the encapsulated protocol in the VLAN dissector until you use it, so that if the frame contains the VLAN ID but not the encapsulated protocol, we at least put the VLAN ID into the protocol tree. svn path=/trunk/; revision=2927
2001-01-18Pull the handling of trailers in Ethernet (as opposed to 802.3) framesGuy Harris1-2/+2
into "ethertype()". svn path=/trunk/; revision=2915
2001-01-11"dissect_llc()" is called for RFC 2684 LLC Encapsulation over ATM, soGuy Harris1-12/+2
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-10Make the stuff to handle SNAP frames (OUI, PID, payload) a routine ofGuy Harris1-77/+168
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-09Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris1-3/+4
"{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-05X.25-over-LLC support, from Paul Ionescu.Guy Harris1-6/+6
svn path=/trunk/; revision=2829
2001-01-05Clear the Info column before fetching anything from the packet, so thatGuy Harris1-1/+4
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-03Have the TR MAC and LLC dissectors register themselves, make themGuy Harris1-2/+4
static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
2001-01-03Have "proto_register_protocol()" build a list of data structures forGuy Harris1-3/+3
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
2000-12-28Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.Guy Harris1-27/+8
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-11-29Wrap the dissect_fddi() call (with a 4th argument) withGilbert Ramirez1-1/+2
dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which use the standard 3-argument tvbuffified-dissector argument list. Add a dissector table called "wtap_encap" which is used to call dissectors from dissect_frame(). The switch() statement from this top-level dissector is removed. The link-layer dissectors register themselves with the "wtap_encap" dissector table. The dissectors are now static where possible. svn path=/trunk/; revision=2708
2000-11-19For each column, have both a buffer into which strings for that columnGuy Harris1-2/+2
can be put, and a pointer to the string for the column, which might or might not point to that buffer. Add a routine "col_set_str()", which sets the string for the column to the string passed to it as an argument; it should only be handed a static string (a string constant would be ideal). It doesn't do any copying, so it's faster than "col_add_str()". Make the routines that append to columns check whether the pointer to the string for the column points to the buffer for the column and, if not, copy the string for the column to the buffer for the column so that you can append to it (so you can use "col_set_str()" and then use "col_append_str()" or "col_append_fstr()"). Convert a bunch of "col_add_str()" calls that take a string constant as an argument to "col_set_str()" calls. Convert some "col_add_fstr()" calls that take a string constant as the only argument - i.e., the format string doesn't have any "%" slots into which to put strings for subsequent arguments to "col_set_str()" calls (those calls are just like "col_add_str()" calls). Replace an END_OF_FRAME reference in a tvbuffified dissector with a "tvb_length(tvb)" call. svn path=/trunk/; revision=2670