aboutsummaryrefslogtreecommitdiffstats
path: root/packet-isakmp.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fix the comment at the beginning of the routine to give the right fileGuy Harris2000-07-021-29/+30
| | | | | | | | | | | | | | | | | | | | | | | name, and add the RFC number for ISAKMP to it. Fix the structures for headers to treat all multi-byte quantities as arrays of bytes; the certificate request header needs to be done that way, so that it's *not* padded to a multiple of the size of the longest integral element (the longest integral element is 2 bytes, but the size of the header is 5 bytes, so certificate requests were being misdissected), and other structures might require this as well - it also catches code that doesn't use "pntohl()" or "pntohs()" to get the values of integral fields bigger than 1 byte. In fact, it *did* catch some; the configuration attribute header's "identifier" field was being used without being put in host byte order. In addition, that field required padding to be aligned on its natural boundary, but the padding wasn't given as a structure member; given that the length field was specified as one byte but extracted with "pntohs()", and that the length field is 2 bytes in the other headers, it probably should be 2 bytes in this header as well - make it so. svn path=/trunk/; revision=2101
* Add routines for adding items to a protocol tree that take arguments ofGuy Harris2000-05-311-2/+2
| | | | | | | | | | | | | | | | | 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
* Support for ISAKMP XAUTH authentication, from Yaniv Kaul.Guy Harris2000-05-221-3/+23
| | | | svn path=/trunk/; revision=1993
* Get rid of the comment before "cfgattrident2str()" explaining why it'sGuy Harris2000-05-221-7/+1
| | | | | | | | there - it's now called from within "packet-isakmp.c", so there's no need to explain "this isn't used yet, but it will be in the future"; the future has arrived.... svn path=/trunk/; revision=1992
* Parsing attributes in Config mode, and support for a Hybrid modeGuy Harris2000-05-211-2/+28
| | | | | | authentication draft, from Yaniv Kaul. svn path=/trunk/; revision=1991
* Small fix from Yaniv Kaul.Guy Harris2000-05-171-2/+2
| | | | svn path=/trunk/; revision=1972
* Put in a comment to note that "cfgattrident2str()" was put in for useGuy Harris2000-05-111-1/+7
| | | | | | | when we parse ISAKMP data attributes - we don't do that yet, which is why it's not currently used. svn path=/trunk/; revision=1942
* Yaniv Kaul's patch to add support for the ISAKMP Configuration MethodGuy Harris2000-05-111-5/+96
| | | | | | (draft-ietf-ipsec-isakmp-mode-cfg-04.txt). svn path=/trunk/; revision=1941
* Add tvbuff class.Gilbert Ramirez2000-05-111-92/+92
| | | | | | | | | | | | | | | 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
* If the "encrypted payload" flag is set in an ISAKMP packet, don'tGuy Harris2000-04-281-7/+15
| | | | | | dissect the payload, just report it as "Encrypted payload (N byte(s))". svn path=/trunk/; revision=1894
* Move calls to "dissector_add()" out of the register routines for TCP andGuy Harris2000-04-081-2/+11
| | | | | | | | | | | | | | UDP and into the handoff registration routines for the protocols in question. Make the dissectors for those protocols static if they're not called outside the dissector's source file. Get rid of header files if all they did was declare dissectors that are now static; remove declarations of now-static dissectors from header files that do more than just declare the dissector. svn path=/trunk/; revision=1823
* Fix Gerald's e-mail address.Guy Harris2000-01-071-2/+2
| | | | svn path=/trunk/; revision=1437
* Changes from Dave Chapeskie.Guy Harris1999-12-061-63/+271
| | | | svn path=/trunk/; revision=1224
* Replace the ETT_ "enum" members, declared in "packet.h", withGuy Harris1999-11-161-16/+26
| | | | | | | | | | | | | | | | | 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
* Add a "BYTES_ARE_IN_FRAME()" macro, to test whether there are aGuy Harris1999-09-171-2/+2
| | | | | | | | | | | specified number of bytes of captured data in the frame at the specified offset, and a "IS_DATA_IN_FRAME()" macro, to test whether there are any bytes of captured data in the frame at the specified offset, and convert some bounds checks to use them. Add a dissector for the Internet Printing Protocol. svn path=/trunk/; revision=685
* Convert a bunch of uses of "fd->cap_len" to use "pi.captured_len" (or toGuy Harris1999-08-261-2/+2
| | | | | | | use END_OF_FRAME), so that they don't look at stuff in an IP datagram past the end of the IP datagram (i.e., frame padding). svn path=/trunk/; revision=584
* Made the protocol (but not the fields) use the new proto_tree routine,Gilbert Ramirez1999-07-291-3/+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
* Added support for compiling on win32 with Visual C and 'nmake'. It compiles,Gilbert Ramirez1999-07-131-1/+5
| | | | | | | | | | | | but does not link. Perhaps someone who understands the MS tools can help out. I made it link a few months ago, but with different version of glib/gtk+. I can't remember how I made it link. Most of the compatibility issues were resolved with adding #ifdef HAVE_UNISTD_H the the source code. Please be sure to add this to all future code. svn path=/trunk/; revision=359
* "pntohl()" doesn't actually return a "long" (or an "unsigned long"), itGuy Harris1999-07-081-3/+3
| | | | | | | returns a "guint32", which is an "unsigned int" on all platforms Glib supports, so print what it returns with "%u", not "%lu". svn path=/trunk/; revision=349
* Created a new protocol tree implementation and a new display filterGilbert Ramirez1999-07-071-121/+119
| | | | | | | 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
* "pntohl()" doesn't actually return a "long" (or an "unsigned long"), itGuy Harris1999-07-061-3/+3
| | | | | | | returns a "guint32", which is an "unsigned int" on all platforms Glib supports, so print what it returns with "%u", not "%lu". svn path=/trunk/; revision=339
* Include "snprintf.h" if necessary - we use "snprintf()".Guy Harris1999-06-121-1/+10
| | | | svn path=/trunk/; revision=309
* Added PPPoE, PPTP, GRE, and ISAKMP dissectors.Gilbert Ramirez1999-06-111-0/+1040
svn path=/trunk/; revision=303