aboutsummaryrefslogtreecommitdiffstats
path: root/packet-trmac.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove some more "CHECK_DISPLAY_AS_DATA()" calls and code to setGuy Harris2001-01-211-4/+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
* Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris2001-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | "{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
* Clear the Info column before fetching anything from the packet, so thatGuy Harris2001-01-051-1/+3
| | | | | | | if we throw an exception, the stuff from the Token-Ring protocol isn't still there. svn path=/trunk/; revision=2827
* 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-2/+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
* 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
* Add #include <string.h>, to get prototypes for mem* and str* functions.Gilbert Ramirez2000-11-171-1/+2
| | | | svn path=/trunk/; revision=2654
* 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
* tvbuff-ify the TR MAC dissector.Gilbert Ramirez2000-06-201-85/+83
| | | | svn path=/trunk/; revision=2081
* Add routines for adding items to a protocol tree that take arguments ofGuy Harris2000-05-311-19/+19
| | | | | | | | | | | | | | | | | 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
* Add tvbuff class.Gilbert Ramirez2000-05-111-43/+43
| | | | | | | | | | | | | | | 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
* Break proto_tree_add_item_format() into multiple functions:Gilbert Ramirez2000-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proto_tree_add_protocol_format() proto_tree_add_uint_format() proto_tree_add_ipxnet_format() proto_tree_add_ipv4_format() proto_tree_add_ipv6_format() proto_tree_add_bytes_format() proto_tree_add_string_format() proto_tree_add_ether_format() proto_tree_add_time_format() proto_tree_add_double_format() proto_tree_add_boolean_format() If using GCC 2.x, we can check the print-format against the variable args passed in. Regardless of compiler, we can now check at run-time that the field type passed into the function corresponds to what that function expects (FT_UINT, FT_BOOLEAN, etc.) Note that proto_tree_add_protocol_format() does not require a value field, since the value of a protocol is always NULL. It's more intuitive w/o the vestigial argument. Fixed a proto_tree_add_item_format-related bug in packet-isis-hello.c Fixed a variable usage bug in packet-v120.c. (ett_* was used instead of hf_*) Checked in Guy's fix for the function declearation for proto_tree_add_text() and proto_tree_add_notext(). svn path=/trunk/; revision=1713
* Fix files that had Gilbert's old e-mail address or that didn't have myGuy Harris2000-01-221-2/+2
| | | | | | forwarding e-mail address. svn path=/trunk/; revision=1522
* Fix Gerald's e-mail address.Guy Harris2000-01-071-2/+2
| | | | svn path=/trunk/; revision=1437
* Replace the ETT_ "enum" members, declared in "packet.h", withGuy Harris1999-11-161-4/+14
| | | | | | | | | | | | | | | | | 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
* New proto_tree header_field_info stuff. Header_field_infos now containGilbert Ramirez1999-10-121-19/+37
| | | | | | | | | | | | | | | | | | | | | the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
* Changed short packet handling in TR code to understand minimum-lengthGilbert Ramirez1999-09-171-50/+110
| | | | | | | TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
* Removed two cases where protocol decoding assumed that the data in theGilbert Ramirez1999-09-091-3/+10
| | | | | | packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
* Made the protocol (but not the fields) use the new proto_tree routine,Gilbert Ramirez1999-07-291-7/+19
| | | | | | | 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
* Created a new protocol tree implementation and a new display filterGilbert Ramirez1999-07-071-48/+45
| | | | | | | 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
* Removed all references to gtk objects from packet*.[ch] files. They nowGilbert Ramirez1999-03-231-67/+55
| | | | | | | | | | 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
* Small fixes for alignment, and #include for gtk+-1.1.x/glib-1.1.xGilbert Ramirez1999-03-011-3/+3
| | | | svn path=/trunk/; revision=197
* Fixed a bug regarding bad packets. If a sub-vector indicated a 0-length,Gilbert Ramirez1999-01-121-3/+10
| | | | | | | dissect_trmac() would spin in an infinite loop. Now that condition is checked and properly handled. svn path=/trunk/; revision=168
* * Added column formatting functionality.Gerald Combs1998-11-171-5/+5
| | | | | | | | * Added check_col(), add_col_str() and add_col_fmt() to replace references to ft->win_info. * Added column prefs handling code. svn path=/trunk/; revision=97
* A lengthy patch to add the wiretap library. Wiretap is not used by defaultGilbert Ramirez1998-11-121-2/+1
| | | | | | | | | | because it is still in its infancy, but it can be compiled in optionally. The library exists in its own subdirectory ethereal/wiretap. This patch also edits all the packet-*.c files to remove the #include <pcap.h> line which is unnecessary in these files. In the ethereal code, file.c is the most heavily modified with #ifdef WITH_WIRETAP lines for the optional library. svn path=/trunk/; revision=82
* Silly mistake which caused if(tree) to fail.Gilbert Ramirez1998-10-221-3/+3
| | | | svn path=/trunk/; revision=68
* Removed some routines in support of match_strval function.Gilbert Ramirez1998-10-211-37/+18
| | | | svn path=/trunk/; revision=67
* * OSPF alignment fixes (Gerald)Gerald Combs1998-10-101-1/+5
| | | | | | * FDDI support (Laurent, Guy) svn path=/trunk/; revision=36
* Merged in a _huge_ patch from Guy Harris. It adds a time stap column,Gerald Combs1998-09-271-6/+6
| | | | | | | generalizes the column printing code, adds a "frame" tree item to the tree view, and fixes a bunch of miscellaneous coding bugs. svn path=/trunk/; revision=31
* Added ID tags to the beginning of each source file.Gerald Combs1998-09-161-0/+2
| | | | svn path=/trunk/; revision=7
* Initial revisionstartethereal-0.3.15ethereal-0-3-15backups/ethereal@18706etherealGerald Combs1998-09-161-0/+322
svn path=/trunk/; revision=2