aboutsummaryrefslogtreecommitdiffstats
path: root/packet-atalk.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="Guy Harris2001-01-221-24/+17
| | | | | | | | | | | | | | | | | | | statements. Move the setting of the Protocol column in various dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Make the IP dissector static, as it's called only via dissector tables or dissector handles. Also make the "dissect the TOS field as the DiffServ DS field" flag static, as it's not referred to outside of "packet-ip.c". In the NCP dissector, refer to the port type through "pinfo" rather than through the global "pi", as it's a tvbuffified dissector. svn path=/trunk/; revision=2929
* Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris2001-01-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | "{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
* Have "proto_register_protocol()" build a list of data structures forGuy Harris2001-01-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* The source operand of "SET_ADDRESS()" has to be static, as a pointer toGuy Harris2000-11-191-2/+2
| | | | | | it is saved. svn path=/trunk/; revision=2669
* Give the "null" link-layer header dissector a dissector table, and putGuy Harris2000-11-171-2/+4
| | | | | | | the BSD AF_ type values it uses into an "aftypes.h" header file for dissectors that register themselves in that dissector table include. svn path=/trunk/; revision=2653
* Tvbuffify the STP dissector, have it register itself and have the LLCGuy Harris2000-11-161-2/+2
| | | | | | | | | | | 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
* Use "tvb_offset_exists()" rather than "tvb_length_remaining()" to checkGuy Harris2000-11-131-2/+2
| | | | | | | whether there's any data left in the tvbuff starting at a specified offset. svn path=/trunk/; revision=2636
* Tvbuffify the AppleTalk dissectors.Guy Harris2000-11-131-186/+213
| | | | | | | | | | | | | Dissect RTMP requests, as well as RTMP data packets. Call it "Routing Table Maintenance Protocol", not just "Routing Table". Print unsigned quantities with "%u", not "%d". Correctly handle extended vs. non-extended networks in RTMP data packets, as per *Inside AppleTalk(R), Second Edition*. svn path=/trunk/; revision=2627
* Don't have separate versions of "ddp_hops()" and "ddp_len()" onGuy Harris2000-11-111-11/+11
| | | | | | | | | | | | big-endian and little-endian platforms; just put "ddp.hops_len" in host byte order and have one version. (This removes one usage of BIG_ENDIAN and LITTLE_ENDIAN from Ethereal - our redefining of them causes warnings on FreeBSD 3.4, so I'd like not to export them to all the dissectors if possible - and also fixes "ddp_hops()" to work correctly on little-endian machines, as the little-endian version wasn't byte-swapping its argument.) svn path=/trunk/; revision=2609
* Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel2000-08-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris2000-08-071-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-29/+29
| | | | | | | | | | | | | | | | | 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
* Give the IPX dissector dissector hash tables for the IPX type and socketGuy Harris2000-05-301-2/+1
| | | | | | | number, and have the protocols encapsulated inside IPX register themselves with that table. svn path=/trunk/; revision=2028
* Give the Appletalk DDP dissector a dissector hash table, and have theGuy Harris2000-05-281-28/+13
| | | | | | | | | protocols encapsulated inside DDP register themselves with that table. Pull the EIGRP dissector into its own file, as suggested by Paul Ionescu; it's not an IP-specific protocol. svn path=/trunk/; revision=2022
* EIGRP over Appletalk and EIGRP over IPX support, from Paul Ionescu.Guy Harris2000-05-221-1/+7
| | | | svn path=/trunk/; revision=1994
* Add tvbuff class.Gilbert Ramirez2000-05-111-34/+34
| | | | | | | | | | | | | | | 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 "ppp.protocol" dissector table for PPP, and have dissectorsGuy Harris2000-04-161-1/+3
| | | | | | | for protocols that run inside PPP register themselves with it using "dissector_add()". svn path=/trunk/; revision=1869
* Change the sub-dissector handoff registration routines so that theGilbert Ramirez2000-04-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-dissector table is not stored in the header_field_info struct, but in a separate namespace. Dissector tables are now registered by name and not by field ID. For example: udp_dissector_table = register_dissector_table("udp.port"); Because of this different namespace, dissector tables can have names that are not field names. This is useful for ethertype, since multiple fields are "ethertypes". packet-ethertype.c replaces ethertype.c (the name was changed so that it would be named in the same fashion as all the filenames passed to make-reg-dotc) Although it registers no protocol or field, it registers one dissector table: ethertype_dissector_table = register_dissector_table("ethertype"); All protocols that can be called because of an ethertype field now register that fact with dissector_add() calls. In this way, one dissector_table services all ethertype fields (hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype) Furthermore, the code allows for names of protocols to exist in the etype_vals, yet a dissector for that protocol doesn't exist. The name of the dissector is printed in COL_INFO. You're welcome, Richard. :-) svn path=/trunk/; revision=1848
* 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
* cleaned up nbp and added rtmp dissectorNathan Neulinger1999-12-091-12/+143
| | | | svn path=/trunk/; revision=1262
* cleanup/renaming of fields for nbp dissectorNathan Neulinger1999-12-091-13/+17
| | | | svn path=/trunk/; revision=1261
* Get rid of an unused variable.Guy Harris1999-12-091-2/+1
| | | | svn path=/trunk/; revision=1256
* extended nbp dissector, is stable, but i believe it's not completely correct yetNathan Neulinger1999-12-091-2/+107
| | | | svn path=/trunk/; revision=1253
* started nbp dissectorNathan Neulinger1999-12-081-4/+75
| | | | svn path=/trunk/; revision=1251
* fix stupid atalk typo and remove other proto names stuffNathan Neulinger1999-12-081-12/+13
| | | | svn path=/trunk/; revision=1249
* added a couple of ddp protocol names based on looking at packets in ↵Nathan Neulinger1999-12-081-2/+32
| | | | | | genbroad.snoop, added placeholder routines for nbp and rtmp dissection svn path=/trunk/; revision=1248
* Remove #include "globals.h" from packet-atalk.c (not needed) and fromGilbert Ramirez1999-12-061-2/+1
| | | | | | | packet-ipv6.h. Of all the files that include packet-ipv6.h, only ipproto.c needs "globals.h", so I put the #include in ipproto.c svn path=/trunk/; revision=1229
* Replace the ETT_ "enum" members, declared in "packet.h", withGuy Harris1999-11-161-2/+8
| | | | | | | | | | | | | | | | | 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
* Include <netinet/in.h> before including "global.h", so that if - asGuy Harris1999-11-041-5/+5
| | | | | | | | | appears to be the case on AIX 4.3.2 - it defines BIG_ENDIAN or LITTLE_ENDIAN differently from the way "global.h" defines them, and also defines BYTE_ORDER, we don't get a compiler warning - instead, "global.h" refrains from defining them (as BYTE_ORDER is defined). svn path=/trunk/; revision=970
* We *do* need <netinet/in.h> on Debian (and probably other Linuxes, andGuy Harris1999-11-031-1/+5
| | | | | | | | | | quite possibly other UNIX-flavored OSes), in order to declare "ntohs()" and the like. Put the include back (I guess we could include "global.h" after including it, or move the byte-order stuff into a separate header file and include *that* after <netinet.h>, in order to squelch the complaints somebody saw compiling on AIX). svn path=/trunk/; revision=969
* Don't include <netinet/in.h>; at least on AIX 4.3.2, that causesGuy Harris1999-11-031-5/+1
| | | | | | | | | | <sys/machine.h> to be included (presumably to define the machine's byte order, to declare the "ntoh" and "hton" routines/macros correctly), which causes BIG_ENDIAN and LITTLE_ENDIAN to be defined, but that's done after we've included "globals.h", so they're already defined, and the compiler complains. We don't need it (at least not on FreeBSD). svn path=/trunk/; revision=967
* Give DDP packets their own ETT_ type, rather than using ETT_IP.Guy Harris1999-10-291-2/+3
| | | | | | Call "dissect_data()" on the payload of a DDP packet. svn path=/trunk/; revision=948
* Get rid of an "extern" before the definition of "atalk_addr_to_str()".Guy Harris1999-10-221-4/+4
| | | | | | | | | | Print the fields of a DDP address as unsigned quantities. The maximum length of the string for a DDP address is 13 characters (plus a trailing '\0'); adjust the lengths of the buffers in "atalk_addr_to_str()". svn path=/trunk/; revision=912
* Add support for Appletalk DDP addresses to the code that handles theGuy Harris1999-10-221-16/+46
| | | | | | | | | | "address" type. Use that in the Appletalk DDP dissector. Show the DDP packet type by name, if it's a known packet type. svn path=/trunk/; revision=911
* New proto_tree header_field_info stuff. Header_field_infos now containGilbert Ramirez1999-10-121-11/+30
| | | | | | | | | | | | | | | | | | | | | 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
* - add display filtersLaurent Deniel1999-10-071-19/+55
| | | | | | - check for truncated header svn path=/trunk/; revision=782
* Give it an RCS ID.Guy Harris1999-09-231-0/+2
| | | | svn path=/trunk/; revision=706
* Some old CPP or tools that take C code in input doLaurent Deniel1999-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | not like #preprocessor_macros that do not start at the first column. So write: #ifdef FOO # include <dummy1.h> # define DUMMY 1 #else # include <dummy2.h> # define DUMMY 2 #endif instead of #ifdef FOO #include <dummy1.h> #define DUMMY 1 #else #include <dummy2.h> #define DUMMY 2 #endif svn path=/trunk/; revision=668
* Give "globals.h" an RCS ID and copyright/GPL notice.Guy Harris1999-09-101-0/+1
| | | | | | | | | | | | | | | | | Move some defines that would be used even by a non-GTK+-based Ethereal from "gtk/main.h" to "globals.h". Remove the byte-order #defines from "packet.h", as they're now in "globals.h" (having been moved there from "gtk/main.h"). Fix up some files that use those #defines to include "globals.h". "resolv.c" doesn't use any GTK stuff, so it needn't include <gtk/gtk.h> nor "gtk/main.h" - it only did so to get the byte-order #defines for the benefit of "packet-ipv6.h", and "packet-ipv6.h" now includes them itself. svn path=/trunk/; revision=649
* Declare the "packet_info" structure "pi" in "packet.h", rather than in aGuy Harris1999-08-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bunch of source files. Replace the "payload" field of a "packet_info" structure with "len" and "captured_len" fields, which contain the total packet length and total captured packet length (including all headers) at the current protocol layer (i.e., if a given layer has a length field, and that length field says its shorter than the length we got from the capture, reduce the "pi.len" and "pi.captured_len" values appropriately). Those fields can be used in the future if we add checks to make sure a field we're extracting from a packet doesn't go past the end of the packet, or past the captured part of the packet. Get rid of the additional payload argument to some dissection functions; use "pi.captured_len - offset" instead. Have the END_OF_FRAME macro use "pi.captured_len" rather than "fd->cap_len", so that "dissect the rest of the frame" becomes "dissect the rest of the packet", and doesn't dissect end-of-frame padding such as padding added to make an Ethernet frame 60 or more octets long. (We might want to rename it END_OF_PACKET; if we ever want to label the end-of-frame padding for the benefit of people curious what that extra gunk is, we could have a separate END_OF_FRAME macro that uses "fd->cap_len".) svn path=/trunk/; revision=506
* Made the protocol (but not the fields) use the new proto_tree routine,Gilbert Ramirez1999-07-291-1/+15
| | | | | | | 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-13/+12
| | | | | | | 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
* Jun-ichiro's IPv6 patch is merged in with ethereal and now uses the newGilbert Ramirez1999-03-281-2/+0
| | | | | | | | | | | proto*() functions. The configure script tries to use ipv6 name resolution if it knows the type of ipv6 stack the user has (this can be avoided with the --disable-ipv6 switch) Additionally, the configure script now deals with wiretap better. If the user doesn't want to compile wiretap, the wiretap is never visited. A few unnecessary #includes were removed from some wiretap files, and a CPP macro was moved from bpf.c to wtap.h. svn path=/trunk/; revision=229
* Removed all references to gtk objects from packet*.[ch] files. They nowGilbert Ramirez1999-03-231-25/+21
| | | | | | | | | | 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
* I removed the bit-fields that depended upon gcc's ability to use any typeGilbert Ramirez1999-02-081-5/+11
| | | | | | | of variable as a bit field container. ANSI specs only allow unsigned ints to host bit fields; IBM's C compiler is very ANSI-strict. svn path=/trunk/; revision=183
* * Added column formatting functionality.Gerald Combs1998-11-171-7/+8
| | | | | | | | * 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-1/+0
| | | | | | | | | | 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
* Add a "val_to_str()" routine that calls "match_strval()" and, ifGuy Harris1998-10-201-13/+2
| | | | | | | | | | | | it returns NULL, formats the value with the format passed in as an argument, and returns a pointer to that static buffer. Change several "match_strval()" calls to use "val_to_str()". In "dissect_ospf()", use "match_strval()" to look up the packet type, and use "Unknown" if it doesn't find a match. svn path=/trunk/; revision=66
* * Copied in the correct GNU license (I'm such a goober)Gerald Combs1998-10-161-0/+122
* Hacks to the filter interface (Gerald) * About box (Laurent) * AppleTalk support (Simon) * Mods to the match_strval routine (Gerald) svn path=/trunk/; revision=61