aboutsummaryrefslogtreecommitdiffstats
path: root/packet-llc.c
Commit message (Collapse)AuthorAgeFilesLines
* Include files from the "epan" directory and subdirectories thereof withGuy Harris2002-01-211-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
* Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOLGuy Harris2002-01-201-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
* Move the pointer to the "column_info" structure in the "frame_data"Guy Harris2001-12-101-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
* Attach a descriptive name field type and base to dissector tables; thatGuy Harris2001-12-081-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
* Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris2001-12-031-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
* Moved from using dissect_data to using call_dissector()Ed Warnicke2001-11-251-8/+10
| | | | svn path=/trunk/; revision=4264
* Make the capture routines take an additional argument giving the amountGuy Harris2001-11-201-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
* Hopefully the last time I have to change my e-mail address.Gilbert Ramirez2001-11-131-2/+2
| | | | svn path=/trunk/; revision=4199
* From Joerg Mayer: explicitly fill in all members of aGuy Harris2001-06-181-9/+9
| | | | | | | "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
* The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078;Guy Harris2001-06-021-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
* Some Cisco 802.11 bridges apparently change the OUI of packets fromGuy Harris2001-06-011-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
* NLPID's of 0x08 and 0x09 should be labeled as Q.933 and LMI,Guy Harris2001-03-301-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
* Move appletalk- and sna-related address routines out of the dissectorsGilbert Ramirez2001-03-221-2/+2
| | | | | | and into epan. svn path=/trunk/; revision=3160
* Remove some more "CHECK_DISPLAY_AS_DATA()" calls and code to setGuy Harris2001-01-211-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
* Pull the handling of trailers in Ethernet (as opposed to 802.3) framesGuy Harris2001-01-181-2/+2
| | | | | | into "ethertype()". svn path=/trunk/; revision=2915
* "dissect_llc()" is called for RFC 2684 LLC Encapsulation over ATM, soGuy Harris2001-01-111-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
* Make the stuff to handle SNAP frames (OUI, PID, payload) a routine ofGuy Harris2001-01-101-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
* Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris2001-01-091-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
* X.25-over-LLC support, from Paul Ionescu.Guy Harris2001-01-051-6/+6
| | | | svn path=/trunk/; revision=2829
* Clear the Info column before fetching anything from the packet, so thatGuy Harris2001-01-051-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
* Have the TR MAC and LLC dissectors register themselves, make themGuy Harris2001-01-031-2/+4
| | | | | | static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
* Have "proto_register_protocol()" build a list of data structures forGuy Harris2001-01-031-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
* Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.Guy Harris2000-12-281-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
* Wrap the dissect_fddi() call (with a 4th argument) withGilbert Ramirez2000-11-291-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
* For each column, have both a buffer into which strings for that columnGuy Harris2000-11-191-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
* Tvbuffify the STP dissector, have it register itself and have the LLCGuy Harris2000-11-161-9/+19
| | | | | | | | | | | 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
* Include the control-field information in the Info column for LLC frames.Guy Harris2000-08-251-9/+4
| | | | svn path=/trunk/; revision=2370
* Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel2000-08-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the following: It is now possible to enable/disable a particular protocol decoding (i.e. the protocol dissector is void or not). When a protocol is disabled, it is displayed as Data and of course, all linked sub-protocols are disabled as well. Disabling a protocol could be interesting: - in case of buggy dissectors - in case of wrong heuristics - for performance reasons - to decode the data as another protocol (TODO) Currently (if I am not wrong), all dissectors but NFS can be disabled (and dissectors that do not register protocols :-) I do not like the way the RPC sub-dissectors are disabled (in the sub-dissectors) since this could be done in the RPC dissector itself, knowing the sub-protocol hfinfo entry (this is why, I've not modified the NFS one yet). Two functions are added in proto.c : gboolean proto_is_protocol_enabled(int n); void proto_set_decoding(int n, gboolean enabled); and two MACROs which can be used in dissectors: OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree) CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree) See also the XXX in proto_dlg.c and proto.c around the new functions. svn path=/trunk/; revision=2267
* Don't bump "offset" in the non-SNAP case - it hasn't been set, and weGuy Harris2000-08-111-3/+1
| | | | | | don't use it there. svn path=/trunk/; revision=2252
* Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris2000-08-071-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add routines for adding items to a protocol tree that take arguments ofGuy Harris2000-05-311-11/+11
| | | | | | | | | | | | | | | | | 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
* Convert LAPD and V.120 dissector to use tvbuff. Convert xdlc dissector-helper,Gilbert Ramirez2000-05-311-4/+3
| | | | | | too. svn path=/trunk/; revision=2030
* In the FDDI and LLC dissectors, extract fields as we use them, so thatGuy Harris2000-05-281-6/+9
| | | | | | | 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
* Use "tvb_get_ntoh24()" to extract the OUI from a SNAP header, ratherGuy Harris2000-05-281-4/+2
| | | | | | | than extracting each byte with "tvb_get_guint8()" and then putting them together. svn path=/trunk/; revision=2020
* Add protection against 0-length FT_BYTES being added to proto_tree.Gilbert Ramirez2000-05-191-3/+3
| | | | | | Convert ethertype() and dissect_null() to use tvbuff. svn path=/trunk/; revision=1979
* Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length'Gilbert Ramirez2000-05-161-3/+3
| | | | | | | | | | | | | | | 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
* In wiretap, set err to 0 before doing anything inside wtap_loop().Gilbert Ramirez2000-05-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | Tethereal was dying on me because err was initialized to some random value. It was this section of code that would exit even if wtap_loop was successful (returned TRUE) because err was never initialized or set to anything. err = load_cap_file(&cf, out_file_type); if (err != 0) { dissect_cleanup(); exit(2); } <BIGGER sheepish grin> Fixed even more errors in LLC dissector. I had inadvertantly used the wrong tvbuff_t* when calling dissect_data_tvb(). There is no way we are going to be successful in this tvbuff conversion w/o regression testing. I'm working on setting up a simple Makefile for regression testing tonight. That's why I'm finding so many bugs in my LLC conversion. </BIGGER sheepish grin> svn path=/trunk/; revision=1946
* <sheepish grin>Gilbert Ramirez2000-05-121-7/+7
| | | | | | | | | | Fix error in my conversion to tvbuff routines. Because offset was calculated based on next_tvb, which already knew to skip 8 bytes, I don't have to use "offset+8" in calls to the next non-tvbuff dissectors. </sheepish grin> svn path=/trunk/; revision=1945
* Convert LLC dissector to use tvbuffs.Gilbert Ramirez2000-05-111-56/+65
| | | | | | | | 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
* Add tvbuff class.Gilbert Ramirez2000-05-111-10/+10
| | | | | | | | | | | | | | | Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
* Register a "llc.dsap" dissector table for 802.2 LLC, and have dissectorsGuy Harris2000-04-171-81/+47
| | | | | | | | | | 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
* For I and S frames, the LLC control field is 2 bytes, so make itGuy Harris2000-04-131-2/+2
| | | | | | FT_UINT16 (that won't break things for U frames, where it's 1 byte). svn path=/trunk/; revision=1838
* Change my e-mail address from @tivoli.com to @xiexie.orgGilbert Ramirez2000-04-121-2/+2
| | | | svn path=/trunk/; revision=1831
* Add DOCSIS BPDU patch from Johannes Hennecke <Johannes.Hennecke@elsa.de>.Gerald Combs2000-04-101-1/+10
| | | | svn path=/trunk/; revision=1826
* The "llc_ctrl_vals[]" value_string table isn't used to generate theGuy Harris2000-04-091-3/+5
| | | | | | | | | | 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
* The "llc_ctrl_vals[]" value_string table isn't used to generate theGuy Harris2000-04-081-10/+2
| | | | | | | | | | 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 more fully describe the field). Eliminate it. svn path=/trunk/; revision=1824
* Create a header file for every packet-*.c file. Prune the packet.h file.Gilbert Ramirez2000-02-151-2/+11
| | | | | | | | | | | | | 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
* Squelch a complaint from Visual C++ 6.0 (the code was OK beforehand, atGuy Harris2000-02-121-2/+2
| | | | | | | | least as I remember the ANSI C standard, but I guess they're warning you that you might've intended to return the return value of a function but forgot to put a parameter list after the function name). svn path=/trunk/; revision=1626
* Note the document that specified the PIDs for VTP and DRiP that go alongGuy Harris2000-02-051-1/+14
| | | | | | | 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
* Dissector for Cisco's Virtual Trunking Protocol.Guy Harris2000-02-051-1/+5
| | | | svn path=/trunk/; revision=1603
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 14:04:02 +0000