aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ldap.c
Commit message (Collapse)AuthorAgeFilesLines
* Don't dissect SASL stuff as GSS_Wrapped unless we're actually usingGuy Harris2002-11-281-31/+43
| | | | | | GSS-SPNEGO. svn path=/trunk/; revision=6693
* Handle GSS_Wrap header information as well as context-level tokens. AGuy Harris2002-11-281-10/+41
| | | | | | | | | | | | | | | | | | | | | | call to "gssapi_init_oid()" supplies both dissectors for context-level tokens and GSS_Wrap header information; the latter dissector should return the number of bytes of header information, so that if the header information and the message for the protocol that's using GSSAPI are treated as a single blob of data (as is the case with LDAP, but not with DCE RPC, for example), the dissector for the protocol using GSSAPI knows where to start dissecting. We associate a pointer to the entire data structure for the OID, not the handle for context-level token dissector for the OID, with conversations and frames. Make the dissector for NTLMSSP verifiers be the handler for GSS_Wrap stuff for NTLMSSP, and add support for GSS_Wrap stuff for Kerberos. Support SASL GSS-SPNEGO wrapping of LDAP messages. (XXX - this should really check for GSS-SPNEGO.) svn path=/trunk/; revision=6692
* Try to handle LDAP messages encapsulated inside a SASL security layer.Guy Harris2002-11-271-191/+463
| | | | | | | | Reorganize the desegmentation to match a bit more closely the desegmentation code in "tcp_dissect_pdus()" (eventually, we should see if we can just use that code). svn path=/trunk/; revision=6676
* From Jason Greene:Guy Harris2002-11-251-2/+3
| | | | | | | | | This patch fixes decoding of the newSuperior attribute of an LDAPv3 modrdn request. The current implementation attempts to decode the attribute as an LDAPDN (Octext String, 0x4), when its definition is actually Context 0 (0x80). svn path=/trunk/; revision=6672
* From Ronald Henderson: in LDAP dissector, handle Sequence Of headerGuy Harris2002-11-121-2/+27
| | | | | | being split across TCP segments. svn path=/trunk/; revision=6618
* If we see SASL authentication in a bind request, attach to theGuy Harris2002-09-091-53/+242
| | | | | | | | | | | | | | | conversation a data structure containing the authentication type and mechanism, and use that to dissect the credentials in subsequent bind responses. Call the bind request and response dissectors regardless of whether we're building a protocol tree or not, so that we call the authentication subdissectors. "read_string()" doesn't return anything through the string-pointer argument if the string is zero-length; handle those cases. svn path=/trunk/; revision=6241
* Removed trailing whitespaces from .h and .c files using theJörg Mayer2002-08-281-46/+46
| | | | | | | winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
* Dissect SASL credentials.Guy Harris2002-08-261-8/+155
| | | | svn path=/trunk/; revision=6087
* Dissect udp port 389 which is connectionless LDAP as implemented byTim Potter2002-08-211-1/+3
| | | | | | | Microsoft. It would be nice if this proto was called CLDAP in the protocol field - maybe later. svn path=/trunk/; revision=6041
* Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer2002-08-021-9/+1
| | | | | | | | 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
* Note that not all attribute values are text strings.Guy Harris2002-05-061-1/+13
| | | | svn path=/trunk/; revision=5406
* Get rid of an unused variable.Guy Harris2002-03-311-2/+1
| | | | svn path=/trunk/; revision=5060
* Report ASN.1 BER parsing errors closer to the point at which they'reGuy Harris2002-03-031-206/+320
| | | | | | detected, so we do a better job of reporting the item with the problem. svn path=/trunk/; revision=4853
* As there's nothing to dissect for LDAP_REQ_UNBIND, set "ret" toGuy Harris2002-03-021-2/+3
| | | | | | | | | | ASN1_ERR_NOERROR, as you can't have a dissection error if you've dissected nothing. When dissecting a Bind reply, set "ret" to the return value of "dissect_ldap_response_bind()", so errors get reported properly. svn path=/trunk/; revision=4851
* Don't check the message type if it's not of class ASN1_APL; instead,Guy Harris2002-03-021-49/+58
| | | | | | | | | just display the message type and body as an error. If the message type isn't a type we dissect, display the "Unknown message type" entry with the right offset and length. svn path=/trunk/; revision=4850
* Treat LDAP_REQ_UNBIND as a request with nothing in it, not as an unknownGuy Harris2002-03-021-4/+7
| | | | | | | | request type. Put the request types in order in the switch statement. svn path=/trunk/; revision=4849
* Have the routines that supply a pointer to a newly-constructed itemGuy Harris2002-03-011-22/+18
| | | | | | | | | | | always set that pointer if they return ASN1_ERR_NOERROR. Have the routines that call them use the value only if the routine returns ASN1_ERR_NOERROR. Don't bother setting the pointer before calling the routine. Report unknown modify operation types. svn path=/trunk/; revision=4834
* Add a routine to "asn1.c" to translate ASN1_ERR_ values to strings. UseGuy Harris2002-03-011-142/+283
| | | | | | | | | | | | | | | | | | | | | | that in the SNMP dissector. Check the return values of ASN.1 routines in the LDAP dissector, and have all the subroutines in that disesctor that can return error indications return ASN1_ERR_ values. Have the routines that can supply a pointer to a newly-created protocol-tree item use the right type for items ("proto_item *", not "proto_tree *", even though they are, at least currently, typedefs for the same type), and use "proto_item" for the type of the item a pointer to which is passed to those routines. Before calling those routines, set the item pointer to null, in case the routine fails. Don't check the return value of "parse_filter_strings()" against -1 - that routine can't return -1. svn path=/trunk/; revision=4833
* Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls inGuy Harris2002-01-241-4/+4
| | | | | | | | | | | | arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls that add FT_NONE or FT_PROTO items to the protocol tree, with -1. Replace some calls to "tvb_length()" or "tvb_length_remaining()" with calls to "tvb_reported_length()" and "tvb_reported_length_remaining()", as those give the actual length of the data in the packet, not just the data that happened to be captured. svn path=/trunk/; revision=4605
* Include files from the "epan" directory and subdirectories thereof withGuy Harris2002-01-211-2/+2
| | | | | | | | | | | | | "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
* Give each LDAP packet its own top-level protocol tree item. (This alsoGuy Harris2002-01-141-17/+30
| | | | | | | means if there are no complete LDAP packets in a TCP segment, there is no LDAP top-level protocol tree item, which is as it should be.) svn path=/trunk/; revision=4539
* Add support for TCP desegmentation.Guy Harris2002-01-141-10/+51
| | | | svn path=/trunk/; revision=4538
* Move the pointer to the "column_info" structure in the "frame_data"Guy Harris2001-12-101-11/+11
| | | | | | | | | | | | | | | 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
* Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris2001-12-031-3/+6
| | | | | | | | 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
* Fix the rest of the signed/unsigned comparison warnings.Gilbert Ramirez2001-10-261-2/+2
| | | | svn path=/trunk/; revision=4088
* From Joerg Mayer: explicitly fill in all members of aGuy Harris2001-06-181-31/+31
| | | | | | | "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
* Only set the Info column to an error indication if we haven't alreadyGuy Harris2001-05-081-3/+3
| | | | | | put a packet description there. svn path=/trunk/; revision=3405
* Additional LDAP checks for invalid packets, from Scott Renfro.Guy Harris2001-05-081-5/+20
| | | | svn path=/trunk/; revision=3404
* Get rid of an unused variable, and fix a typo in a comment.Guy Harris2001-04-151-4/+2
| | | | svn path=/trunk/; revision=3302
* Tvbuffify the ASN.1 code and the Kerberos, LDAP, and SNMP dissectors.Guy Harris2001-04-151-100/+94
| | | | | | Clean up some problems that revealed. svn path=/trunk/; revision=3301
* The difference between two pointers doesn't necessarily fit in an "int"Guy Harris2001-01-101-3/+4
| | | | | | | or "unsigned int"; cast it to "unsigned long" and print it with "%lu", so it works on ILP32 and LP64 platforms. svn path=/trunk/; revision=2867
* 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
* Ensure that all value_string arrays end in {0, NULL}. Dissectors got awayGilbert Ramirez2001-01-031-1/+6
| | | | | | | | | | | | | | with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
* 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
* Rename "asn1_octet_string_value_decode()" toGuy Harris2000-12-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "asn1_string_value_decode()", as it can be used for various character string types as well. Turn "asn1_octet_string_decode()" into "asn1_string_decode()", which takes an additional argument giving the tag expected for the string in question, and make "asn1_octet_string_decode()" a wrapper around it. Clean up the ASN.1 dissection in the Kerberos dissector, making more use of the code in "asn1.c", wrapping more operations up in macros, and doing some more type checking. Use "REP" rather than "RESP" in names and strings; "REP" is what the Kerberos spec uses. Make the routines in the Kerberos dissector not used outside that dissector static. Fix some problems with the dissection of strings in the Kerberos dissector (it was extracting the data from the wrong place in the packet). In Kerberos V5, the "kvno" item in the EncryptedData type is optional; treat it as such. Treat integers as unsigned in the Kerberos dissector. svn path=/trunk/; revision=2777
* 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
* Don't assume that you get back from "asn1_octet_string_decode()" aGuy Harris2000-08-241-15/+55
| | | | | | | | pointer to a null-terminated string; you get back a null pointer if the octet string is zero-length, and even if it's not zero-length there's no guarantee that the string is null-terminated. svn path=/trunk/; revision=2357
* 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
* Miscellaneous code cleaningLaurent Deniel2000-08-111-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add <stdarg.h> or <varargs.h> in snprintf.h and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes - remove the check of multiple inclusions in source (.c) code (there is a bit loss of _cpp_ performance, but I prefer the gain of code reading and maintenance; and nowadays, disk caches and VM are correctly optimized ;-). - protect all (well almost) header files against multiple inclusions - add header (i.e. GPL license) in some include files - reorganize a bit the way header files are included: First: #include <system_include_files> #include <external_package_include_files (e.g. gtk, glib etc.)> Then #include "ethereal_include_files" with the correct HAVE_XXX or NEED_XXX protections. - add some HAVE_XXX checks before including some system header files - add the same HAVE_XXX in wiretap as in ethereal Please forgive me, if I break something (I've only compiled and regression tested on Linux). svn path=/trunk/; revision=2254
* Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris2000-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-21/+57
| | | | | | | | | | | | | | | | | 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
* Doug Nazar's patch to dissect substring filters.Guy Harris2000-05-121-3/+89
| | | | svn path=/trunk/; revision=1949
* Add tvbuff class.Gilbert Ramirez2000-05-111-15/+15
| | | | | | | | | | | | | | | 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
* 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
* Add in an include of "snprintf.h" on platforms where it's necessary.Guy Harris2000-04-061-1/+11
| | | | svn path=/trunk/; revision=1805
* Another update from Doug Nazar.Guy Harris2000-04-031-2/+2
| | | | svn path=/trunk/; revision=1778
* Improvements from Doug Nazar.Guy Harris2000-04-031-12/+8
| | | | | | | | | | One of those improvements adds an "exit now" after we've filled in the protocol and info columns if we're not building a protocol tree, obviating the need for the "parse only the first request in the sequence if we're not building a protocol tree" code I stuck in, so remove the latter code. svn path=/trunk/; revision=1775
* Put in the beginnings of checks for ASN.1 dissection errors.Guy Harris2000-03-311-48/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "present" choice in the type Filter is, in LDAP V2, AttributeType, and, in LDAP V3, it's AttributeDescription. Both of those are just LDAPString, which is, in turn, OCTET STRING, so it should be required to have the primitive representation (unless and until we add support for the constructed representation of octet strings - but RFC 1777, the LDAP V2 spec, says (2) Bitstrings and octet strings and all character string types will be encoded in the primitive form only. and RFC 2251, the LDAP V3 spec, says (2) OCTET STRING values will be encoded in the primitive form only. so we shouldn't ever see it with the constructed representation), and be parsed with "asn1_octet_string_value_decode()", as, by that point, we've already dissected the ASN.1 id and length. Put the bind authorization type into the protocol tree before switching on the type, so that it goes in even if it's not something we yet dissect, and actually pass it as an argument to "proto_tree_add_item()" (alas, "proto_tree_add_item()" is a varargs function, so this error couldn't have been detected by the compiler). When not constructing a protocol tree, quit "dissect_ldap()" after dissecting the first operation - we don't need to dissect the others. svn path=/trunk/; revision=1768
* Updates from Doug Nazar.Guy Harris2000-03-291-239/+300
| | | | svn path=/trunk/; revision=1760
* Doug Nazar's LDAP dissector.Guy Harris2000-03-281-97/+857
| | | | svn path=/trunk/; revision=1756
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 01:10:09 +0000