osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/epan/dissectors/packet-ldap.c

5912 lines
213 KiB
C
Raw Normal View History

Update the ASN.1 based dissectors following the changes done in r48812 svn path=/trunk/; revision=48820
2013-04-11 18:14:53 +00:00
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
/* packet-ldap.c */
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
/* asn2wrs.py -b -p ldap -c ./ldap.cnf -s ./packet-ldap-template -D . -O ../.. Lightweight-Directory-Access-Protocol-V3.asn */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Input file: packet-ldap-template.c */
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-template.c"
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
/* packet-ldap-template.c
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
* Routines for ldap packet dissection
*
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
* See RFC 1777 (LDtAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL).
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update Free Software Foundation address. (COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
*/
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
/*
* This is not a complete implementation. It doesn't handle the full version 3, more specifically,
* it handles only the commands of version 2, but any additional characteristics of the ver3 command are supported.
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
* It's also missing extensible search filters.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Fix spelling/typos found using a list of commonly misspelled words. The misspellings were mostly in comments but some were in text strings visible to the user. svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
* There should probably be a lot more error checking, I simply assume that if we have a full packet, it will be a complete
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
* and correct packet.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
* AFAIK, it will handle all messages used by the OpenLDAP 1.2.9 server and libraries which was my goal. I do plan to add
* the remaining commands as time permits but this is not a priority to me. Send me an email if you need it and I'll see what
* I can do.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
* Doug Nazar
* nazard@dragoninc.on.ca
*/
From Ronald Henderson: in LDAP dissector, handle Sequence Of header being split across TCP segments. svn path=/trunk/; revision=6618
2002-11-12 21:37:35 +00:00
/*
* 11/11/2002 - Fixed problem when decoding LDAP with desegmentation enabled and the
* ASN.1 BER Universal Class Tag: "Sequence Of" header is encapsulated across 2
* TCP segments.
*
* Ronald W. Henderson
* ronald.henderson@cognicaseusa.com
*/
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
/*
* 20-JAN-2004 - added decoding of MS-CLDAP netlogon RPC
* using information from the SNIA 2003 conference paper :
* Active Directory Domain Controller Location Service
* by Anthony Liguori
* ronnie sahlberg
*/
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
/*
* 17-DEC-2004 - added basic decoding for LDAP Controls
from metze make ethereal handle gss-api encrypted ldap blobs svn path=/trunk/; revision=12802
2004-12-21 17:05:14 +00:00
* 20-DEC-2004 - added handling for GSS-API encrypted blobs
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
*
* Stefan Metzmacher <metze@samba.org>
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
*
- remove some #.MODULE_IMPORT from .cng files - regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
* 15-NOV-2005 - Changed to use the asn2wrs compiler
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
* Anders Broman <anders.broman@ericsson.com>
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
*/
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
/*
* 3-AUG-2008 - Extended the cldap support to include all netlogon data types.
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
* Updated cldap_netlogon_flags to include Windows 2008 flags
* Expanded the ntver ldap option with bit field
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
*
* Gary Reynolds <gazzadownunder@yahoo.co.uk>
*/
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
/*
* 09-DEC-2009 - Added support for RFC4533
* Content Synchronization Operation (aka syncrepl)
* 11-DEC-2009 - Added support for IntermediateResponse (LDAP v3 from RFC 4511)
* Mathieu Parent <math.parent@gmail.com>
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
Include files from the "epan" directory and subdirectories thereof with "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
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
Add missing includes in order to remove exceptions.h from proto.h (next commit). svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
#include <epan/exceptions.h>
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
#include <epan/conversation.h>
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
#include <epan/prefs.h>
Move the tap infrastructure to the epan directory. svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
#include <epan/tap.h>
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
#include <epan/srt_table.h>
get users of oid_resolv to use the new oids, rollout packet-snmp.c svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
#include <epan/oids.h>
Include <epan/strutil.h> to define g_ascii_isprint() on systems with GLib 1.2[.x]. svn path=/trunk/; revision=18061
2006-05-01 17:43:29 +00:00
#include <epan/strutil.h>
Move show_exception() and show_reported_bounds_error() to epan/show_exception.c, as it's used outside epan/dissectors/packet-frame.c. Update their callers to include <epan/show_exception.h> to get their declaration. Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if there's more stuff in the packet to dissect after the dissector call that threw the exception, doesn't mean you shouldn't go ahead and dissect that stuff. Use it in all those cases, including ones where BoundsError was inappropriately being caught (you want those passed up to the top level, so that the packet is reported as having been cut short in the capture process). Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that correspond to running past the end of the data for a tvbuff; use it rather than explicitly catching those exceptions individually, and rather than just catching all exceptions (the only place that DissectorError should be caught, for example, is at the top level, so dissector bugs show up in the protocol tree). Don't catch and then immediately rethrow exceptions without doing anything else; just let the exceptions go up to the final catcher. Use show_exception() to report non-fatal errors, rather than doing it yourself. If a dissector is called from Lua, catch all non-fatal errors and use show_exception() to report them rather than catching only ReportedBoundsError and adding a proto_malformed item. Don't catch exceptions when constructing a trailer tvbuff in packet-ieee8023.c - just construct it after the payload has been dissected, and let whatever exceptions that throws be handled at the top level. Avoid some TRY/CATCH/ENDTRY cases by using checks such as tvb_bytes_exist() before even looking in the tvbuff. svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
#include <epan/show_exception.h>
Split out common asn1 stuff to asn1.h and include that where needed. svn path=/trunk/; revision=21635
2007-05-01 22:05:11 +00:00
#include <epan/asn1.h>
If we encounter an excessively long filter string or one with too many elements, add an expert item and throw a ReportedBoundsError. We may want to handle this more cleanly in the future but this avoids allocating a huge amount of memory. svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
#include <epan/expert.h>
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
#include <epan/uat.h>
Don't include "file.h" if you don't need it. It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04 08:45:54 +00:00
#include <wsutil/str_util.h>
asn1 generated dissectors: cleanup #include usage Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:32:58 +00:00
#include "packet-frame.h"
#include "packet-tcp.h"
#include "packet-windows-common.h"
#include "packet-dcerpc.h"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
#include "packet-ldap.h"
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
#include "packet-ntlmssp.h"
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
#include "packet-ssl.h"
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
#include "packet-ssl-utils.h"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
#include "packet-smb-common.h"
Refactor some GSS-API dissectors to accept dissector data instead of using packet_info. This can hopefully lead to the removal of the GSS-API specific members of the packet_info structure. Change-Id: I7622d66e9f02c6e4cb76adcf0737b35c6ec88cdd Reviewed-on: https://code.wireshark.org/review/11509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-02 21:47:26 +00:00
#include "packet-gssapi.h"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
#include "packet-ber.h"
#include "packet-per.h"
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
#include "packet-dns.h"
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Cleanup protocol name for ldap. svn path=/trunk/; revision=28888
2009-06-30 08:28:21 +00:00
#define PNAME "Lightweight Directory Access Protocol"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
#define PSNAME "LDAP"
#define PFNAME "ldap"
- Forward declaration of register functions. svn path=/trunk/; revision=53872
2013-12-08 22:02:12 +00:00
void proto_register_ldap(void);
void proto_reg_handoff_ldap(void);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Initialize the protocol and registered fields */
static int ldap_tap = -1;
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
static int proto_ldap = -1;
Put CLDAP instead of LDAP in COL_INFO for LDAP over UDP. svn path=/trunk/; revision=8161
2003-08-12 20:14:05 +00:00
static int proto_cldap = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
static int hf_ldap_sasl_buffer_length = -1;
static int hf_ldap_response_in = -1;
static int hf_ldap_response_to = -1;
static int hf_ldap_time = -1;
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
static int hf_ldap_guid = -1;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static int hf_mscldap_ntver_flags = -1;
static int hf_mscldap_ntver_flags_v1 = -1;
static int hf_mscldap_ntver_flags_v5 = -1;
static int hf_mscldap_ntver_flags_v5ex = -1;
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static int hf_mscldap_ntver_flags_v5ep = -1;
static int hf_mscldap_ntver_flags_vcs = -1;
static int hf_mscldap_ntver_flags_vnt4 = -1;
static int hf_mscldap_ntver_flags_vpdc = -1;
static int hf_mscldap_ntver_flags_vip = -1;
static int hf_mscldap_ntver_flags_vl = -1;
static int hf_mscldap_ntver_flags_vgc = -1;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static int hf_mscldap_netlogon_ipaddress_family = -1;
static int hf_mscldap_netlogon_ipaddress_port = -1;
static int hf_mscldap_netlogon_ipaddress = -1;
static int hf_mscldap_netlogon_ipaddress_ipv4 = -1;
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
static int hf_mscldap_netlogon_opcode = -1;
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
static int hf_mscldap_netlogon_flags = -1;
static int hf_mscldap_netlogon_flags_pdc = -1;
static int hf_mscldap_netlogon_flags_gc = -1;
static int hf_mscldap_netlogon_flags_ldap = -1;
static int hf_mscldap_netlogon_flags_ds = -1;
static int hf_mscldap_netlogon_flags_kdc = -1;
static int hf_mscldap_netlogon_flags_timeserv = -1;
static int hf_mscldap_netlogon_flags_closest = -1;
static int hf_mscldap_netlogon_flags_writable = -1;
static int hf_mscldap_netlogon_flags_good_timeserv = -1;
static int hf_mscldap_netlogon_flags_ndnc = -1;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static int hf_mscldap_netlogon_flags_fnc = -1;
static int hf_mscldap_netlogon_flags_dnc = -1;
static int hf_mscldap_netlogon_flags_dns = -1;
static int hf_mscldap_netlogon_flags_wdc = -1;
static int hf_mscldap_netlogon_flags_rodc = -1;
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
static int hf_mscldap_domain_guid = -1;
static int hf_mscldap_forest = -1;
static int hf_mscldap_domain = -1;
static int hf_mscldap_hostname = -1;
static int hf_mscldap_nb_domain = -1;
static int hf_mscldap_nb_hostname = -1;
static int hf_mscldap_username = -1;
static int hf_mscldap_sitename = -1;
static int hf_mscldap_clientsitename = -1;
static int hf_mscldap_netlogon_lm_token = -1;
static int hf_mscldap_netlogon_nt_token = -1;
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
static int hf_ldap_sid = -1;
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
static int hf_ldap_AccessMask_ADS_CREATE_CHILD = -1;
static int hf_ldap_AccessMask_ADS_DELETE_CHILD = -1;
static int hf_ldap_AccessMask_ADS_LIST = -1;
static int hf_ldap_AccessMask_ADS_SELF_WRITE = -1;
static int hf_ldap_AccessMask_ADS_READ_PROP = -1;
static int hf_ldap_AccessMask_ADS_WRITE_PROP = -1;
static int hf_ldap_AccessMask_ADS_DELETE_TREE = -1;
static int hf_ldap_AccessMask_ADS_LIST_OBJECT = -1;
static int hf_ldap_AccessMask_ADS_CONTROL_ACCESS = -1;
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
static int hf_ldap_LDAPMessage_PDU = -1;
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
static int hf_ldap_object_security_flag = -1;
static int hf_ldap_ancestor_first_flag = -1;
static int hf_ldap_public_data_only_flag = -1;
static int hf_ldap_incremental_value_flag = -1;
static int hf_ldap_oid = -1;
static int hf_ldap_gssapi_encrypted_payload = -1;
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Included file: packet-ldap-hf.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-hf.c"
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static int hf_ldap_SearchControlValue_PDU = -1; /* SearchControlValue */
static int hf_ldap_SortKeyList_PDU = -1; /* SortKeyList */
static int hf_ldap_SortResult_PDU = -1; /* SortResult */
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
static int hf_ldap_DirSyncControlValue_PDU = -1; /* DirSyncControlValue */
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static int hf_ldap_PasswdModifyRequestValue_PDU = -1; /* PasswdModifyRequestValue */
static int hf_ldap_CancelRequestValue_PDU = -1; /* CancelRequestValue */
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
static int hf_ldap_SyncRequestValue_PDU = -1; /* SyncRequestValue */
static int hf_ldap_SyncStateValue_PDU = -1; /* SyncStateValue */
static int hf_ldap_SyncDoneValue_PDU = -1; /* SyncDoneValue */
static int hf_ldap_SyncInfoValue_PDU = -1; /* SyncInfoValue */
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
static int hf_ldap_PasswordPolicyResponseValue_PDU = -1; /* PasswordPolicyResponseValue */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_messageID = -1; /* MessageID */
static int hf_ldap_protocolOp = -1; /* ProtocolOp */
static int hf_ldap_controls = -1; /* Controls */
static int hf_ldap_bindRequest = -1; /* BindRequest */
static int hf_ldap_bindResponse = -1; /* BindResponse */
static int hf_ldap_unbindRequest = -1; /* UnbindRequest */
static int hf_ldap_searchRequest = -1; /* SearchRequest */
static int hf_ldap_searchResEntry = -1; /* SearchResultEntry */
static int hf_ldap_searchResDone = -1; /* SearchResultDone */
static int hf_ldap_searchResRef = -1; /* SearchResultReference */
static int hf_ldap_modifyRequest = -1; /* ModifyRequest */
static int hf_ldap_modifyResponse = -1; /* ModifyResponse */
static int hf_ldap_addRequest = -1; /* AddRequest */
static int hf_ldap_addResponse = -1; /* AddResponse */
static int hf_ldap_delRequest = -1; /* DelRequest */
static int hf_ldap_delResponse = -1; /* DelResponse */
static int hf_ldap_modDNRequest = -1; /* ModifyDNRequest */
static int hf_ldap_modDNResponse = -1; /* ModifyDNResponse */
static int hf_ldap_compareRequest = -1; /* CompareRequest */
static int hf_ldap_compareResponse = -1; /* CompareResponse */
static int hf_ldap_abandonRequest = -1; /* AbandonRequest */
static int hf_ldap_extendedReq = -1; /* ExtendedRequest */
static int hf_ldap_extendedResp = -1; /* ExtendedResponse */
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
static int hf_ldap_intermediateResponse = -1; /* IntermediateResponse */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_AttributeDescriptionList_item = -1; /* AttributeDescription */
static int hf_ldap_attributeDesc = -1; /* AttributeDescription */
static int hf_ldap_assertionValue = -1; /* AssertionValue */
static int hf_ldap_type = -1; /* AttributeDescription */
static int hf_ldap_vals = -1; /* SET_OF_AttributeValue */
static int hf_ldap_vals_item = -1; /* AttributeValue */
static int hf_ldap_resultCode = -1; /* T_resultCode */
static int hf_ldap_matchedDN = -1; /* LDAPDN */
static int hf_ldap_errorMessage = -1; /* ErrorMessage */
static int hf_ldap_referral = -1; /* Referral */
static int hf_ldap_Referral_item = -1; /* LDAPURL */
static int hf_ldap_Controls_item = -1; /* Control */
static int hf_ldap_controlType = -1; /* ControlType */
static int hf_ldap_criticality = -1; /* BOOLEAN */
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static int hf_ldap_controlValue = -1; /* T_controlValue */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_version = -1; /* INTEGER_1_127 */
static int hf_ldap_name = -1; /* LDAPDN */
static int hf_ldap_authentication = -1; /* AuthenticationChoice */
static int hf_ldap_simple = -1; /* Simple */
static int hf_ldap_sasl = -1; /* SaslCredentials */
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
static int hf_ldap_ntlmsspNegotiate = -1; /* T_ntlmsspNegotiate */
static int hf_ldap_ntlmsspAuth = -1; /* T_ntlmsspAuth */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_mechanism = -1; /* Mechanism */
static int hf_ldap_credentials = -1; /* Credentials */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_bindResponse_resultCode = -1; /* BindResponse_resultCode */
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static int hf_ldap_bindResponse_matchedDN = -1; /* T_bindResponse_matchedDN */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_serverSaslCreds = -1; /* ServerSaslCreds */
static int hf_ldap_baseObject = -1; /* LDAPDN */
static int hf_ldap_scope = -1; /* T_scope */
static int hf_ldap_derefAliases = -1; /* T_derefAliases */
static int hf_ldap_sizeLimit = -1; /* INTEGER_0_maxInt */
static int hf_ldap_timeLimit = -1; /* INTEGER_0_maxInt */
static int hf_ldap_typesOnly = -1; /* BOOLEAN */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_filter = -1; /* T_filter */
static int hf_ldap_searchRequest_attributes = -1; /* AttributeDescriptionList */
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int hf_ldap_and = -1; /* T_and */
static int hf_ldap_and_item = -1; /* T_and_item */
static int hf_ldap_or = -1; /* T_or */
static int hf_ldap_or_item = -1; /* T_or_item */
static int hf_ldap_not = -1; /* T_not */
static int hf_ldap_equalityMatch = -1; /* T_equalityMatch */
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
static int hf_ldap_substrings = -1; /* SubstringFilter */
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int hf_ldap_greaterOrEqual = -1; /* T_greaterOrEqual */
static int hf_ldap_lessOrEqual = -1; /* T_lessOrEqual */
static int hf_ldap_present = -1; /* T_present */
static int hf_ldap_approxMatch = -1; /* T_approxMatch */
static int hf_ldap_extensibleMatch = -1; /* T_extensibleMatch */
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
static int hf_ldap_substringFilter_substrings = -1; /* T_substringFilter_substrings */
static int hf_ldap_substringFilter_substrings_item = -1; /* T_substringFilter_substrings_item */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_initial = -1; /* LDAPString */
static int hf_ldap_any = -1; /* LDAPString */
static int hf_ldap_final = -1; /* LDAPString */
static int hf_ldap_matchingRule = -1; /* MatchingRuleId */
static int hf_ldap_matchValue = -1; /* AssertionValue */
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names) svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
static int hf_ldap_dnAttributes = -1; /* T_dnAttributes */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_objectName = -1; /* LDAPDN */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_searchResultEntry_attributes = -1; /* PartialAttributeList */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_PartialAttributeList_item = -1; /* PartialAttributeList_item */
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static int hf_ldap__untag_item = -1; /* LDAPURL */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_object = -1; /* LDAPDN */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_modifyRequest_modification = -1; /* ModifyRequest_modification */
static int hf_ldap_modifyRequest_modification_item = -1; /* T_modifyRequest_modification_item */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_operation = -1; /* T_operation */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_modification = -1; /* AttributeTypeAndValues */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_entry = -1; /* LDAPDN */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_attributes = -1; /* AttributeList */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_AttributeList_item = -1; /* AttributeList_item */
static int hf_ldap_newrdn = -1; /* RelativeLDAPDN */
static int hf_ldap_deleteoldrdn = -1; /* BOOLEAN */
static int hf_ldap_newSuperior = -1; /* LDAPDN */
static int hf_ldap_ava = -1; /* AttributeValueAssertion */
static int hf_ldap_requestName = -1; /* LDAPOID */
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static int hf_ldap_requestValue = -1; /* T_requestValue */
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int hf_ldap_extendedResponse_resultCode = -1; /* ExtendedResponse_resultCode */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int hf_ldap_responseName = -1; /* ResponseName */
static int hf_ldap_response = -1; /* OCTET_STRING */
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
static int hf_ldap_intermediateResponse_responseValue = -1; /* T_intermediateResponse_responseValue */
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static int hf_ldap_size = -1; /* INTEGER */
static int hf_ldap_cookie = -1; /* OCTET_STRING */
static int hf_ldap_SortKeyList_item = -1; /* SortKeyList_item */
static int hf_ldap_attributeType = -1; /* AttributeDescription */
static int hf_ldap_orderingRule = -1; /* MatchingRuleId */
static int hf_ldap_reverseOrder = -1; /* BOOLEAN */
static int hf_ldap_sortResult = -1; /* T_sortResult */
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
static int hf_ldap_flags = -1; /* DirSyncFlags */
static int hf_ldap_maxBytes = -1; /* INTEGER */
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static int hf_ldap_userIdentity = -1; /* OCTET_STRING */
static int hf_ldap_oldPasswd = -1; /* OCTET_STRING */
static int hf_ldap_newPasswd = -1; /* OCTET_STRING */
static int hf_ldap_cancelID = -1; /* MessageID */
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
static int hf_ldap_mode = -1; /* T_mode */
static int hf_ldap_reloadHint = -1; /* BOOLEAN */
static int hf_ldap_state = -1; /* T_state */
static int hf_ldap_entryUUID = -1; /* SyncUUID */
static int hf_ldap_refreshDeletes = -1; /* BOOLEAN */
static int hf_ldap_newcookie = -1; /* OCTET_STRING */
static int hf_ldap_refreshDelete = -1; /* T_refreshDelete */
static int hf_ldap_refreshDone = -1; /* BOOLEAN */
static int hf_ldap_refreshPresent = -1; /* T_refreshPresent */
static int hf_ldap_syncIdSet = -1; /* T_syncIdSet */
static int hf_ldap_syncUUIDs = -1; /* SET_OF_SyncUUID */
static int hf_ldap_syncUUIDs_item = -1; /* SyncUUID */
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
static int hf_ldap_warning = -1; /* T_warning */
static int hf_ldap_timeBeforeExpiration = -1; /* INTEGER_0_maxInt */
static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */
static int hf_ldap_error = -1; /* T_error */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- End of included file: packet-ldap-hf.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 195 "./asn1/ldap/packet-ldap-template.c"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Initialize the subtree pointers */
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
static gint ett_ldap = -1;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
static gint ett_ldap_msg = -1;
static gint ett_ldap_sasl_blob = -1;
Declare ett's as gint, not guint. svn path=/trunk/; revision=35902
2011-02-10 20:55:26 +00:00
static gint ett_ldap_payload = -1;
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
static gint ett_mscldap_netlogon_flags = -1;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static gint ett_mscldap_ntver_flags = -1;
static gint ett_mscldap_ipdetails = -1;
Omit assignment for not used types. svn path=/trunk/; revision=54593
2014-01-04 12:03:02 +00:00
static gint ett_ldap_DirSyncFlagsSubEntry = -1;
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Included file: packet-ldap-ett.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-ett.c"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_LDAPMessage = -1;
static gint ett_ldap_ProtocolOp = -1;
static gint ett_ldap_AttributeDescriptionList = -1;
static gint ett_ldap_AttributeValueAssertion = -1;
static gint ett_ldap_Attribute = -1;
static gint ett_ldap_SET_OF_AttributeValue = -1;
static gint ett_ldap_LDAPResult = -1;
static gint ett_ldap_Referral = -1;
static gint ett_ldap_Controls = -1;
static gint ett_ldap_Control = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_BindRequest_U = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_AuthenticationChoice = -1;
static gint ett_ldap_SaslCredentials = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_BindResponse_U = -1;
static gint ett_ldap_SearchRequest_U = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_Filter = -1;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static gint ett_ldap_T_and = -1;
static gint ett_ldap_T_or = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_SubstringFilter = -1;
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
static gint ett_ldap_T_substringFilter_substrings = -1;
static gint ett_ldap_T_substringFilter_substrings_item = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_MatchingRuleAssertion = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_SearchResultEntry_U = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_PartialAttributeList = -1;
static gint ett_ldap_PartialAttributeList_item = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_SEQUENCE_OF_LDAPURL = -1;
static gint ett_ldap_ModifyRequest_U = -1;
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static gint ett_ldap_ModifyRequest_modification = -1;
static gint ett_ldap_T_modifyRequest_modification_item = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_AttributeTypeAndValues = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_AddRequest_U = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gint ett_ldap_AttributeList = -1;
static gint ett_ldap_AttributeList_item = -1;
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static gint ett_ldap_ModifyDNRequest_U = -1;
static gint ett_ldap_CompareRequest_U = -1;
static gint ett_ldap_ExtendedRequest_U = -1;
static gint ett_ldap_ExtendedResponse_U = -1;
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
static gint ett_ldap_IntermediateResponse_U = -1;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static gint ett_ldap_SearchControlValue = -1;
static gint ett_ldap_SortKeyList = -1;
static gint ett_ldap_SortKeyList_item = -1;
static gint ett_ldap_SortResult = -1;
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
static gint ett_ldap_DirSyncControlValue = -1;
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static gint ett_ldap_PasswdModifyRequestValue = -1;
static gint ett_ldap_CancelRequestValue = -1;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
static gint ett_ldap_SyncRequestValue = -1;
static gint ett_ldap_SyncStateValue = -1;
static gint ett_ldap_SyncDoneValue = -1;
static gint ett_ldap_SyncInfoValue = -1;
static gint ett_ldap_T_refreshDelete = -1;
static gint ett_ldap_T_refreshPresent = -1;
static gint ett_ldap_T_syncIdSet = -1;
static gint ett_ldap_SET_OF_SyncUUID = -1;
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
static gint ett_ldap_PasswordPolicyResponseValue = -1;
static gint ett_ldap_T_warning = -1;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- End of included file: packet-ldap-ett.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 207 "./asn1/ldap/packet-ldap-template.c"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Convert ASN.1 dissectors to use filterable expert info. NOTE: Kerberos ASN.1 template was updated, but not generated to source. svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
static expert_field ei_ldap_exceeded_filter_length = EI_INIT;
static expert_field ei_ldap_too_many_filter_elements = EI_INIT;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
static dissector_table_t ldap_name_dissector_table=NULL;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static const char *object_identifier_id = NULL; /* LDAP OID */
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static gboolean do_protocolop = FALSE;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
static gchar *attr_type = NULL;
static gboolean is_binary_attr_type = FALSE;
Changed check for having multiple ldap PDU's in one frame. The previous check is incorrect when the first ldap frame in the capture is selected and the filter is changed, or selecting "Follow TCP Stream". Also removed check_col(). svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
static gboolean ldap_found_in_frame = FALSE;
Add support for TCP desegmentation. svn path=/trunk/; revision=4538
2002-01-14 02:50:28 +00:00
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
#define TCP_PORT_RANGE_LDAP "389,3268" /* 3268 is Windows 2000 Global Catalog */
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
#define TCP_PORT_LDAPS 636
#define UDP_PORT_CLDAP 389
Move calls to "dissector_add()" out of the register routines for TCP and 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
2000-04-08 07:07:42 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
/* desegmentation of LDAP */
static gboolean ldap_desegment = TRUE;
static guint global_ldaps_tcp_port = TCP_PORT_LDAPS;
static guint ssl_port = 0;
Small changes related to proto_reg_handoff; Use find_dissector; Initialize saved tcp_port pref properly; This should fix a possble bug wherein LDAP over SSL would not be dissected properly. (I don't have a test capture to verify this fix). svn path=/trunk/; revision=26764
2008-11-12 23:55:52 +00:00
static dissector_handle_t gssapi_handle;
static dissector_handle_t gssapi_wrap_handle;
static dissector_handle_t ntlmssp_handle;
static dissector_handle_t spnego_handle;
static dissector_handle_t ssl_handle;
static dissector_handle_t ldap_handle ;
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.) svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
static void prefs_register_ldap(void); /* forward declaration for use in preferences registration */
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
/* different types of rpc calls ontop of ms cldap */
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
#define MSCLDAP_RPC_NETLOGON 1
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Message type Choice values */
static const value_string ldap_ProtocolOp_choice_vals[] = {
{ 0, "bindRequest" },
{ 1, "bindResponse" },
{ 2, "unbindRequest" },
{ 3, "searchRequest" },
{ 4, "searchResEntry" },
{ 5, "searchResDone" },
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
{ 6, "searchResRef" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 7, "modifyRequest" },
{ 8, "modifyResponse" },
{ 9, "addRequest" },
{ 10, "addResponse" },
{ 11, "delRequest" },
{ 12, "delResponse" },
{ 13, "modDNRequest" },
{ 14, "modDNResponse" },
{ 15, "compareRequest" },
{ 16, "compareResponse" },
{ 17, "abandonRequest" },
{ 18, "extendedReq" },
{ 19, "extendedResp" },
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
{ 20, "intermediateResponse" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
Add tshark -z "ldap,srt" Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-26 00:28:18 +00:00
/* Procedure names (used in Service Response Time */
const value_string ldap_procedure_names[] = {
{ 0, "Bind" },
{ 3, "Search" },
{ 6, "Modify" },
{ 8, "Add" },
{ 10, "Delete" },
{ 12, "Modrdn" },
{ 14, "Compare" },
{ 23, "Extended" },
{ 0, NULL }
};
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
#define LOGON_PRIMARY_QUERY 7
#define LOGON_PRIMARY_RESPONSE 12
#define LOGON_SAM_LOGON_REQUEST 18
#define LOGON_SAM_LOGON_RESPONSE 19
#define LOGON_SAM_PAUSE_RESPONSE 20
#define LOGON_SAM_USER_UNKNOWN 21
#define LOGON_SAM_LOGON_RESPONSE_EX 23
#define LOGON_SAM_PAUSE_RESPONSE_EX 24
#define LOGON_SAM_USER_UNKNOWN_EX 25
static const value_string netlogon_opcode_vals[] = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
{ LOGON_PRIMARY_QUERY, "LOGON_PRIMARY_QUERY" },
{ LOGON_PRIMARY_RESPONSE, "LOGON_PRIMARY_RESPONSE" },
{ LOGON_SAM_LOGON_REQUEST, "LOGON_SAM_LOGON_REQUEST" },
{ LOGON_SAM_LOGON_RESPONSE, "LOGON_SAM_LOGON_RESPONSE" },
{ LOGON_SAM_PAUSE_RESPONSE, "LOGON_SAM_PAUSE_RESPONSE" },
{ LOGON_SAM_LOGON_RESPONSE_EX, "LOGON_SAM_LOGON_RESPONSE_EX" },
{ LOGON_SAM_PAUSE_RESPONSE_EX, "LOGON_SAM_PAUSE_RESPONSE_EX" },
{ LOGON_SAM_USER_UNKNOWN_EX, "LOGON_SAM_USER_UNKNOWN_EX" },
{ 0, NULL }
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
};
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
#define LDAP_NUM_PROCEDURES 24
static void
ldapstat_init(struct register_srt* srt _U_, GArray* srt_array, srt_gui_init_cb gui_callback, void* gui_data)
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
srt_stat_table *ldap_srt_table;
guint32 i;
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldap_srt_table = init_srt_table("LDAP Commands", NULL, srt_array, LDAP_NUM_PROCEDURES, NULL, "ldap.protocolOp", gui_callback, gui_data, NULL);
for (i = 0; i < LDAP_NUM_PROCEDURES; i++)
{
init_srt_table_row(ldap_srt_table, i, val_to_str_const(i, ldap_procedure_names, "<unknown>"));
}
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
}
static int
ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi)
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
guint i = 0;
srt_stat_table *ldap_srt_table;
const ldap_call_response_t *ldap=(const ldap_call_response_t *)psi;
srt_data_t *data = (srt_data_t *)pldap;
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* we are only interested in reply packets */
if(ldap->is_request){
return 0;
}
/* if we havnt seen the request, just ignore it */
if(!ldap->req_frame){
return 0;
}
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* only use the commands we know how to handle */
switch(ldap->protocolOpTag){
case LDAP_REQ_BIND:
case LDAP_REQ_SEARCH:
case LDAP_REQ_MODIFY:
case LDAP_REQ_ADD:
case LDAP_REQ_DELETE:
case LDAP_REQ_MODRDN:
case LDAP_REQ_COMPARE:
case LDAP_REQ_EXTENDED:
break;
default:
return 0;
}
ldap_srt_table = g_array_index(data->srt_array, srt_stat_table*, i);
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
add_srt_table_data(ldap_srt_table, ldap->protocolOpTag, &ldap->req_time, pinfo);
return 1;
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
}
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
/*
* Data structure attached to a conversation, giving authentication
* information from a bind request.
*/
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
typedef struct ldap_conv_info_t {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
guint auth_type; /* authentication type */
char *auth_mech; /* authentication mechanism */
guint32 first_auth_frame; /* first frame that would use a security layer */
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
wmem_map_t *unmatched;
wmem_map_t *matched;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
gboolean is_mscldap;
guint32 num_results;
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
gboolean start_tls_pending;
guint32 start_tls_frame;
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
} ldap_conv_info_t;
A "GHashFunc()" returns a "guint", not a "gint". svn path=/trunk/; revision=8887
2003-11-05 20:10:00 +00:00
static guint
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
ldap_info_hash_matched(gconstpointer k)
{
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
const ldap_call_response_t *key = (const ldap_call_response_t *)k;
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
return key->messageId;
}
A "GHashFunc()" returns a "guint", not a "gint". svn path=/trunk/; revision=8887
2003-11-05 20:10:00 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
static gint
ldap_info_equal_matched(gconstpointer k1, gconstpointer k2)
{
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
const ldap_call_response_t *key1 = (const ldap_call_response_t*)k1;
const ldap_call_response_t *key2 = (const ldap_call_response_t*)k2;
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
if( key1->req_frame && key2->req_frame && (key1->req_frame!=key2->req_frame) ){
return 0;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* a response may span multiple frames
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
if( key1->rep_frame && key2->rep_frame && (key1->rep_frame!=key2->rep_frame) ){
return 0;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
*/
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
return key1->messageId==key2->messageId;
}
A "GHashFunc()" returns a "guint", not a "gint". svn path=/trunk/; revision=8887
2003-11-05 20:10:00 +00:00
static guint
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
ldap_info_hash_unmatched(gconstpointer k)
{
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
const ldap_call_response_t *key = (const ldap_call_response_t*)k;
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
return key->messageId;
}
A "GHashFunc()" returns a "guint", not a "gint". svn path=/trunk/; revision=8887
2003-11-05 20:10:00 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
static gint
ldap_info_equal_unmatched(gconstpointer k1, gconstpointer k2)
{
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
const ldap_call_response_t *key1 = (const ldap_call_response_t*)k1;
const ldap_call_response_t *key2 = (const ldap_call_response_t*)k2;
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
return key1->messageId==key2->messageId;
}
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
/* These are the NtVer flags
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
http://msdn.microsoft.com/en-us/library/cc201035.aspx
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
*/
static const true_false_string tfs_ntver_v1 = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client requested version 1 netlogon response",
"Version 1 netlogon response not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ntver_v5 = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client requested version 5 netlogon response",
"Version 5 netlogon response not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ntver_v5ex = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client requested version 5 extended netlogon response",
"Version 5 extended response not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static const true_false_string tfs_ntver_v5ep = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client has requested IP address of the server",
"IP address of server not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static const true_false_string tfs_ntver_vcs = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client has asked for the closest site information",
"Closest site information not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static const true_false_string tfs_ntver_vnt4 = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client is requesting server to avoid NT4 emulation",
"Only full AD DS requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static const true_false_string tfs_ntver_vpdc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client has requested the Primary Domain Controller",
"Primary Domain Controller not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
static const true_false_string tfs_ntver_vip = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client has requested IP details (obsolete)",
"IP details not requested (obsolete)"
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
};
static const true_false_string tfs_ntver_vl = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client indicated that it is the local machine",
"Client is not the local machine"
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
};static const true_false_string tfs_ntver_vgc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Client has requested a Global Catalog server",
"Global Catalog not requested"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
/* Stuff for generation/handling of fields for custom AttributeValues */
typedef struct _attribute_type_t {
gchar* attribute_type;
gchar* attribute_desc;
} attribute_type_t;
static attribute_type_t* attribute_types = NULL;
static guint num_attribute_types = 0;
static GHashTable* attribute_types_hash = NULL;
Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 01:21:25 +00:00
static gboolean
UAT error string pointers should not be const pointers. UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 20:13:45 +00:00
attribute_types_update_cb(void *r, char **err)
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
{
Get rid of a couple of warnings. svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
attribute_type_t *rec = (attribute_type_t *)r;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
char c;
if (rec->attribute_type == NULL) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Attribute type can't be empty");
Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 01:21:25 +00:00
return FALSE;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
}
g_strstrip(rec->attribute_type);
if (rec->attribute_type[0] == 0) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Attribute type can't be empty");
Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 01:21:25 +00:00
return FALSE;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
}
/* Check for invalid characters (to avoid asserting out when
* registering the field).
*/
c = proto_check_field_name(rec->attribute_type);
if (c) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup_printf("Attribute type can't contain '%c'", c);
Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 01:21:25 +00:00
return FALSE;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
}
*err = NULL;
Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 01:21:25 +00:00
return TRUE;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
}
static void *
attribute_types_copy_cb(void* n, const void* o, size_t siz _U_)
{
Get rid of a couple of warnings. svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
attribute_type_t* new_rec = (attribute_type_t*)n;
Get rid of a couple of warnings. svn path=/trunk/; revision=43064
2012-06-04 12:20:37 +00:00
const attribute_type_t* old_rec = (const attribute_type_t*)o;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
new_rec->attribute_type = g_strdup(old_rec->attribute_type);
new_rec->attribute_desc = g_strdup(old_rec->attribute_desc);
return new_rec;
}
static void
attribute_types_free_cb(void*r)
{
Get rid of a couple of warnings. svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
attribute_type_t* rec = (attribute_type_t*)r;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
if (rec->attribute_type) g_free(rec->attribute_type);
if (rec->attribute_desc) g_free(rec->attribute_desc);
}
UAT_CSTRING_CB_DEF(attribute_types, attribute_type, attribute_type_t)
UAT_CSTRING_CB_DEF(attribute_types, attribute_desc, attribute_type_t)
/*
*
*/
static gint*
get_hf_for_header(char* attribute_type)
{
gint* hf_id = NULL;
if (attribute_types_hash) {
hf_id = (gint*) g_hash_table_lookup(attribute_types_hash, attribute_type);
} else {
hf_id = NULL;
}
return hf_id;
}
/*
*
*/
static void
attribute_types_initialize_cb(void)
{
static hf_register_info* hf;
gint* hf_id;
guint i;
gchar* attribute_type;
LDAP: Improved a if-check to avoid a analyzis warning. Change-Id: Iceeaa94a80543570a720281ac39d3ccd9ac924fa Reviewed-on: https://code.wireshark.org/review/4699 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-15 09:58:40 +00:00
if (attribute_types_hash && hf) {
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
guint hf_size = g_hash_table_size (attribute_types_hash);
Added Reload Lua plugins. This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11 12:08:08 +00:00
/* Deregister all fields */
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
for (i = 0; i < hf_size; i++) {
Added Reload Lua plugins. This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11 12:08:08 +00:00
proto_deregister_field (proto_ldap, *(hf[i].p_id));
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
g_free (hf[i].p_id);
}
g_hash_table_destroy (attribute_types_hash);
Improved deregistering fields. This improvement avoids use of deallocated memory (crash) if using a deregistered field in display filter, color filter, custom column and other cases when the field is used as "interesting field". This functionality is currently used in http, imf and ldap preferences. Also removed unused proto_registrar_n() as this does not work correctly after deregistering fields. Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94 Reviewed-on: https://code.wireshark.org/review/5161 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-06 10:19:25 +00:00
proto_add_deregistered_data (hf);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
attribute_types_hash = NULL;
}
if (num_attribute_types) {
attribute_types_hash = g_hash_table_new(g_str_hash, g_str_equal);
Get rid of a couple of warnings. svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
hf = g_new0(hf_register_info,num_attribute_types);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
for (i = 0; i < num_attribute_types; i++) {
Get rid of a couple of warnings. svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
hf_id = g_new(gint,1);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
*hf_id = -1;
attribute_type = g_strdup(attribute_types[i].attribute_type);
hf[i].p_id = hf_id;
hf[i].hfinfo.name = attribute_type;
hf[i].hfinfo.abbrev = g_strdup_printf("ldap.AttributeValue.%s", attribute_type);
hf[i].hfinfo.type = FT_STRING;
hf[i].hfinfo.display = BASE_NONE;
hf[i].hfinfo.strings = NULL;
Initialize all header_field_info members Change-Id: Id86d17f1e321b8cc73fb732aaf674e1420a0a745 Reviewed-on: https://code.wireshark.org/review/15737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-05 14:27:37 +00:00
hf[i].hfinfo.bitmask = 0;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
hf[i].hfinfo.blurb = g_strdup(attribute_types[i].attribute_desc);
Initialize all header_field_info members Change-Id: Id86d17f1e321b8cc73fb732aaf674e1420a0a745 Reviewed-on: https://code.wireshark.org/review/15737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-05 14:27:37 +00:00
HFILL_INIT(hf[i]);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
g_hash_table_insert(attribute_types_hash, attribute_type, hf_id);
}
proto_register_field_array(proto_ldap, hf, num_attribute_types);
}
}
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
/* MS-ADTS specification, section 7.3.1.1, NETLOGON_NT_VERSION Options Bits */
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset)
{
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * flags[] = {
&hf_mscldap_ntver_flags_v1,
&hf_mscldap_ntver_flags_v5,
&hf_mscldap_ntver_flags_v5ex,
&hf_mscldap_ntver_flags_v5ep,
&hf_mscldap_ntver_flags_vcs,
&hf_mscldap_ntver_flags_vnt4,
&hf_mscldap_ntver_flags_vpdc,
&hf_mscldap_ntver_flags_vip,
&hf_mscldap_ntver_flags_vl,
&hf_mscldap_ntver_flags_vgc,
NULL
};
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hf_mscldap_ntver_flags,
ett_mscldap_ntver_flags, flags, ENC_LITTLE_ENDIAN, BMT_NO_FALSE);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
offset += 4;
return offset;
}
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
/* This string contains the last LDAPString that was decoded */
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
static const char *attributedesc_string=NULL;
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
/* This string contains the last AssertionValue that was decoded */
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
static char *ldapvalue_string=NULL;
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
Constify to fix compiler warnings. Check for printable ASCII - 0x7F is >= 0x20, but it's not printable, and 0x80 through 0xFF aren't ASCII. Note that we should perhaps be using RFC 2252-style schemas to figure out which attribute and assertion values are text and which are binary. svn path=/trunk/; revision=18447
2006-06-13 05:39:55 +00:00
/* if the octet string contain all printable ASCII characters, then
* display it as a string, othervise just display it in hex.
add simple heuristics to the decoding of assertionvalues to make it display ascii strings as ascii and binary data as hex bytes svn path=/trunk/; revision=18420
2006-06-10 05:07:42 +00:00
*/
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index)
add simple heuristics to the decoding of assertionvalues to make it display ascii strings as ascii and binary data as hex bytes svn path=/trunk/; revision=18420
2006-06-10 05:07:42 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
gint8 ber_class;
gboolean pc, ind, is_ascii;
gint32 tag;
guint32 len, i;
const guchar *str;
if(!implicit_tag){
offset=get_ber_identifier(tvb, offset, &ber_class, &pc, &tag);
offset=get_ber_length(tvb, offset, &len, &ind);
} else {
len=tvb_reported_length_remaining(tvb,offset);
}
add simple heuristics to the decoding of assertionvalues to make it display ascii strings as ascii and binary data as hex bytes svn path=/trunk/; revision=18420
2006-06-10 05:07:42 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
if(len==0){
return offset;
}
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* Some special/wellknown attributes in common LDAP (read AD)
* are neither ascii strings nor blobs of hex data.
* Special case these attributes and decode them more nicely.
*
* Add more special cases as required to prettify further
* (there can't be that many ones that are truly interesting)
*/
if(attributedesc_string && !strncmp("DomainSid", attributedesc_string, 9)){
tvbuff_t *sid_tvb;
char *tmpstr;
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* this octet string contains an NT SID */
sid_tvb=tvb_new_subset_length(tvb, offset, len);
dissect_nt_sid(sid_tvb, 0, tree, "SID", &tmpstr, hf_index);
ldapvalue_string=tmpstr;
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
goto finished;
} else if ( (len==16) /* GUIDs are always 16 bytes */
&& (attributedesc_string && !strncmp("DomainGuid", attributedesc_string, 10))) {
guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
e_guid_t uuid;
Make sure our strings aren't null before we pass them to strncmp(). svn path=/trunk/; revision=18723
2006-07-12 18:12:15 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* This octet string contained a GUID */
dissect_dcerpc_uuid_t(tvb, offset, actx->pinfo, tree, drep, hf_ldap_guid, &uuid);
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 1024);
g_snprintf(ldapvalue_string, 1023, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
uuid.data1, uuid.data2, uuid.data3, uuid.data4[0], uuid.data4[1],
uuid.data4[2], uuid.data4[3], uuid.data4[4], uuid.data4[5],
uuid.data4[6], uuid.data4[7]);
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
goto finished;
} else if (attributedesc_string && !strncmp("NtVer", attributedesc_string, 5)){
guint32 flags;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
len = 0;
/* get flag value to populate ldapvalue_string */
flags=tvb_get_letohl(tvb, offset);
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 1024);
g_snprintf(ldapvalue_string, 1023, "0x%08x",flags);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* populate bitmask subtree */
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
goto finished;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
}
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* It was not one of our "wellknown" attributes so make the best
* we can and just try to see if it is an ascii string or if it
* is a binary blob.
*
* XXX - should we support reading RFC 2252-style schemas
* for LDAP, and using that to determine how to display
* attribute values and assertion values?
*
* -- I don't think there are full schemas available that describe the
* interesting cases i.e. AD -- ronnie
*/
str=tvb_get_ptr(tvb, offset, len);
is_ascii=TRUE;
for(i=0;i<len;i++){
if(!g_ascii_isprint(str[i])){
is_ascii=FALSE;
break;
}
}
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* convert the string into a printable string */
if(is_ascii){
ldapvalue_string=wmem_strndup(wmem_packet_scope(), str, len);
} else {
ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 3*len);
for(i=0;i<len;i++){
g_snprintf(ldapvalue_string+i*3,3,"%02x",str[i]&0xff);
ldapvalue_string[3*i+2]=':';
}
ldapvalue_string[3*len-1]=0;
}
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
proto_tree_add_string(tree, hf_index, tvb, offset, len, ldapvalue_string);
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
finished:
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
offset+=len;
return offset;
add simple heuristics to the decoding of assertionvalues to make it display ascii strings as ascii and binary data as hex bytes svn path=/trunk/; revision=18420
2006-06-10 05:07:42 +00:00
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
/* This string contains the last Filter item that was decoded */
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
static const char *Filter_string=NULL;
Try to fix compilation with MSVC. Please review. svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
static const char *and_filter_string=NULL;
static const char *or_filter_string=NULL;
static const char *substring_value=NULL;
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
static const char *substring_item_init=NULL;
static const char *substring_item_any=NULL;
static const char *substring_item_final=NULL;
static const char *matching_rule_string=NULL;
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
static gboolean matching_rule_dnattr=FALSE;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
If we encounter an excessively long filter string or one with too many elements, add an expert item and throw a ReportedBoundsError. We may want to handle this more cleanly in the future but this avoids allocating a huge amount of memory. svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
#define MAX_FILTER_LEN 4096
static gint Filter_length;
#define MAX_FILTER_ELEMENTS 200
static gint Filter_elements;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Global variables */
static gint MessageID =-1;
static gint ProtocolOp = -1;
static gint result = 0;
static proto_item *ldm_tree = NULL; /* item to add text to */
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static void ldap_do_protocolop(packet_info *pinfo)
{
const gchar* valstr;
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if (do_protocolop) {
COL_INFO goodies for ldap dissector: - display DN in COL_INFO for bindi, search and add requests - display errors in COL_INFO for all replies - for search entries, display the number of results returned - display the message type in the "top level" protocol item svn path=/trunk/; revision=8021
2003-07-14 23:47:32 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
valstr = val_to_str(ProtocolOp, ldap_ProtocolOp_choice_vals, "Unknown (%%u)");
Changed check for having multiple ldap PDU's in one frame. The previous check is incorrect when the first ldap frame in the capture is selected and the filter is changed, or selecting "Follow TCP Stream". Also removed check_col(). svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, "%s(%u) ", valstr, MessageID);
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(ldm_tree)
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
proto_item_append_text(ldm_tree, " %s(%d)", valstr, MessageID);
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
do_protocolop = FALSE;
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static ldap_call_response_t *
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint messageId, guint protocolOpTag, ldap_conv_info_t *ldap_info)
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
{
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_call_response_t lcr, *lcrp=NULL;
/* first see if we have already matched this */
lcr.messageId=messageId;
switch(protocolOpTag){
case LDAP_REQ_BIND:
case LDAP_REQ_SEARCH:
case LDAP_REQ_MODIFY:
case LDAP_REQ_ADD:
case LDAP_REQ_DELETE:
case LDAP_REQ_MODRDN:
case LDAP_REQ_COMPARE:
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
case LDAP_REQ_EXTENDED:
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcr.is_request=TRUE;
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
lcr.req_frame=pinfo->num;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcr.rep_frame=0;
break;
case LDAP_RES_BIND:
case LDAP_RES_SEARCH_ENTRY:
case LDAP_RES_SEARCH_REF:
case LDAP_RES_SEARCH_RESULT:
case LDAP_RES_MODIFY:
case LDAP_RES_ADD:
case LDAP_RES_DELETE:
case LDAP_RES_MODRDN:
case LDAP_RES_COMPARE:
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
case LDAP_RES_EXTENDED:
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
case LDAP_RES_INTERMEDIATE:
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcr.is_request=FALSE;
lcr.req_frame=0;
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
lcr.rep_frame=pinfo->num;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
break;
Make sure our ldap_call_response_t struct is always completely initialized, fixing a "Conditional jump or move depends on uninitialised value" error found by valgrind fuzzing. svn path=/trunk/; revision=51516
2013-08-25 17:31:15 +00:00
default:
return NULL;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
lcrp=(ldap_call_response_t *)wmem_map_lookup(ldap_info->matched, &lcr);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp){
Tvbuffify the ASN.1 code and the Kerberos, LDAP, and SNMP dissectors. Clean up some problems that revealed. svn path=/trunk/; revision=3301
2001-04-15 07:30:03 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcrp->is_request=lcr.is_request;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
} else {
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* we haven't found a match - try and match it up */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
switch(protocolOpTag){
case LDAP_REQ_BIND:
case LDAP_REQ_SEARCH:
case LDAP_REQ_MODIFY:
case LDAP_REQ_ADD:
case LDAP_REQ_DELETE:
case LDAP_REQ_MODRDN:
case LDAP_REQ_COMPARE:
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
case LDAP_REQ_EXTENDED:
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* this a a request - add it to the unmatched list */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix spelling: cant-->can't, wont-->won't, etc Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 15:25:17 +00:00
/* check that we don't already have one of those in the
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
unmatched list and if so remove it */
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcr.messageId=messageId;
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
lcrp=(ldap_call_response_t *)wmem_map_lookup(ldap_info->unmatched, &lcr);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp){
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
wmem_map_remove(ldap_info->unmatched, lcrp);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
Fix spelling: cant-->can't, wont-->won't, etc Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 15:25:17 +00:00
/* if we can't reuse the old one, grab a new chunk */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(!lcrp){
emem -> wmem svn path=/trunk/; revision=52054
2013-09-15 13:24:14 +00:00
lcrp=wmem_new0(wmem_file_scope(), ldap_call_response_t);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
lcrp->messageId=messageId;
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
lcrp->req_frame=pinfo->num;
Add more fields to packet_info structure and use them. Add fields for the absolute time stamp (and another field for a presence flag for the absolute time stamp) and the packet encapsulation for the packet. This lets us remove the field for the packet encapsulation in the frame_data structure; do so. Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39 Reviewed-on: https://code.wireshark.org/review/13499 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23 03:50:21 +00:00
lcrp->req_time=pinfo->abs_ts;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcrp->rep_frame=0;
lcrp->protocolOpTag=protocolOpTag;
lcrp->is_request=TRUE;
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
wmem_map_insert(ldap_info->unmatched, lcrp, lcrp);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return NULL;
break;
case LDAP_RES_BIND:
case LDAP_RES_SEARCH_ENTRY:
case LDAP_RES_SEARCH_REF:
case LDAP_RES_SEARCH_RESULT:
case LDAP_RES_MODIFY:
case LDAP_RES_ADD:
case LDAP_RES_DELETE:
case LDAP_RES_MODRDN:
case LDAP_RES_COMPARE:
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
case LDAP_RES_EXTENDED:
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
case LDAP_RES_INTERMEDIATE:
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* this is a result - it should be in our unmatched list */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcr.messageId=messageId;
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
lcrp=(ldap_call_response_t *)wmem_map_lookup(ldap_info->unmatched, &lcr);
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp){
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(!lcrp->rep_frame){
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
wmem_map_remove(ldap_info->unmatched, lcrp);
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
lcrp->rep_frame=pinfo->num;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
lcrp->is_request=FALSE;
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
wmem_map_insert(ldap_info->matched, lcrp, lcrp);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
}
Have the routines that supply a pointer to a newly-constructed item 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
2002-03-01 03:02:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
break;
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* we have found a match */
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp){
marik the request_in/response_to/time as generated fields svn path=/trunk/; revision=18846
2006-08-07 10:35:26 +00:00
proto_item *it;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp->is_request){
marik the request_in/response_to/time as generated fields svn path=/trunk/; revision=18846
2006-08-07 10:35:26 +00:00
it=proto_tree_add_uint(tree, hf_ldap_response_in, tvb, 0, 0, lcrp->rep_frame);
PROTO_ITEM_SET_GENERATED(it);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
} else {
nstime_t ns;
marik the request_in/response_to/time as generated fields svn path=/trunk/; revision=18846
2006-08-07 10:35:26 +00:00
it=proto_tree_add_uint(tree, hf_ldap_response_to, tvb, 0, 0, lcrp->req_frame);
PROTO_ITEM_SET_GENERATED(it);
Add more fields to packet_info structure and use them. Add fields for the absolute time stamp (and another field for a presence flag for the absolute time stamp) and the packet encapsulation for the packet. This lets us remove the field for the packet encapsulation in the frame_data structure; do so. Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39 Reviewed-on: https://code.wireshark.org/review/13499 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23 03:50:21 +00:00
nstime_delta(&ns, &pinfo->abs_ts, &lcrp->req_time);
marik the request_in/response_to/time as generated fields svn path=/trunk/; revision=18846
2006-08-07 10:35:26 +00:00
it=proto_tree_add_time(tree, hf_ldap_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
Report ASN.1 BER parsing errors closer to the point at which they're detected, so we do a better job of reporting the item with the problem. svn path=/trunk/; revision=4853
2002-03-03 01:26:01 +00:00
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return lcrp;
Updates from Doug Nazar. svn path=/trunk/; revision=1760
2000-03-29 09:25:21 +00:00
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Add routines for adding items to a protocol tree that take arguments of 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
2000-05-31 05:09:07 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Included file: packet-ldap-fn.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-fn.c"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Cyclic dependencies ---*/
Add routines for adding items to a protocol tree that take arguments of 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
2000-05-31 05:09:07 +00:00
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
/* Filter -> Filter/and -> Filter/and/_item -> Filter */
/* Filter -> Filter/or -> Filter/or/_item -> Filter */
/* Filter -> Filter/not -> Filter */
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
Add routines for adding items to a protocol tree that take arguments of 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
2000-05-31 05:09:07 +00:00
Add a routine to "asn1.c" to translate ASN1_ERR_ values to strings. Use 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
2002-03-01 02:48:10 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 91 "./asn1/ldap/ldap.cnf"
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
- Removed some unused variables in asn1 dissectors - Fixed last parameter to cry_cipher_open() in pkcs12 svn path=/trunk/; revision=24116
2008-01-16 20:41:23 +00:00
&MessageID);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldm_tree = tree;
Updates from Doug Nazar. svn path=/trunk/; revision=1760
2000-03-29 09:25:21 +00:00
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Dissect SASL credentials. svn path=/trunk/; revision=6087
2002-08-26 09:21:54 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
- Removed some unused variables in asn1 dissectors - Fixed last parameter to cry_cipher_open() in pkcs12 svn path=/trunk/; revision=24116
2008-01-16 20:41:23 +00:00
NULL);
Dissect SASL credentials. svn path=/trunk/; revision=6087
2002-08-26 09:21:54 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Dissect SASL credentials. svn path=/trunk/; revision=6087
2002-08-26 09:21:54 +00:00
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 301 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
tvbuff_t *parameter_tvb = NULL;
Squelch a bunch of compiler warnings. svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
const char *ldapstring = NULL;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
gchar *sc = NULL; /* semi-colon pointer */
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&parameter_tvb);
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Doug Nazar's patch to dissect substring filters. svn path=/trunk/; revision=1949
2000-05-12 08:04:29 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if (parameter_tvb || (hf_index == hf_ldap_baseObject)) {
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
ldap_do_protocolop(actx->pinfo);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(parameter_tvb)
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
ldapstring = tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb, 0), ENC_UTF_8|ENC_NA);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(hf_index == hf_ldap_baseObject) {
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
/* this is search - put it on the scanline */
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(!ldapstring || !*ldapstring)
ldapstring = "<ROOT>";
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%s\" ", ldapstring);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " \"%s\"", ldapstring);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
if(!parameter_tvb) {
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(actx->created_item, " (%s)", ldapstring);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
}
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
} else if ((hf_index == hf_ldap_errorMessage) && ldapstring && *ldapstring) { /* only show message if not success */
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "(%s) ", ldapstring);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " (%s)", ldapstring);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
} else if ((hf_index == hf_ldap_objectName) ||
(hf_index == hf_ldap_name) ||
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
(hf_index == hf_ldap_entry) ||
(hf_index == hf_ldap_object) ||
(hf_index == hf_ldap_delRequest) ) {
if(!ldapstring || !*ldapstring)
ldapstring = "<ROOT>";
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%s\" ", ldapstring);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " \"%s\"", ldapstring);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
} else if (hf_index == hf_ldap_attributeDesc){
/* remember the attribute description */
attributedesc_string=ldapstring;
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
} else if (hf_index == hf_ldap_initial){
/* remember the substring item */
substring_item_init=ldapstring;
} else if (hf_index == hf_ldap_any){
/* remember the substring item */
substring_item_any=ldapstring;
} else if (hf_index == hf_ldap_final){
/* remember the substring item */
substring_item_final=ldapstring;
} else if (hf_index == hf_ldap_matchingRule){
/* remember the matching rule */
matching_rule_string=ldapstring;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
} else if (hf_index == hf_ldap_present){
/* remember the present name */
Filter_string=ldapstring;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
} else if (hf_index == hf_ldap_type) {
/* remember attribute type name */
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
attr_type = wmem_strdup(wmem_packet_scope(), ldapstring);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
/* append it to the parent entry */
proto_item_append_text(tree, " %s", attr_type);
/* remove the ";binary" component if present */
if((sc = strchr(attr_type, ';')) != NULL) {
if(!strcmp(sc, ";binary")) {
*sc = '\0'; /* terminate the string */
is_binary_attr_type = TRUE;
}
} else {
is_binary_attr_type = FALSE;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Doug Nazar's patch to dissect substring filters. svn path=/trunk/; revision=1949
2000-05-12 08:04:29 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Doug Nazar's patch to dissect substring filters. svn path=/trunk/; revision=1949
2000-05-12 08:04:29 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Doug Nazar's patch to dissect substring filters. svn path=/trunk/; revision=1949
2000-05-12 08:04:29 +00:00
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPString(implicit_tag, tvb, offset, actx, tree, hf_index);
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Simple(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 148 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_conv_info_t *ldap_info;
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
NULL);
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_info = (ldap_conv_info_t *)actx->private_data;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_info->auth_type = LDAP_AUTH_SIMPLE;
Don't do anything to the filter string until we've successfully parsed the extensibleMatch. Make sure the filter string is always null-terminated, as we use "strlen()" to skip to the end of it. On the (illegal, but not impossible) chance that we have more than one matching rule ID, attributeDescription, or matchValue, free any we already have before fetching a new one. svn path=/trunk/; revision=16609
2005-11-27 02:42:29 +00:00
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
A first pass at providing a dissector for extensibleMatch filters. More work to come on the whole filters shtick and more clean-up required here. svn path=/trunk/; revision=16558
2005-11-22 02:19:52 +00:00
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 156 "./asn1/ldap/ldap.cnf"
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_conv_info_t *ldap_info;
tvbuff_t *parameter_tvb;
char *mechanism = NULL;
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&parameter_tvb);
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_info = (ldap_conv_info_t *)actx->private_data;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_info->auth_type = LDAP_AUTH_SASL;
Updates from Doug Nazar. svn path=/trunk/; revision=1760
2000-03-29 09:25:21 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if (!parameter_tvb)
return offset;
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
/*
* We need to remember the authentication type and mechanism for this
* conversation.
*
* XXX - actually, we might need to remember more than one
* type and mechanism, if you can unbind and rebind with a
* different type and/or mechanism.
*/
only set ldap_info->first_auth_frame to 0 first time we see the authentication packet or else we will get inconsistent dissection when clicking on packets. (inconsistent as in : a certain packet might/might not be dissected as LDAP/SASL depending on which packets we clicked on previously) svn path=/trunk/; revision=22949
2007-09-25 08:05:17 +00:00
if(!actx->pinfo->fd->flags.visited) {
Do not mix wmem and glib allocators Change-Id: I4bf861ed9e6b767341f2cbd4e926606d4919f2ef Reviewed-on: https://code.wireshark.org/review/15041 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-21 15:26:38 +00:00
mechanism = tvb_get_string_enc(wmem_file_scope(), parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb,0), ENC_UTF_8|ENC_NA);
only set ldap_info->first_auth_frame to 0 first time we see the authentication packet or else we will get inconsistent dissection when clicking on packets. (inconsistent as in : a certain packet might/might not be dissected as LDAP/SASL depending on which packets we clicked on previously) svn path=/trunk/; revision=22949
2007-09-25 08:05:17 +00:00
ldap_info->first_auth_frame = 0; /* not known until we see the bind reply */
/*
* If the mechanism in this request is an empty string (which is
* returned as a null pointer), use the saved mechanism instead.
* Otherwise, if the saved mechanism is an empty string (null),
* save this mechanism.
*/
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=42514
2012-05-08 17:42:54 +00:00
if (mechanism != NULL) {
Do not mix wmem and glib allocators Change-Id: I4bf861ed9e6b767341f2cbd4e926606d4919f2ef Reviewed-on: https://code.wireshark.org/review/15041 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-21 15:26:38 +00:00
wmem_free(wmem_file_scope(), ldap_info->auth_mech);
only set ldap_info->first_auth_frame to 0 first time we see the authentication packet or else we will get inconsistent dissection when clicking on packets. (inconsistent as in : a certain packet might/might not be dissected as LDAP/SASL depending on which packets we clicked on previously) svn path=/trunk/; revision=22949
2007-09-25 08:05:17 +00:00
ldap_info->auth_mech = mechanism;
}
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 190 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
tvbuff_t *parameter_tvb;
ldap_conv_info_t *ldap_info;
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
gint8 ber_class;
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
gboolean pc;
gint32 tag;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&parameter_tvb);
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if (!parameter_tvb)
return offset;
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_info = (ldap_conv_info_t *)actx->private_data;
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
get_ber_identifier(parameter_tvb, 0, &ber_class, &pc, &tag);
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
/*if ((ldap_info->auth_mech != NULL) && (strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) && (ber_class==BER_CLASS_CON)) {*/
if ((ldap_info->auth_mech != NULL) && (ber_class==BER_CLASS_CON)) {
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
/*
* This is a GSS-API token ancapsulated within GSS-SPNEGO.
* We need to check the first byte to check whether the blob
* contains SPNEGO or GSSAPI.
* All SPNEGO PDUs are of class CONSTRUCTED while
* GSS PDUs are class APPLICATION
*/
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
if (parameter_tvb && (tvb_reported_length(parameter_tvb) > 0))
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
call_dissector(spnego_handle, parameter_tvb, actx->pinfo, tree);
}
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
/*if ((ldap_info->auth_mech != NULL) && ((strcmp(ldap_info->auth_mech, "GSSAPI") == 0) || (ber_class==BER_CLASS_APP))) {*/
if ((ldap_info->auth_mech != NULL) && (ber_class==BER_CLASS_APP)) {
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
/*
* This is a raw GSS-API token.
*/
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
if (parameter_tvb && (tvb_reported_length(parameter_tvb) > 0)) {
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
call_dissector(gssapi_handle, parameter_tvb, actx->pinfo, tree);
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
/* Restore private data */
actx->private_data = ldap_info;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
add code to handle new insanity in how spnego and gss wrap eachother svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SaslCredentials_sequence[] = {
{ &hf_ldap_mechanism , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_Mechanism },
{ &hf_ldap_credentials , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_Credentials },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SaslCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SaslCredentials_sequence, hf_index, ett_ldap_SaslCredentials);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 690 "./asn1/ldap/ldap.cnf"
Tidy up of information column for NTLM authentication. Related to Bug 1148. svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
/* make sure the protocol op comes first */
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
ldap_do_protocolop(actx->pinfo);
Tidy up of information column for NTLM authentication. Related to Bug 1148. svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
call_dissector(ntlmssp_handle, tvb, actx->pinfo, tree);
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
offset+=tvb_reported_length_remaining(tvb, offset);
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_ntlmsspAuth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 697 "./asn1/ldap/ldap.cnf"
Tidy up of information column for NTLM authentication. Related to Bug 1148. svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
/* make sure the protocol op comes first */
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
ldap_do_protocolop(actx->pinfo);
Tidy up of information column for NTLM authentication. Related to Bug 1148. svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
call_dissector(ntlmssp_handle, tvb, actx->pinfo, tree);
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
offset+=tvb_reported_length_remaining(tvb, offset);
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static const value_string ldap_AuthenticationChoice_vals[] = {
{ 0, "simple" },
{ 3, "sasl" },
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
{ 10, "ntlmsspNegotiate" },
{ 11, "ntlmsspAuth" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_choice_t AuthenticationChoice_choice[] = {
{ 0, &hf_ldap_simple , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_Simple },
{ 3, &hf_ldap_sasl , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ldap_SaslCredentials },
{ 10, &hf_ldap_ntlmsspNegotiate, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_ldap_T_ntlmsspNegotiate },
{ 11, &hf_ldap_ntlmsspAuth , BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_ldap_T_ntlmsspAuth },
{ 0, NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 487 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
gint branch = -1;
gint auth = -1;
const gchar *valstr;
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_choice(actx, tree, tvb, offset,
AuthenticationChoice_choice, hf_index, ett_ldap_AuthenticationChoice,
&branch);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
ldap_do_protocolop(actx->pinfo);
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
if((branch > -1) && (branch < (gint)(sizeof AuthenticationChoice_choice/sizeof AuthenticationChoice_choice[0])))
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
auth = AuthenticationChoice_choice[branch].value;
valstr = val_to_str(auth, ldap_AuthenticationChoice_vals, "Unknown auth(%u)");
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Tidy up of information column for NTLM authentication. Related to Bug 1148. svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
/* If auth is NTLM (10 or 11) don't add to column as the NTLM dissection will do this */
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
if ((auth != 10) && (auth != 11))
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr);
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(ldm_tree)
proto_item_append_text(ldm_tree, " %s", valstr);
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t BindRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_version , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_1_127 },
{ &hf_ldap_name , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_authentication , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_AuthenticationChoice },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_BindRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
BindRequest_U_sequence, hf_index, ett_ldap_BindRequest_U);
return offset;
}
static int
dissect_ldap_BindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 0, TRUE, dissect_ldap_BindRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static const value_string ldap_BindResponse_resultCode_vals[] = {
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, "success" },
{ 1, "operationsError" },
{ 2, "protocolError" },
{ 3, "timeLimitExceeded" },
{ 4, "sizeLimitExceeded" },
{ 5, "compareFalse" },
{ 6, "compareTrue" },
{ 7, "authMethodNotSupported" },
{ 8, "strongAuthRequired" },
{ 10, "referral" },
{ 11, "adminLimitExceeded" },
{ 12, "unavailableCriticalExtension" },
{ 13, "confidentialityRequired" },
{ 14, "saslBindInProgress" },
{ 16, "noSuchAttribute" },
{ 17, "undefinedAttributeType" },
{ 18, "inappropriateMatching" },
{ 19, "constraintViolation" },
{ 20, "attributeOrValueExists" },
{ 21, "invalidAttributeSyntax" },
{ 32, "noSuchObject" },
{ 33, "aliasProblem" },
{ 34, "invalidDNSyntax" },
{ 36, "aliasDereferencingProblem" },
{ 48, "inappropriateAuthentication" },
{ 49, "invalidCredentials" },
{ 50, "insufficientAccessRights" },
{ 51, "busy" },
{ 52, "unavailable" },
{ 53, "unwillingToPerform" },
{ 54, "loopDetect" },
{ 64, "namingViolation" },
{ 65, "objectClassViolation" },
{ 66, "notAllowedOnNonLeaf" },
{ 67, "notAllowedOnRDN" },
{ 68, "entryAlreadyExists" },
{ 69, "objectClassModsProhibited" },
{ 71, "affectsMultipleDSAs" },
{ 80, "other" },
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ 118, "canceled" },
{ 119, "noSuchOperation" },
{ 120, "tooLate" },
{ 121, "cannotCancel" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
static int
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 421 "./asn1/ldap/ldap.cnf"
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
const gchar *valstr;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&result);
ldap_do_protocolop(actx->pinfo);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
valstr = val_to_str(result, ldap_BindResponse_resultCode_vals, "Unknown result(%u)");
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr);
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " %s", valstr);
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
return offset;
}
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_T_bindResponse_matchedDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 704 "./asn1/ldap/ldap.cnf"
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
tvbuff_t *new_tvb=NULL;
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
if( new_tvb
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
&& (tvb_reported_length(new_tvb)>=7)
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
&& (!tvb_memeql(new_tvb, 0, "NTLMSSP", 7))){
/* make sure the protocol op comes first */
ldap_do_protocolop(actx->pinfo);
call_dissector(ntlmssp_handle, new_tvb, actx->pinfo, tree);
}
return offset;
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ErrorMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPString(implicit_tag, tvb, offset, actx, tree, hf_index);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
NULL);
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 54 "./asn1/ldap/ldap.cnf"
Get rid of ber_last_created_item(). svn path=/trunk/; revision=24008
2008-01-04 12:39:52 +00:00
PROTO_ITEM_SET_URL(actx->created_item);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t Referral_sequence_of[1] = {
{ &hf_ldap_Referral_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPURL },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
Referral_sequence_of, hf_index, ett_ldap_Referral);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ServerSaslCreds(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 231 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Initialize attributedesc_string in a couple of places so that we don't end up trying to use an invalid pointer. svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
tvbuff_t *parameter_tvb = NULL;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_conv_info_t *ldap_info;
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&parameter_tvb);
if (!parameter_tvb)
return offset;
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_info = (ldap_conv_info_t *)actx->private_data;
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
switch (ldap_info->auth_type) {
/* For Kerberos V4, dissect it as a ticket. */
/* XXX - what about LDAP_AUTH_SIMPLE? */
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
case LDAP_AUTH_SASL:
/*
* All frames after this are assumed to use a security layer.
*
* XXX - won't work if there's another reply, with the security
* layer, starting in the same TCP segment that ends this
* reply, but as LDAP is a request/response protocol, and
* as the client probably can't start using authentication until
* it gets the bind reply and the server won't send a reply until
* it gets a request, that probably won't happen.
*
* XXX - that assumption is invalid; it's not clear where the
* hell you find out whether there's any security layer. In
* one capture, we have two GSS-SPNEGO negotiations, both of
* which select MS KRB5, and the only differences in the tokens
* is in the RC4-HMAC ciphertext. The various
* draft-ietf--cat-sasl-gssapi-NN.txt drafts seem to imply
* that the RFC 2222 spoo with the bitmask and maximum
* output message size stuff is done - but where does that
* stuff show up? Is it in the ciphertext, which means it's
* presumably encrypted?
*
* Grrr. We have to do a gross heuristic, checking whether the
* putative LDAP message begins with 0x00 or not, making the
* assumption that we won't have more than 2^24 bytes of
* encapsulated stuff.
*/
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
ldap_info->first_auth_frame = actx->pinfo->num + 1;
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
if (ldap_info->auth_mech != NULL &&
strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) {
add support for yet another random combination of authentication wrappers that can be used when connecting with sasl svn path=/trunk/; revision=22945
2007-09-25 04:15:30 +00:00
/* It could be the second leg of GSS-SPNEGO wrapping NTLMSSP
* which might not be wrapped in GSS-SPNEGO but be a raw
* NTLMSSP blob
*/
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
if ( (tvb_reported_length(parameter_tvb)>=7)
add support for yet another random combination of authentication wrappers that can be used when connecting with sasl svn path=/trunk/; revision=22945
2007-09-25 04:15:30 +00:00
&& (!tvb_memeql(parameter_tvb, 0, "NTLMSSP", 7))){
call_dissector(ntlmssp_handle, parameter_tvb, actx->pinfo, tree);
break;
}
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
/*
* This is a GSS-API token.
update to ldap. some implementations specify GSSAPI in the bind call. the encapsulation seems to be the same as GSS-SPNEGO so handle it the same way svn path=/trunk/; revision=9169
2003-12-04 08:13:27 +00:00
*/
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
if(parameter_tvb && (tvb_reported_length(parameter_tvb) > 0))
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
call_dissector(spnego_handle, parameter_tvb, actx->pinfo, tree);
update to ldap. some implementations specify GSSAPI in the bind call. the encapsulation seems to be the same as GSS-SPNEGO so handle it the same way svn path=/trunk/; revision=9169
2003-12-04 08:13:27 +00:00
} else if (ldap_info->auth_mech != NULL &&
strcmp(ldap_info->auth_mech, "GSSAPI") == 0) {
/*
* This is a GSS-API token.
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
*/
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
if(parameter_tvb && (tvb_reported_length(parameter_tvb) > 0))
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
call_dissector(gssapi_handle, parameter_tvb, actx->pinfo, tree);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
break;
}
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
actx->private_data = ldap_info;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t BindResponse_U_sequence[] = {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_bindResponse_resultCode, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_BindResponse_resultCode },
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
{ &hf_ldap_bindResponse_matchedDN, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_T_bindResponse_matchedDN },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_errorMessage , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ErrorMessage },
{ &hf_ldap_referral , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Referral },
{ &hf_ldap_serverSaslCreds, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_ServerSaslCreds },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
COL_INFO goodies for ldap dissector: - display DN in COL_INFO for bindi, search and add requests - display errors in COL_INFO for all replies - for search entries, display the number of results returned - display the message type in the "top level" protocol item svn path=/trunk/; revision=8021
2003-07-14 23:47:32 +00:00
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_BindResponse_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
BindResponse_U_sequence, hf_index, ett_ldap_BindResponse_U);
return offset;
}
static int
dissect_ldap_BindResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 1, TRUE, dissect_ldap_BindResponse_U);
return offset;
}
static int
dissect_ldap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_UnbindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 509 "./asn1/ldap/ldap.cnf"
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
- remove some #.MODULE_IMPORT from .cng files - regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
implicit_tag = TRUE; /* correct problem with asn2wrs */
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 2, TRUE, dissect_ldap_NULL);
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
ldap_do_protocolop(actx->pinfo);
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
return offset;
}
try to dissect the ms cldap netlogon rpc flags bits. the information comes from the samba sources and may or may not be reliable or menaingful. ms documentation in their knowledgebase says that the only really important part in the netlogon response is the sitename. (i have reasons to belive at least one of the flags, closest, is completely bogous) svn path=/trunk/; revision=10649
2004-04-20 08:33:15 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static const value_string ldap_T_scope_vals[] = {
{ 0, "baseObject" },
{ 1, "singleLevel" },
{ 2, "wholeSubtree" },
{ 0, NULL }
try to dissect the ms cldap netlogon rpc flags bits. the information comes from the samba sources and may or may not be reliable or menaingful. ms documentation in their knowledgebase says that the only really important part in the netlogon response is the sitename. (i have reasons to belive at least one of the flags, closest, is completely bogous) svn path=/trunk/; revision=10649
2004-04-20 08:33:15 +00:00
};
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 389 "./asn1/ldap/ldap.cnf"
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Initialize attributedesc_string in a couple of places so that we don't end up trying to use an invalid pointer. svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
guint32 scope = 0xffff;
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
const gchar *valstr;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&scope);
ldap_do_protocolop(actx->pinfo);
valstr = val_to_str(scope, ldap_T_scope_vals, "Unknown scope(%u)");
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr);
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " %s", valstr);
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static const value_string ldap_T_derefAliases_vals[] = {
{ 0, "neverDerefAliases" },
{ 1, "derefInSearching" },
{ 2, "derefFindingBaseObj" },
{ 3, "derefAlways" },
{ 0, NULL }
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_derefAliases(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
NULL);
return offset;
}
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_INTEGER_0_maxInt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
- Removed some unused variables in asn1 dissectors - Fixed last parameter to cry_cipher_open() in pkcs12 svn path=/trunk/; revision=24116
2008-01-16 20:41:23 +00:00
NULL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
Get rid of dissect_ber_boolean_value() and change the signature of dissect_ber_boolean() to return a value and update asn2wrs to generate the new signature. Regenerate all BER dissectors. svn path=/trunk/; revision=24015
2008-01-04 16:21:07 +00:00
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_and_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 555 "./asn1/ldap/ldap.cnf"
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
if(and_filter_string){
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
and_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(&%s%s)",and_filter_string,Filter_string);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
} else {
and_filter_string=Filter_string;
}
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t T_and_set_of[1] = {
{ &hf_ldap_and_item , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_T_and_item },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 562 "./asn1/ldap/ldap.cnf"
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
proto_tree *tr=NULL;
proto_item *it=NULL;
Try to fix compilation with MSVC. Please review. svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
const char *old_and_filter_string=and_filter_string;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
and_filter_string=NULL;
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
tr=proto_tree_add_subtree(tree, tvb, offset, -1, ett_ldap_T_and, &it, "and: ");
tree = tr;
Clean up the .cnf file a bit. svn path=/trunk/; revision=21992
2007-05-29 19:08:26 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
T_and_set_of, hf_index, ett_ldap_T_and);
Clean up the .cnf file a bit. svn path=/trunk/; revision=21992
2007-05-29 19:08:26 +00:00
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(and_filter_string) {
proto_item_append_text(it, "%s", and_filter_string);
*_stdup_printf -> strdup for "single string only" formatting. Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06 02:24:47 +00:00
Filter_string=wmem_strdup(wmem_packet_scope(), and_filter_string);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
and_filter_string=old_and_filter_string;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_or_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 580 "./asn1/ldap/ldap.cnf"
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
if(or_filter_string){
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
or_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(|%s%s)",or_filter_string,Filter_string);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
} else {
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
or_filter_string=Filter_string;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
}
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t T_or_set_of[1] = {
{ &hf_ldap_or_item , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_T_or_item },
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 588 "./asn1/ldap/ldap.cnf"
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
proto_tree *tr;
proto_item *it;
Try to fix compilation with MSVC. Please review. svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
const char *old_or_filter_string=or_filter_string;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
or_filter_string=NULL;
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
tr=proto_tree_add_subtree(tree, tvb, offset, -1, ett_ldap_T_or, &it, "or: ");
tree = tr;
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
T_or_set_of, hf_index, ett_ldap_T_or);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(or_filter_string) {
proto_item_append_text(it, "%s", or_filter_string);
*_stdup_printf -> strdup for "single string only" formatting. Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06 02:24:47 +00:00
Filter_string=wmem_strdup(wmem_packet_scope(), or_filter_string);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
or_filter_string=old_or_filter_string;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 607 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(!%s)",string_or_null(Filter_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeDescription(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPString(implicit_tag, tvb, offset, actx, tree, hf_index);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t AttributeValueAssertion_sequence[] = {
{ &hf_ldap_attributeDesc , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_assertionValue , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AssertionValue },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeValueAssertion_sequence, hf_index, ett_ldap_AttributeValueAssertion);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 532 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=%s)",
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
string_or_null(attributedesc_string),
string_or_null(ldapvalue_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
static const value_string ldap_T_substringFilter_substrings_item_vals[] = {
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, "initial" },
{ 1, "any" },
{ 2, "final" },
{ 0, NULL }
};
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_choice_t T_substringFilter_substrings_item_choice[] = {
{ 0, &hf_ldap_initial , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_LDAPString },
{ 1, &hf_ldap_any , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ldap_LDAPString },
{ 2, &hf_ldap_final , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ldap_LDAPString },
{ 0, NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_substringFilter_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_choice(actx, tree, tvb, offset,
T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
NULL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 633 "./asn1/ldap/ldap.cnf"
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
if (substring_item_final) {
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s%s",
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
(substring_value?substring_value:"*"),
substring_item_final);
} else if (substring_item_any) {
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s%s*",
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
(substring_value?substring_value:"*"),
substring_item_any);
} else if (substring_item_init) {
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s*",
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
substring_item_init);
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t T_substringFilter_substrings_sequence_of[1] = {
{ &hf_ldap_substringFilter_substrings_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_T_substringFilter_substrings_item },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_substringFilter_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
T_substringFilter_substrings_sequence_of, hf_index, ett_ldap_T_substringFilter_substrings);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SubstringFilter_sequence[] = {
{ &hf_ldap_type , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_substringFilter_substrings, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_T_substringFilter_substrings },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 647 "./asn1/ldap/ldap.cnf"
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
proto_tree *tr;
proto_item *it;
Try to fix compilation with MSVC. Please review. svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
const char *old_substring_value=substring_value;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
Initialize a variable. svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
attr_type=NULL;
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
substring_value=NULL;
substring_item_init=NULL;
substring_item_any=NULL;
substring_item_final=NULL;
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
tr=proto_tree_add_subtree(tree, tvb, offset, -1, ett_ldap_SubstringFilter, &it, "substring: ");
tree = tr;
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SubstringFilter_sequence, hf_index, ett_ldap_SubstringFilter);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=%s)",
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
string_or_null(attr_type),
string_or_null(substring_value));
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
proto_item_append_text(it, "%s", Filter_string);
substring_value=old_substring_value;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 538 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s>=%s)",
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
string_or_null(attributedesc_string),
string_or_null(ldapvalue_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 544 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s<=%s)",
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
string_or_null(attributedesc_string),
string_or_null(ldapvalue_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 604 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=*)",string_or_null(Filter_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 550 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s~=%s)",
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
string_or_null(attributedesc_string),
string_or_null(ldapvalue_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_MatchingRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPString(implicit_tag, tvb, offset, actx, tree, hf_index);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names) svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
static int
dissect_ldap_T_dnAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 610 "./asn1/ldap/ldap.cnf"
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names) svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
gboolean val;
Get rid of dissect_ber_boolean_value() and change the signature of dissect_ber_boolean() to return a value and update asn2wrs to generate the new signature. Regenerate all BER dissectors. svn path=/trunk/; revision=24015
2008-01-04 16:21:07 +00:00
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &val);
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names) svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
matching_rule_dnattr = val;
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t MatchingRuleAssertion_sequence[] = {
{ &hf_ldap_matchingRule , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_MatchingRuleId },
{ &hf_ldap_type , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_matchValue , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ldap_AssertionValue },
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names) svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
{ &hf_ldap_dnAttributes , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_T_dnAttributes },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
MatchingRuleAssertion_sequence, hf_index, ett_ldap_MatchingRuleAssertion);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 619 "./asn1/ldap/ldap.cnf"
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
attr_type=NULL;
matching_rule_string=NULL;
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
ldapvalue_string=NULL;
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
matching_rule_dnattr=FALSE;
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 625 "./asn1/ldap/ldap.cnf"
Apparently one of our major global headers must include emem.h, because I just found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s:%s%s%s=%s)",
from metze prettify dissection of filters containing substring and extensiblematch svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
(attr_type?attr_type:""),
(matching_rule_dnattr?"dn:":""),
(matching_rule_string?matching_rule_string:""),
(matching_rule_string?":":""),
Added one more string_or_null. svn path=/trunk/; revision=27482
2009-02-18 10:07:29 +00:00
string_or_null(ldapvalue_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static const value_string ldap_Filter_vals[] = {
{ 0, "and" },
{ 1, "or" },
{ 2, "not" },
{ 3, "equalityMatch" },
{ 4, "substrings" },
{ 5, "greaterOrEqual" },
{ 6, "lessOrEqual" },
{ 7, "present" },
{ 8, "approxMatch" },
{ 9, "extensibleMatch" },
{ 0, NULL }
};
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_choice_t Filter_choice[] = {
{ 0, &hf_ldap_and , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_T_and },
{ 1, &hf_ldap_or , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ldap_T_or },
{ 2, &hf_ldap_not , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ldap_T_not },
{ 3, &hf_ldap_equalityMatch , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ldap_T_equalityMatch },
{ 4, &hf_ldap_substrings , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ldap_SubstringFilter },
{ 5, &hf_ldap_greaterOrEqual , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_ldap_T_greaterOrEqual },
{ 6, &hf_ldap_lessOrEqual , BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_ldap_T_lessOrEqual },
{ 7, &hf_ldap_present , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_ldap_T_present },
{ 8, &hf_ldap_approxMatch , BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_ldap_T_approxMatch },
{ 9, &hf_ldap_extensibleMatch, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_ldap_T_extensibleMatch },
{ 0, NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 668 "./asn1/ldap/ldap.cnf"
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
proto_tree *tr;
proto_item *it;
Initialize attributedesc_string in a couple of places so that we don't end up trying to use an invalid pointer. svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
attributedesc_string=NULL;
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
If we encounter an excessively long filter string or one with too many elements, add an expert item and throw a ReportedBoundsError. We may want to handle this more cleanly in the future but this avoids allocating a huge amount of memory. svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
if (Filter_length++ > MAX_FILTER_LEN) {
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(actx->pinfo, tree, &ei_ldap_exceeded_filter_length, "Filter length exceeds %u. Giving up.", MAX_FILTER_LEN);
If we encounter an excessively long filter string or one with too many elements, add an expert item and throw a ReportedBoundsError. We may want to handle this more cleanly in the future but this avoids allocating a huge amount of memory. svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
THROW(ReportedBoundsError);
}
if (Filter_elements++ > MAX_FILTER_ELEMENTS) {
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(actx->pinfo, tree, &ei_ldap_too_many_filter_elements, "Found more than %u filter elements. Giving up.", MAX_FILTER_ELEMENTS);
If we encounter an excessively long filter string or one with too many elements, add an expert item and throw a ReportedBoundsError. We may want to handle this more cleanly in the future but this avoids allocating a huge amount of memory. svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
THROW(ReportedBoundsError);
}
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 01:35:40 +00:00
tr=proto_tree_add_subtree(tree, tvb, offset, -1, ett_ldap_Filter, &it, "Filter: ");
tree = tr;
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_choice(actx, tree, tvb, offset,
Filter_choice, hf_index, ett_ldap_Filter,
NULL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(Filter_string)
Add a string utility function "string_or_null" which can be used to guarantee a non-null string value. Use it in the LDAP dissector. Fixes the crash on Windows (and other platforms) reported in bug 3262. svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
proto_item_append_text(it, "%s", string_or_null(Filter_string));
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
return offset;
}
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static int
dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 521 "./asn1/ldap/ldap.cnf"
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Filter_string=NULL;
Properly initialize our filter counters. svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Filter_elements = 0;
Filter_length = 0;
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 526 "./asn1/ldap/ldap.cnf"
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Filter_string=NULL;
and_filter_string=NULL;
Properly initialize our filter counters. svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Filter_elements = 0;
Filter_length = 0;
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t AttributeDescriptionList_sequence_of[1] = {
{ &hf_ldap_AttributeDescriptionList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeDescriptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
AttributeDescriptionList_sequence_of, hf_index, ett_ldap_AttributeDescriptionList);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t SearchRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_baseObject , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_scope , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_scope },
{ &hf_ldap_derefAliases , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_derefAliases },
{ &hf_ldap_sizeLimit , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_0_maxInt },
{ &hf_ldap_timeLimit , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_0_maxInt },
{ &hf_ldap_typesOnly , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_filter , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_T_filter },
{ &hf_ldap_searchRequest_attributes, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescriptionList },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_SearchRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
SearchRequest_U_sequence, hf_index, ett_ldap_SearchRequest_U);
return offset;
}
static int
dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 3, TRUE, dissect_ldap_SearchRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 451 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Initialize more variables. svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
tvbuff_t *next_tvb = NULL;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
gchar *string;
guint32 i, len;
int old_offset = offset;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
gint *hf_id;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
The CLDAP attribute value on a CLDAP reply is no longer being decoded https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239 It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function. http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390 svn path=/trunk/; revision=34176
2010-09-21 14:56:55 +00:00
/* attr_type, should be set before calling this function */
Initialize a variable. svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
/* extract the value of the octetstring */
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
/* first check if we have a custom attribute type configured */
if ((hf_id = get_hf_for_header (attr_type)) != NULL)
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
proto_tree_add_item (tree, *hf_id, next_tvb, 0, tvb_reported_length_remaining(next_tvb, 0), ENC_UTF_8|ENC_NA);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
/* if we have an attribute type that isn't binary see if there is a better dissector */
Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new. svn path=/trunk/; revision=53049
2013-11-02 15:52:25 +00:00
else if(!attr_type || !next_tvb || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree, NULL)) {
Don't try to convert AttributeValue to string if having a ldap_name dissector. Prefix the converted printable string correctly with 'AttributeValue: '. svn path=/trunk/; revision=41823
2012-03-29 12:03:49 +00:00
offset = old_offset;
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Don't try to convert AttributeValue to string if having a ldap_name dissector. Prefix the converted printable string correctly with 'AttributeValue: '. svn path=/trunk/; revision=41823
2012-03-29 12:03:49 +00:00
/* do the default thing */
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
NULL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
len = tvb_reported_length_remaining(next_tvb, 0);
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Don't try to convert AttributeValue to string if having a ldap_name dissector. Prefix the converted printable string correctly with 'AttributeValue: '. svn path=/trunk/; revision=41823
2012-03-29 12:03:49 +00:00
for(i = 0; i < len; i++)
if(!g_ascii_isprint(tvb_get_guint8(next_tvb, i)))
break;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Don't try to convert AttributeValue to string if having a ldap_name dissector. Prefix the converted printable string correctly with 'AttributeValue: '. svn path=/trunk/; revision=41823
2012-03-29 12:03:49 +00:00
if(i == len) {
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
string = tvb_get_string_enc(wmem_packet_scope(), next_tvb, 0, tvb_reported_length_remaining(next_tvb, 0), ENC_ASCII|ENC_NA);
Don't try to convert AttributeValue to string if having a ldap_name dissector. Prefix the converted printable string correctly with 'AttributeValue: '. svn path=/trunk/; revision=41823
2012-03-29 12:03:49 +00:00
proto_item_set_text(actx->created_item, "AttributeValue: %s", string);
}
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
}
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = {
{ &hf_ldap_vals_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeValue },
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SET_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_AttributeValue_set_of, hf_index, ett_ldap_SET_OF_AttributeValue);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t PartialAttributeList_item_sequence[] = {
{ &hf_ldap_type , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_vals , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ldap_SET_OF_AttributeValue },
{ NULL, 0, 0, 0, NULL }
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_PartialAttributeList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
PartialAttributeList_item_sequence, hf_index, ett_ldap_PartialAttributeList_item);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t PartialAttributeList_sequence_of[1] = {
{ &hf_ldap_PartialAttributeList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_PartialAttributeList_item },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_PartialAttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
PartialAttributeList_sequence_of, hf_index, ett_ldap_PartialAttributeList);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t SearchResultEntry_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_objectName , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_searchResultEntry_attributes, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_PartialAttributeList },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_SearchResultEntry_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
SearchResultEntry_U_sequence, hf_index, ett_ldap_SearchResultEntry_U);
return offset;
}
static int
dissect_ldap_SearchResultEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 4, TRUE, dissect_ldap_SearchResultEntry_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static const value_string ldap_T_resultCode_vals[] = {
{ 0, "success" },
{ 1, "operationsError" },
{ 2, "protocolError" },
{ 3, "timeLimitExceeded" },
{ 4, "sizeLimitExceeded" },
{ 5, "compareFalse" },
{ 6, "compareTrue" },
{ 7, "authMethodNotSupported" },
{ 8, "strongAuthRequired" },
{ 10, "referral" },
{ 11, "adminLimitExceeded" },
{ 12, "unavailableCriticalExtension" },
{ 13, "confidentialityRequired" },
{ 14, "saslBindInProgress" },
{ 16, "noSuchAttribute" },
{ 17, "undefinedAttributeType" },
{ 18, "inappropriateMatching" },
{ 19, "constraintViolation" },
{ 20, "attributeOrValueExists" },
{ 21, "invalidAttributeSyntax" },
{ 32, "noSuchObject" },
{ 33, "aliasProblem" },
{ 34, "invalidDNSyntax" },
{ 36, "aliasDereferencingProblem" },
{ 48, "inappropriateAuthentication" },
{ 49, "invalidCredentials" },
{ 50, "insufficientAccessRights" },
{ 51, "busy" },
{ 52, "unavailable" },
{ 53, "unwillingToPerform" },
{ 54, "loopDetect" },
{ 64, "namingViolation" },
{ 65, "objectClassViolation" },
{ 66, "notAllowedOnNonLeaf" },
{ 67, "notAllowedOnRDN" },
{ 68, "entryAlreadyExists" },
{ 69, "objectClassModsProhibited" },
{ 71, "affectsMultipleDSAs" },
{ 80, "other" },
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ 118, "canceled" },
{ 119, "noSuchOperation" },
{ 120, "tooLate" },
{ 121, "cannotCancel" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 405 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
const gchar *valstr;
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&result);
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
ldap_do_protocolop(actx->pinfo);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
valstr = val_to_str(result, ldap_T_resultCode_vals, "Unknown result(%u)");
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(ldm_tree)
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(ldm_tree, " %s", valstr);
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t LDAPResult_sequence[] = {
{ &hf_ldap_resultCode , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_resultCode },
{ &hf_ldap_matchedDN , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_errorMessage , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ErrorMessage },
{ &hf_ldap_referral , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Referral },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAPResult_sequence, hf_index, ett_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SearchResultDone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 5, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t SEQUENCE_OF_LDAPURL_sequence_of[1] = {
{ &hf_ldap__untag_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPURL },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_SEQUENCE_OF_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
SEQUENCE_OF_LDAPURL_sequence_of, hf_index, ett_ldap_SEQUENCE_OF_LDAPURL);
return offset;
}
static int
dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 797 "./asn1/ldap/ldap.cnf"
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
ldap_do_protocolop(actx->pinfo);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static const value_string ldap_T_operation_vals[] = {
{ 0, "add" },
{ 1, "delete" },
{ 2, "replace" },
ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7 Reviewed-on: https://code.wireshark.org/review/15977 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 18:06:32 +00:00
{ 3, "increment" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_operation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
NULL);
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t AttributeTypeAndValues_sequence[] = {
{ &hf_ldap_type , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_vals , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ldap_SET_OF_AttributeValue },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeTypeAndValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeTypeAndValues_sequence, hf_index, ett_ldap_AttributeTypeAndValues);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_operation , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_operation },
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_modification , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeTypeAndValues },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
dissect_ldap_T_modifyRequest_modification_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
T_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static const ber_sequence_t ModifyRequest_modification_sequence_of[1] = {
{ &hf_ldap_modifyRequest_modification_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_T_modifyRequest_modification_item },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
dissect_ldap_ModifyRequest_modification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t ModifyRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_object , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_modifyRequest_modification, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyRequest_modification },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_ModifyRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
ModifyRequest_U_sequence, hf_index, ett_ldap_ModifyRequest_U);
return offset;
}
static int
dissect_ldap_ModifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 6, TRUE, dissect_ldap_ModifyRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ModifyResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 7, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t AttributeList_item_sequence[] = {
{ &hf_ldap_type , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_vals , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ldap_SET_OF_AttributeValue },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
AttributeList_item_sequence, hf_index, ett_ldap_AttributeList_item);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t AttributeList_sequence_of[1] = {
{ &hf_ldap_AttributeList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeList_item },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
AttributeList_sequence_of, hf_index, ett_ldap_AttributeList);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t AddRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_attributes , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeList },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_AddRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
AddRequest_U_sequence, hf_index, ett_ldap_AddRequest_U);
return offset;
}
static int
dissect_ldap_AddRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 8, TRUE, dissect_ldap_AddRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AddResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 9, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_DelRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 10, TRUE, dissect_ldap_LDAPDN);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_DelResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 11, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_RelativeLDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPString(implicit_tag, tvb, offset, actx, tree, hf_index);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t ModifyDNRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_newrdn , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_RelativeLDAPDN },
{ &hf_ldap_deleteoldrdn , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ &hf_ldap_newSuperior , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_LDAPDN },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_ModifyDNRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
ModifyDNRequest_U_sequence, hf_index, ett_ldap_ModifyDNRequest_U);
return offset;
}
static int
dissect_ldap_ModifyDNRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 12, TRUE, dissect_ldap_ModifyDNRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ModifyDNResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 13, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t CompareRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_ava , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeValueAssertion },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_CompareRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
CompareRequest_U_sequence, hf_index, ett_ldap_CompareRequest_U);
return offset;
}
static int
dissect_ldap_CompareRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 14, TRUE, dissect_ldap_CompareRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_CompareResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 15, TRUE, dissect_ldap_LDAPResult);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 804 "./asn1/ldap/ldap.cnf"
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
ldap_do_protocolop(actx->pinfo);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 57 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
tvbuff_t *parameter_tvb;
const gchar *name;
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->private_data;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&parameter_tvb);
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 65 "./asn1/ldap/ldap.cnf"
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
object_identifier_id = NULL;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if (!parameter_tvb)
return offset;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
object_identifier_id = tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb,0), ENC_UTF_8|ENC_NA);
Convert OID APIs to use wmem. There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them. Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f Reviewed-on: https://code.wireshark.org/review/6592 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 19:11:29 +00:00
name = oid_resolved_from_string(wmem_packet_scope(), object_identifier_id);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(name){
Get rid of ber_last_created_item(). svn path=/trunk/; revision=24008
2008-01-04 12:39:52 +00:00
proto_item_append_text(actx->created_item, " (%s)", name);
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
if((hf_index == hf_ldap_requestName) || (hf_index == hf_ldap_responseName)) {
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
ldap_do_protocolop(actx->pinfo);
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", name);
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
}
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
/* Has the client requested the Start TLS operation? */
if (ldap_info && hf_index == hf_ldap_requestName &&
!strcmp(object_identifier_id, "1.3.6.1.4.1.1466.20037")) {
/* remember we have asked to start_tls */
ldap_info->start_tls_pending = TRUE;
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
dissect_ldap_T_requestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 739 "./asn1/ldap/ldap.cnf"
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) {
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new. The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
} else {
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
NULL);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t ExtendedRequest_U_sequence[] = {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_requestName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_LDAPOID },
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_requestValue , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_T_requestValue },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_ExtendedRequest_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
ExtendedRequest_U_sequence, hf_index, ett_ldap_ExtendedRequest_U);
return offset;
}
static int
dissect_ldap_ExtendedRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 23, TRUE, dissect_ldap_ExtendedRequest_U);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
static const value_string ldap_ExtendedResponse_resultCode_vals[] = {
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, "success" },
{ 1, "operationsError" },
{ 2, "protocolError" },
{ 3, "timeLimitExceeded" },
{ 4, "sizeLimitExceeded" },
{ 5, "compareFalse" },
{ 6, "compareTrue" },
{ 7, "authMethodNotSupported" },
{ 8, "strongAuthRequired" },
{ 10, "referral" },
{ 11, "adminLimitExceeded" },
{ 12, "unavailableCriticalExtension" },
{ 13, "confidentialityRequired" },
{ 14, "saslBindInProgress" },
{ 16, "noSuchAttribute" },
{ 17, "undefinedAttributeType" },
{ 18, "inappropriateMatching" },
{ 19, "constraintViolation" },
{ 20, "attributeOrValueExists" },
{ 21, "invalidAttributeSyntax" },
{ 32, "noSuchObject" },
{ 33, "aliasProblem" },
{ 34, "invalidDNSyntax" },
{ 36, "aliasDereferencingProblem" },
{ 48, "inappropriateAuthentication" },
{ 49, "invalidCredentials" },
{ 50, "insufficientAccessRights" },
{ 51, "busy" },
{ 52, "unavailable" },
{ 53, "unwillingToPerform" },
{ 54, "loopDetect" },
{ 64, "namingViolation" },
{ 65, "objectClassViolation" },
{ 66, "notAllowedOnNonLeaf" },
{ 67, "notAllowedOnRDN" },
{ 68, "entryAlreadyExists" },
{ 69, "objectClassModsProhibited" },
{ 71, "affectsMultipleDSAs" },
{ 80, "other" },
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ 118, "canceled" },
{ 119, "noSuchOperation" },
{ 120, "tooLate" },
{ 121, "cannotCancel" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
static int
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
dissect_ldap_ExtendedResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 436 "./asn1/ldap/ldap.cnf"
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
guint32 resultCode;
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->private_data;
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
&resultCode);
/* If Start TLS request was sent and resultCode is success... */
if (ldap_info && ldap_info->start_tls_pending &&
hf_index == hf_ldap_extendedResponse_resultCode && resultCode == 0) {
/* The conversation will continue using SSL */
ssl_starttls_ack(find_dissector("ssl"), actx->pinfo, ldap_handle);
ldap_info->start_tls_pending = FALSE;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ResponseName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPOID(implicit_tag, tvb, offset, actx, tree, hf_index);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Dissect LDAPv3 search result references (s4.5.3 in rfc 2251). svn path=/trunk/; revision=7959
2003-07-02 04:03:27 +00:00
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static int
dissect_ldap_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
static const ber_sequence_t ExtendedResponse_U_sequence[] = {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_extendedResponse_resultCode, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_ExtendedResponse_resultCode },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_matchedDN , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN },
{ &hf_ldap_errorMessage , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ErrorMessage },
{ &hf_ldap_referral , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Referral },
{ &hf_ldap_responseName , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_ResponseName },
{ &hf_ldap_response , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
static int
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
dissect_ldap_ExtendedResponse_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
ExtendedResponse_U_sequence, hf_index, ett_ldap_ExtendedResponse_U);
return offset;
}
static int
dissect_ldap_ExtendedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 24, TRUE, dissect_ldap_ExtendedResponse_U);
Report ASN.1 BER parsing errors closer to the point at which they're detected, so we do a better job of reporting the item with the problem. svn path=/trunk/; revision=4853
2002-03-03 01:26:01 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
}
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
static int
dissect_ldap_T_intermediateResponse_responseValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 747 "./asn1/ldap/ldap.cnf"
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
const gchar *name;
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 751 "./asn1/ldap/ldap.cnf"
Add NULL pointer checks. Fixes the fuzz crash in bug 4351. svn path=/trunk/; revision=31362
2009-12-24 21:23:38 +00:00
if(ldm_tree && object_identifier_id) {
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
proto_item_set_text(ldm_tree, "%s %s", "IntermediateResponse", object_identifier_id);
Convert OID APIs to use wmem. There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them. Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f Reviewed-on: https://code.wireshark.org/review/6592 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 19:11:29 +00:00
name = oid_resolved_from_string(wmem_packet_scope(), object_identifier_id);
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
if(name)
proto_item_append_text(ldm_tree, " (%s)", name);
}
if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) {
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new. The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
} else {
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
}
return offset;
}
static const ber_sequence_t IntermediateResponse_U_sequence[] = {
{ &hf_ldap_responseName , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_ResponseName },
{ &hf_ldap_intermediateResponse_responseValue, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_T_intermediateResponse_responseValue },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_IntermediateResponse_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
IntermediateResponse_U_sequence, hf_index, ett_ldap_IntermediateResponse_U);
return offset;
}
static int
dissect_ldap_IntermediateResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 25, TRUE, dissect_ldap_IntermediateResponse_U);
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static const value_string ldap_ProtocolOp_vals[] = {
{ 0, "bindRequest" },
{ 1, "bindResponse" },
{ 2, "unbindRequest" },
{ 3, "searchRequest" },
{ 4, "searchResEntry" },
{ 5, "searchResDone" },
{ 19, "searchResRef" },
{ 6, "modifyRequest" },
{ 7, "modifyResponse" },
{ 8, "addRequest" },
{ 9, "addResponse" },
{ 10, "delRequest" },
{ 11, "delResponse" },
{ 12, "modDNRequest" },
{ 13, "modDNResponse" },
{ 14, "compareRequest" },
{ 15, "compareResponse" },
{ 16, "abandonRequest" },
{ 23, "extendedReq" },
{ 24, "extendedResp" },
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
{ 25, "intermediateResponse" },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ 0, NULL }
};
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_choice_t ProtocolOp_choice[] = {
{ 0, &hf_ldap_bindRequest , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_ldap_BindRequest },
{ 1, &hf_ldap_bindResponse , BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_ldap_BindResponse },
{ 2, &hf_ldap_unbindRequest , BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_ldap_UnbindRequest },
{ 3, &hf_ldap_searchRequest , BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_ldap_SearchRequest },
{ 4, &hf_ldap_searchResEntry , BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_ldap_SearchResultEntry },
{ 5, &hf_ldap_searchResDone , BER_CLASS_APP, 5, BER_FLAGS_NOOWNTAG, dissect_ldap_SearchResultDone },
{ 19, &hf_ldap_searchResRef , BER_CLASS_APP, 19, BER_FLAGS_NOOWNTAG, dissect_ldap_SearchResultReference },
{ 6, &hf_ldap_modifyRequest , BER_CLASS_APP, 6, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyRequest },
{ 7, &hf_ldap_modifyResponse , BER_CLASS_APP, 7, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyResponse },
{ 8, &hf_ldap_addRequest , BER_CLASS_APP, 8, BER_FLAGS_NOOWNTAG, dissect_ldap_AddRequest },
{ 9, &hf_ldap_addResponse , BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_ldap_AddResponse },
{ 10, &hf_ldap_delRequest , BER_CLASS_APP, 10, BER_FLAGS_NOOWNTAG, dissect_ldap_DelRequest },
{ 11, &hf_ldap_delResponse , BER_CLASS_APP, 11, BER_FLAGS_NOOWNTAG, dissect_ldap_DelResponse },
{ 12, &hf_ldap_modDNRequest , BER_CLASS_APP, 12, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyDNRequest },
{ 13, &hf_ldap_modDNResponse , BER_CLASS_APP, 13, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyDNResponse },
{ 14, &hf_ldap_compareRequest , BER_CLASS_APP, 14, BER_FLAGS_NOOWNTAG, dissect_ldap_CompareRequest },
{ 15, &hf_ldap_compareResponse, BER_CLASS_APP, 15, BER_FLAGS_NOOWNTAG, dissect_ldap_CompareResponse },
{ 16, &hf_ldap_abandonRequest , BER_CLASS_APP, 16, BER_FLAGS_NOOWNTAG, dissect_ldap_AbandonRequest },
{ 23, &hf_ldap_extendedReq , BER_CLASS_APP, 23, BER_FLAGS_NOOWNTAG, dissect_ldap_ExtendedRequest },
{ 24, &hf_ldap_extendedResp , BER_CLASS_APP, 24, BER_FLAGS_NOOWNTAG, dissect_ldap_ExtendedResponse },
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
{ 25, &hf_ldap_intermediateResponse, BER_CLASS_APP, 25, BER_FLAGS_NOOWNTAG, dissect_ldap_IntermediateResponse },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ 0, NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Additional LDAP checks for invalid packets, from Scott Renfro. svn path=/trunk/; revision=3404
2001-05-08 19:46:32 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 99 "./asn1/ldap/ldap.cnf"
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_call_response_t *lcrp;
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->private_data;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
do_protocolop = TRUE;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_choice(actx, tree, tvb, offset,
ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
&ProtocolOp);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 105 "./asn1/ldap/ldap.cnf"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
new ldap dissector svn path=/trunk/; revision=23459
2007-11-15 10:32:45 +00:00
if (ProtocolOp == -1) {
return offset;
}
/* ProtocolOp is the index, not the tag so convert it to the tag value */
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
ProtocolOp = ldap_ProtocolOp_vals[ProtocolOp].value;
new ldap dissector svn path=/trunk/; revision=23459
2007-11-15 10:32:45 +00:00
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
lcrp=ldap_match_call_response(tvb, actx->pinfo, tree, MessageID, ProtocolOp, ldap_info);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
if(lcrp){
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
tap_queue_packet(ldap_tap, actx->pinfo, lcrp);
Report ASN.1 BER parsing errors closer to the point at which they're detected, so we do a better job of reporting the item with the problem. svn path=/trunk/; revision=4853
2002-03-03 01:26:01 +00:00
}
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* XXX: the count will not work if the results span multiple TCP packets */
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
[LDAP] Bugfix counting of search results. Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-26 14:09:23 +00:00
if(ldap_info) { /* only count once */
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
switch(ProtocolOp) {
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
case LDAP_RES_SEARCH_ENTRY:
[LDAP] Bugfix counting of search results. Bug: 11761 Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553 Reviewed-on: https://code.wireshark.org/review/12184 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-26 14:09:23 +00:00
if (!actx->pinfo->fd->flags.visited)
ldap_info->num_results++;
Have the routines that supply a pointer to a newly-constructed item 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
2002-03-01 03:02:36 +00:00
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(tree, " [%d result%s]",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s");
Have the routines that supply a pointer to a newly-constructed item 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
2002-03-01 03:02:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
break;
Have the routines that supply a pointer to a newly-constructed item 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
2002-03-01 03:02:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
case LDAP_RES_SEARCH_RESULT:
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Get rid of check_col(); svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [%d result%s]",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s");
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
proto_item_append_text(tree, " [%d result%s]",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s");
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
break;
Have the routines that supply a pointer to a newly-constructed item 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
2002-03-01 03:02:36 +00:00
default:
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
break;
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
}
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
}
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ldap_LDAPOID(implicit_tag, tvb, offset, actx, tree, hf_index);
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 720 "./asn1/ldap/ldap.cnf"
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
gint8 ber_class;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
gboolean pc, ind;
gint32 tag;
guint32 len;
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) {
Fix LDAP crash (on certain platforms) from http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1613 : if the string is NULL pass "(null)" in instead (that's the behavior we get on Linux anyway). svn path=/trunk/; revision=24660
2008-03-16 22:54:37 +00:00
/* remove the OCTET STRING encoding */
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
offset=dissect_ber_identifier(actx->pinfo, NULL, tvb, offset, &ber_class, &pc, &tag);
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
offset=dissect_ber_length(actx->pinfo, NULL, tvb, offset, &len, &ind);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new. The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. svn path=/trunk/; revision=52994
2013-10-31 00:57:03 +00:00
call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
offset += len;
} else {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
NULL);
}
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t Control_sequence[] = {
{ &hf_ldap_controlType , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ControlType },
{ &hf_ldap_criticality , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ &hf_ldap_controlValue , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_T_controlValue },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Control(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
Control_sequence, hf_index, ett_ldap_Control);
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
}
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t Controls_sequence_of[1] = {
{ &hf_ldap_Controls_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_Control },
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Give each LDAP packet its own top-level protocol tree item. (This also 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
2002-01-14 03:01:13 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_Controls(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
Controls_sequence_of, hf_index, ett_ldap_Controls);
Give each LDAP packet its own top-level protocol tree item. (This also 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
2002-01-14 03:01:13 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
Updates from Doug Nazar. svn path=/trunk/; revision=1760
2000-03-29 09:25:21 +00:00
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t LDAPMessage_sequence[] = {
{ &hf_ldap_messageID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_MessageID },
{ &hf_ldap_protocolOp , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_ProtocolOp },
{ &hf_ldap_controls , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Controls },
{ NULL, 0, 0, 0, NULL }
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
};
Each LDAP message gets a top-level LDAP tree of its own; there's no need for a subtree for the message. svn path=/trunk/; revision=7814
2003-06-09 07:45:36 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_LDAPMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
LDAPMessage_sequence, hf_index, ett_ldap_LDAPMessage);
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
return offset;
}
COL_INFO goodies for ldap dissector: - display DN in COL_INFO for bindi, search and add requests - display errors in COL_INFO for all replies - for search entries, display the number of results returned - display the message type in the "top level" protocol item svn path=/trunk/; revision=8021
2003-07-14 23:47:32 +00:00
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
- Removed some unused variables in asn1 dissectors - Fixed last parameter to cry_cipher_open() in pkcs12 svn path=/trunk/; revision=24116
2008-01-16 20:41:23 +00:00
NULL);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SearchControlValue_sequence[] = {
{ &hf_ldap_size , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER },
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ NULL, 0, 0, 0, NULL }
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SearchControlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SearchControlValue_sequence, hf_index, ett_ldap_SearchControlValue);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SortKeyList_item_sequence[] = {
{ &hf_ldap_attributeType , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription },
{ &hf_ldap_orderingRule , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_MatchingRuleId },
{ &hf_ldap_reverseOrder , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_BOOLEAN },
{ NULL, 0, 0, 0, NULL }
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SortKeyList_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SortKeyList_item_sequence, hf_index, ett_ldap_SortKeyList_item);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SortKeyList_sequence_of[1] = {
{ &hf_ldap_SortKeyList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_SortKeyList_item },
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SortKeyList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
SortKeyList_sequence_of, hf_index, ett_ldap_SortKeyList);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
static const value_string ldap_T_sortResult_vals[] = {
{ 0, "success" },
{ 1, "operationsError" },
{ 3, "timeLimitExceeded" },
{ 8, "strongAuthRequired" },
{ 11, "adminLimitExceeded" },
{ 16, "noSuchAttribute" },
{ 18, "inappropriateMatching" },
{ 50, "insufficientAccessRights" },
{ 51, "busy" },
{ 53, "unwillingToPerform" },
{ 80, "other" },
{ 0, NULL }
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_T_sortResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
actx in the rest of dissect_ber..()l svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
NULL);
return offset;
}
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
static const ber_sequence_t SortResult_sequence[] = {
{ &hf_ldap_sortResult , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_sortResult },
{ &hf_ldap_attributeType , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_AttributeDescription },
{ NULL, 0, 0, 0, NULL }
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
};
static int
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
dissect_ldap_SortResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SortResult_sequence, hf_index, ett_ldap_SortResult);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
static int
dissect_ldap_DirSyncFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
#line 764 "./asn1/ldap/ldap.cnf"
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
gint8 ber_class;
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
gboolean pc;
gint32 tag;
guint32 len;
gint32 val;
int otheroffset = offset;
if(!implicit_tag){
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=41298
2012-03-02 11:00:24 +00:00
dissect_ber_identifier(actx->pinfo, tree, tvb, otheroffset, &ber_class, &pc, &tag);
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
otheroffset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
} else {
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
gint32 remaining=tvb_reported_length_remaining(tvb, offset);
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
len=remaining>0 ? remaining : 0;
}
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, -1, &val);
if (val >0) {
NULL terminate the list of hfs given to proto_tree_add_bitmask*(). This fixes a number of recent fuzz failures. Bug: 11195 Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674 Reviewed-on: https://code.wireshark.org/review/8699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 03:42:15 +00:00
const int *flags[] = {
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
&hf_ldap_object_security_flag,
&hf_ldap_ancestor_first_flag,
&hf_ldap_public_data_only_flag,
&hf_ldap_incremental_value_flag,
NULL terminate the list of hfs given to proto_tree_add_bitmask*(). This fixes a number of recent fuzz failures. Bug: 11195 Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674 Reviewed-on: https://code.wireshark.org/review/8699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 03:42:15 +00:00
NULL
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
};
proto_tree_add_bitmask_value_with_flags(tree, tvb, otheroffset+1, hf_index,
ett_ldap_DirSyncFlagsSubEntry, flags, val, BMT_NO_APPEND);
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
} else {
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
proto_tree_add_uint(tree, hf_index, tvb, otheroffset+len, len, 0);
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
}
return offset;
}
static const ber_sequence_t DirSyncControlValue_sequence[] = {
{ &hf_ldap_flags , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_DirSyncFlags },
{ &hf_ldap_maxBytes , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER },
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ NULL, 0, 0, 0, NULL }
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
};
static int
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
dissect_ldap_DirSyncControlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- LDAP generated with -X option - a minor update to MobileDomainDefinitions.asn adding ID and a document reference. svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
DirSyncControlValue_sequence, hf_index, ett_ldap_DirSyncControlValue);
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
return offset;
}
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
static const ber_sequence_t PasswdModifyRequestValue_sequence[] = {
{ &hf_ldap_userIdentity , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_oldPasswd , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_newPasswd , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_PasswdModifyRequestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
PasswdModifyRequestValue_sequence, hf_index, ett_ldap_PasswdModifyRequestValue);
return offset;
}
static const ber_sequence_t CancelRequestValue_sequence[] = {
{ &hf_ldap_cancelID , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_MessageID },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_CancelRequestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
CancelRequestValue_sequence, hf_index, ett_ldap_CancelRequestValue);
return offset;
}
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
static const value_string ldap_T_mode_vals[] = {
{ 1, "refreshOnly" },
{ 3, "refreshAndPersist" },
{ 0, NULL }
};
static int
dissect_ldap_T_mode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static const ber_sequence_t SyncRequestValue_sequence[] = {
{ &hf_ldap_mode , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_mode },
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_reloadHint , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_SyncRequestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SyncRequestValue_sequence, hf_index, ett_ldap_SyncRequestValue);
return offset;
}
static const value_string ldap_T_state_vals[] = {
{ 0, "present" },
{ 1, "add" },
{ 2, "modify" },
{ 3, "delete" },
{ 0, NULL }
};
static int
dissect_ldap_T_state(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ldap_SyncUUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static const ber_sequence_t SyncStateValue_sequence[] = {
{ &hf_ldap_state , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_state },
{ &hf_ldap_entryUUID , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_SyncUUID },
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_SyncStateValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SyncStateValue_sequence, hf_index, ett_ldap_SyncStateValue);
return offset;
}
static const ber_sequence_t SyncDoneValue_sequence[] = {
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_refreshDeletes , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_SyncDoneValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
SyncDoneValue_sequence, hf_index, ett_ldap_SyncDoneValue);
return offset;
}
static const ber_sequence_t T_refreshDelete_sequence[] = {
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_refreshDone , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_T_refreshDelete(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
T_refreshDelete_sequence, hf_index, ett_ldap_T_refreshDelete);
return offset;
}
static const ber_sequence_t T_refreshPresent_sequence[] = {
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_refreshDone , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_T_refreshPresent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
T_refreshPresent_sequence, hf_index, ett_ldap_T_refreshPresent);
return offset;
}
static const ber_sequence_t SET_OF_SyncUUID_set_of[1] = {
{ &hf_ldap_syncUUIDs_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_SyncUUID },
};
static int
dissect_ldap_SET_OF_SyncUUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
SET_OF_SyncUUID_set_of, hf_index, ett_ldap_SET_OF_SyncUUID);
return offset;
}
static const ber_sequence_t T_syncIdSet_sequence[] = {
{ &hf_ldap_cookie , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_OCTET_STRING },
{ &hf_ldap_refreshDeletes , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN },
{ &hf_ldap_syncUUIDs , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ldap_SET_OF_SyncUUID },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_T_syncIdSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
T_syncIdSet_sequence, hf_index, ett_ldap_T_syncIdSet);
return offset;
}
static const value_string ldap_SyncInfoValue_vals[] = {
{ 0, "newcookie" },
{ 1, "refreshDelete" },
{ 2, "refreshPresent" },
{ 3, "syncIdSet" },
{ 0, NULL }
};
static const ber_choice_t SyncInfoValue_choice[] = {
{ 0, &hf_ldap_newcookie , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING },
{ 1, &hf_ldap_refreshDelete , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ldap_T_refreshDelete },
{ 2, &hf_ldap_refreshPresent , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ldap_T_refreshPresent },
{ 3, &hf_ldap_syncIdSet , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ldap_T_syncIdSet },
{ 0, NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_SyncInfoValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
SyncInfoValue_choice, hf_index, ett_ldap_SyncInfoValue,
NULL);
return offset;
}
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
static const value_string ldap_T_warning_vals[] = {
{ 0, "timeBeforeExpiration" },
{ 1, "graceAuthNsRemaining" },
{ 0, NULL }
};
static const ber_choice_t T_warning_choice[] = {
{ 0, &hf_ldap_timeBeforeExpiration, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_INTEGER_0_maxInt },
{ 1, &hf_ldap_graceAuthNsRemaining, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ldap_INTEGER_0_maxInt },
{ 0, NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_T_warning(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
T_warning_choice, hf_index, ett_ldap_T_warning,
NULL);
return offset;
}
static const value_string ldap_T_error_vals[] = {
{ 0, "passwordExpired" },
{ 1, "accountLocked" },
{ 2, "changeAfterReset" },
{ 3, "passwordModNotAllowed" },
{ 4, "mustSupplyOldPassword" },
{ 5, "insufficientPasswordQuality" },
{ 6, "passwordTooShort" },
{ 7, "passwordTooYoung" },
{ 8, "passwordInHistory" },
{ 0, NULL }
};
static int
dissect_ldap_T_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static const ber_sequence_t PasswordPolicyResponseValue_sequence[] = {
{ &hf_ldap_warning , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_T_warning },
{ &hf_ldap_error , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_T_error },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_ldap_PasswordPolicyResponseValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
PasswordPolicyResponseValue_sequence, hf_index, ett_ldap_PasswordPolicyResponseValue);
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- PDUs ---*/
From Stefan Metzmacher: basic decoding for LDAP Controls. svn path=/trunk/; revision=12765
2004-12-17 19:14:24 +00:00
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SearchControlValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SearchControlValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SearchControlValue_PDU);
return offset;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SortKeyList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SortKeyList(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SortKeyList_PDU);
return offset;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SortResult_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SortResult(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SortResult_PDU);
return offset;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_DirSyncControlValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
Second step in introducing asn context to BER dissectors just like in PER. svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_DirSyncControlValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_DirSyncControlValue_PDU);
return offset;
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_PasswdModifyRequestValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_PasswdModifyRequestValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_PasswdModifyRequestValue_PDU);
return offset;
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_CancelRequestValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_CancelRequestValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_CancelRequestValue_PDU);
return offset;
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SyncRequestValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SyncRequestValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SyncRequestValue_PDU);
return offset;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SyncStateValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SyncStateValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SyncStateValue_PDU);
return offset;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SyncDoneValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SyncDoneValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SyncDoneValue_PDU);
return offset;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_SyncInfoValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_SyncInfoValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_SyncInfoValue_PDU);
return offset;
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
}
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
static int dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
ASN1: Register PDU-dissectors as NEW Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-06 13:31:47 +00:00
offset = dissect_ldap_PasswordPolicyResponseValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_PasswordPolicyResponseValue_PDU);
return offset;
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
}
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- End of included file: packet-ldap-fn.c ---*/
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
#line 913 "./asn1/ldap/packet-ldap-template.c"
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
static int dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ldap_conv_info_t *ldap_info) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
asn1_ctx.private_data = ldap_info;
offset = dissect_ldap_LDAPMessage(FALSE, tvb, offset, &asn1_ctx, tree, hf_ldap_LDAPMessage_PDU);
return offset;
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
static void
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo,
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
proto_tree *tree, ldap_conv_info_t *ldap_info,
gboolean is_mscldap)
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
{
int offset = 0;
guint length_remaining;
In packet-frame.c, don't free static memory when we throw a DissectorError. In packet-kerberos.c, restore pinfo->private_data if we throw an exception, which keeps the SMB dissector from throwing a DissectorError. Initialize variables in other places to squelch valgrind warnings. svn path=/trunk/; revision=15235
2005-08-06 03:43:42 +00:00
guint msg_len = 0;
int messageOffset = 0;
guint headerLength = 0;
guint length = 0;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
tvbuff_t *msg_tvb = NULL;
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
gint8 ber_class;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
gboolean pc, ind = 0;
gint32 ber_tag;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
Initialize attributedesc_string in a couple of places so that we don't end up trying to use an invalid pointer. svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
attributedesc_string=NULL;
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
one_more_pdu:
Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:36:26 +00:00
length_remaining = tvb_ensure_captured_length_remaining(tvb, offset);
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
if (length_remaining < 6) return;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
/*
* OK, try to read the "Sequence Of" header; this gets the total
* length of the LDAP message.
*/
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
messageOffset = get_ber_identifier(tvb, offset, &ber_class, &pc, &ber_tag);
messageOffset = get_ber_length(tvb, messageOffset, &msg_len, &ind);
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
/* sanity check */
if((msg_len<4) || (msg_len>10000000)) return;
Get rid of Warnings. svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
if ( (ber_class==BER_CLASS_UNI) && (ber_tag==BER_UNI_TAG_SEQUENCE) ) {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* Add the length of the "Sequence Of" header to the message
* length.
*/
headerLength = messageOffset - offset;
msg_len += headerLength;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
if (msg_len < headerLength) {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* The message length was probably so large that the total length
* overflowed.
*
* Report this as an error.
*/
show_reported_bounds_error(tvb, pinfo, tree);
return;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
}
} else {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* We couldn't parse the header; just make it the amount of data
* remaining in the tvbuff, so we'll give up on this segment
* after attempting to parse the message - there's nothing more
* we can do. "dissect_ldap_message()" will display the error.
*/
msg_len = length_remaining;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
}
/*
* Construct a tvbuff containing the amount of the payload we have
* available. Make its reported length the amount of data in the
* LDAP message.
*
* XXX - if reassembly isn't enabled. the subdissector will throw a
* BoundsError exception, rather than a ReportedBoundsError exception.
* We really want a tvbuff where the length is "length", the reported
* length is "plen", and the "if the snapshot length were infinite"
* length is the minimum of the reported length of the tvbuff handed
* to us and "plen", with a new type of exception thrown if the offset
* is within the reported length but beyond that third length, with
* that exception getting the "Unreassembled Packet" error.
*/
length = length_remaining;
if (length > msg_len) length = msg_len;
msg_tvb = tvb_new_subset(tvb, offset, length, msg_len);
/*
* Now dissect the LDAP message.
*/
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
ldap_info->is_mscldap = is_mscldap;
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
dissect_LDAPMessage_PDU(msg_tvb, pinfo, tree, ldap_info);
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
offset += msg_len;
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
/* If this was a sasl blob there might be another PDU following in the
* same blob
*/
batch of tvb-length conversions Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21 00:36:59 +00:00
if(tvb_reported_length_remaining(tvb, offset)>=6){
How can I get a new tvbuff that starts at an offset within a given tvbuff and runs to the end of the tvbuff? Let me count the ways.... Replace a bunch of different ways of doing that (some incorrect, in that they're not properly handling tvbuffs where the captured and reported lengths are different) with tvb_new_subset_remaining(). svn path=/trunk/; revision=47751
2013-02-19 23:17:07 +00:00
tvb = tvb_new_subset_remaining(tvb, offset);
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
offset = 0;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
remove some compiler warning due to unused pinfo parameter a SASL encapsulated ldap blob can contain more than one LDAP message so the rest_is_pad parameter is bogus and thus removed. make dissect_ldap_pdu handle when we have more than one LDAP message inside one sasl blob svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
goto one_more_pdu;
}
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
}
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
Changed check for having multiple ldap PDU's in one frame. The previous check is incorrect when the first ldap frame in the capture is selected and the filter is changed, or selecting "Follow TCP Stream". Also removed check_col(). svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
static void
ldap_frame_end(void)
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldap_found_in_frame = FALSE;
attr_type = NULL;
ldapvalue_string = NULL;
Fix #7056 + Remove mechanism global, unused variable. svn path=/trunk/; revision=42008
2012-04-10 15:48:26 +00:00
/* ? */
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
attributedesc_string = NULL;
Filter_string = NULL;
and_filter_string = NULL;
object_identifier_id = NULL;
or_filter_string = NULL;
Fix #7056 + Remove mechanism global, unused variable. svn path=/trunk/; revision=42008
2012-04-10 15:48:26 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
substring_item_any = NULL;
substring_item_final = NULL;
substring_item_init = NULL;
substring_value = NULL;
Fix #7056 + Remove mechanism global, unused variable. svn path=/trunk/; revision=42008
2012-04-10 15:48:26 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldm_tree = NULL;
Fix #7056 + Remove mechanism global, unused variable. svn path=/trunk/; revision=42008
2012-04-10 15:48:26 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
Filter_elements = 0;
Filter_length = 0;
do_protocolop = FALSE;
result = 0;
Fix #7056 + Remove mechanism global, unused variable. svn path=/trunk/; revision=42008
2012-04-10 15:48:26 +00:00
/* seems to be ok, but reset just in case */
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
matching_rule_string = NULL;
Changed check for having multiple ldap PDU's in one frame. The previous check is incorrect when the first ldap frame in the capture is selected and the filter is changed, or selecting "Follow TCP Stream". Also removed check_col(). svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
}
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
static void
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_mscldap)
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
int offset = 0;
conversation_t *conversation;
gboolean doing_sasl_security = FALSE;
guint length_remaining;
ldap_conv_info_t *ldap_info = NULL;
proto_item *ldap_item = NULL;
proto_tree *ldap_tree = NULL;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldm_tree = NULL;
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
conversation = find_or_create_conversation(pinfo);
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* Do we already have a type and mechanism?
*/
ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap);
if (ldap_info == NULL) {
/* No. Attach that information to the conversation, and add
* it to the list of information structures.
*/
packet-ldap.c: Convert some g_ APIs to wmem. Change-Id: I41bd5c66a51088cedeae993c15c520d4075c5620 Reviewed-on: https://code.wireshark.org/review/16549 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-20 02:49:32 +00:00
ldap_info = wmem_new0(wmem_file_scope(), ldap_conv_info_t);
ldap_info->matched=wmem_map_new(wmem_file_scope(), ldap_info_hash_matched, ldap_info_equal_matched);
ldap_info->unmatched=wmem_map_new(wmem_file_scope(), ldap_info_hash_unmatched, ldap_info_equal_unmatched);
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
conversation_add_proto_data(conversation, proto_ldap, ldap_info);
}
Try to handle LDAP messages encapsulated inside a SASL security layer. 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
2002-11-27 04:59:56 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
switch (ldap_info->auth_type) {
case LDAP_AUTH_SASL:
/*
* It's SASL; are we using a security layer?
*/
if (ldap_info->first_auth_frame != 0 &&
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
pinfo->num >= ldap_info->first_auth_frame) {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
doing_sasl_security = TRUE; /* yes */
}
}
length_remaining = tvb_ensure_captured_length_remaining(tvb, offset);
/* It might still be a packet containing a SASL security layer
* but it's just that we never saw the BIND packet.
* check if it looks like it could be a SASL blob here
* and in that case just assume it is GSS-SPNEGO
*/
if(!doing_sasl_security && (tvb_bytes_exist(tvb, offset, 5))
&&(tvb_get_ntohl(tvb, offset)<=(guint)(tvb_reported_length_remaining(tvb, offset)-4))
&&(tvb_get_guint8(tvb, offset+4)==0x60) ){
ldap_info->auth_type=LDAP_AUTH_SASL;
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
ldap_info->first_auth_frame=pinfo->num;
Do not mix wmem and glib allocators Change-Id: I4bf861ed9e6b767341f2cbd4e926606d4919f2ef Reviewed-on: https://code.wireshark.org/review/15041 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-21 15:26:38 +00:00
ldap_info->auth_mech=wmem_strdup(wmem_file_scope(), "GSS-SPNEGO");
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
doing_sasl_security=TRUE;
}
/*
* This is the first PDU, set the Protocol column and clear the
* Info column.
*/
col_set_str(pinfo->cinfo, COL_PROTOCOL, pinfo->current_proto);
if(ldap_found_in_frame) {
/* we have already dissected an ldap PDU in this frame - add a separator and set a fence */
col_append_str(pinfo->cinfo, COL_INFO, " | ");
col_set_fence(pinfo->cinfo, COL_INFO);
} else {
col_clear(pinfo->cinfo, COL_INFO);
register_frame_end_routine (pinfo, ldap_frame_end);
ldap_found_in_frame = TRUE;
}
ldap_item = proto_tree_add_item(tree, is_mscldap?proto_cldap:proto_ldap, tvb, 0, -1, ENC_NA);
ldap_tree = proto_item_add_subtree(ldap_item, ett_ldap);
/*
* Might we be doing a SASL security layer and, if so, *are* we doing
* one?
*
* Just because we've seen a bind reply for SASL, that doesn't mean
* that we're using a SASL security layer; I've seen captures in
* which some SASL negotiations lead to a security layer being used
* and other negotiations don't, and it's not obvious what's different
* in the two negotiations. Therefore, we assume that if the first
* byte is 0, it's a length for a SASL security layer (that way, we
* never reassemble more than 16 megabytes, protecting us from
* chewing up *too* much memory), and otherwise that it's an LDAP
* message (actually, if it's an LDAP message it should begin with 0x30,
* but we want to parse garbage as LDAP messages rather than really
* huge lengths).
*/
if (doing_sasl_security && tvb_get_guint8(tvb, offset) == 0) {
proto_tree *sasl_tree;
tvbuff_t *sasl_tvb;
guint sasl_len, sasl_msg_len, length;
/*
* Yes. The frame begins with a 4-byte big-endian length.
* And we know we have at least 6 bytes
*/
/*
* Get the SASL length, which is the length of data in the buffer
* following the length (i.e., it's 4 less than the total length).
*
* XXX - do we need to reassemble buffers? For now, we
* assume that each LDAP message is entirely contained within
* a buffer.
*/
sasl_len = tvb_get_ntohl(tvb, offset);
sasl_msg_len = sasl_len + 4;
if (sasl_msg_len < 4) {
/*
* The message length was probably so large that the total length
* overflowed.
*
* Report this as an error.
*/
show_reported_bounds_error(tvb, pinfo, tree);
return;
}
/*
* Construct a tvbuff containing the amount of the payload we have
* available. Make its reported length the amount of data in the PDU.
*
* XXX - if reassembly isn't enabled. the subdissector will throw a
* BoundsError exception, rather than a ReportedBoundsError exception.
* We really want a tvbuff where the length is "length", the reported
* length is "plen", and the "if the snapshot length were infinite"
* length is the minimum of the reported length of the tvbuff handed
* to us and "plen", with a new type of exception thrown if the offset
* is within the reported length but beyond that third length, with
* that exception getting the "Unreassembled Packet" error.
*/
length = length_remaining;
if (length > sasl_msg_len) length = sasl_msg_len;
sasl_tvb = tvb_new_subset(tvb, offset, length, sasl_msg_len);
proto_tree_add_uint(ldap_tree, hf_ldap_sasl_buffer_length, sasl_tvb, 0, 4, sasl_len);
sasl_tree = proto_tree_add_subtree(ldap_tree, sasl_tvb, 0, sasl_msg_len, ett_ldap_sasl_blob, NULL, "SASL Buffer");
if (ldap_info->auth_mech != NULL &&
((strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) ||
/* auth_mech may have been set from the bind */
(strcmp(ldap_info->auth_mech, "GSSAPI") == 0))) {
tvbuff_t *gssapi_tvb, *plain_tvb = NULL, *decr_tvb= NULL;
int ver_len;
int tmp_length;
gssapi_encrypt_info_t gssapi_encrypt;
/*
* This is GSS-API (using SPNEGO, but we should be done with
* the negotiation by now).
*
* Dissect the GSS_Wrap() token; it'll return the length of
* the token, from which we compute the offset in the tvbuff at
* which the plaintext data, i.e. the LDAP message, begins.
*/
tmp_length = tvb_reported_length_remaining(sasl_tvb, 4);
if ((guint)tmp_length > sasl_len)
tmp_length = sasl_len;
gssapi_tvb = tvb_new_subset(sasl_tvb, 4, tmp_length, sasl_len);
/* Attempt decryption of the GSSAPI wrapped data if possible */
gssapi_encrypt.gssapi_data_encrypted = FALSE;
gssapi_encrypt.decrypt_gssapi_tvb=DECRYPT_GSSAPI_NORMAL;
gssapi_encrypt.gssapi_wrap_tvb=NULL;
gssapi_encrypt.gssapi_encrypted_tvb=NULL;
gssapi_encrypt.gssapi_decrypted_tvb=NULL;
ver_len = call_dissector_with_data(gssapi_wrap_handle, gssapi_tvb, pinfo, sasl_tree, &gssapi_encrypt);
/* if we could unwrap, do a tvb shuffle */
if(gssapi_encrypt.gssapi_decrypted_tvb){
decr_tvb=gssapi_encrypt.gssapi_decrypted_tvb;
} else if (gssapi_encrypt.gssapi_wrap_tvb) {
plain_tvb=gssapi_encrypt.gssapi_wrap_tvb;
}
/*
* if len is 0 it probably mean that we got a PDU that is not
* aligned to the start of the segment.
*/
if(ver_len==0){
return;
}
/*
* if we don't have unwrapped data,
* see if the wrapping involved encryption of the
* data; if not, just use the plaintext data.
*/
if (!decr_tvb && !plain_tvb) {
if(!gssapi_encrypt.gssapi_data_encrypted){
plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len);
}
}
if (decr_tvb) {
proto_tree *enc_tree = NULL;
guint decr_len = tvb_reported_length(decr_tvb);
/*
* The LDAP message was encrypted in the packet, and has
* been decrypted; dissect the decrypted LDAP message.
*/
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
if (sasl_tree) {
enc_tree = proto_tree_add_subtree_format(sasl_tree, decr_tvb, 0, -1,
ett_ldap_payload, NULL, "GSS-API Encrypted payload (%d byte%s)",
decr_len, plurality(decr_len, "", "s"));
}
dissect_ldap_payload(decr_tvb, pinfo, enc_tree, ldap_info, is_mscldap);
} else if (plain_tvb) {
proto_tree *plain_tree = NULL;
guint plain_len = tvb_reported_length(plain_tvb);
/*
* The LDAP message wasn't encrypted in the packet;
* dissect the plain LDAP message.
*/
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
if (sasl_tree) {
plain_tree = proto_tree_add_subtree_format(sasl_tree, plain_tvb, 0, -1,
ett_ldap_payload, NULL, "GSS-API payload (%d byte%s)",
plain_len, plurality(plain_len, "", "s"));
}
dissect_ldap_payload(plain_tvb, pinfo, plain_tree, ldap_info, is_mscldap);
} else {
/*
* The LDAP message was encrypted in the packet, and was
* not decrypted; just show it as encrypted data.
*/
col_add_fstr(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy: payload (%d byte%s)",
sasl_len - ver_len,
plurality(sasl_len - ver_len, "", "s"));
proto_tree_add_item(sasl_tree, hf_ldap_gssapi_encrypted_payload, gssapi_tvb, ver_len, -1, ENC_NA);
}
}
} else {
/* plain LDAP, so dissect the payload */
dissect_ldap_payload(tvb, pinfo, ldap_tree, ldap_info, is_mscldap);
}
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
}
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
/*
* prepend_dot is no longer used, but is being left in place in order to
* maintain ABI compatibility.
*/
int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_)
Tidy ups for SASL/GSSAPI support: 1) Handle empty (zero length) saslCredentials 2) Handle "GSSAPI" auth_mech when identified from the bind 3) Annotate column info to show SASL service applied to LDAP operation svn path=/trunk/; revision=20830
2007-02-17 11:06:25 +00:00
{
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
int compr_len;
const guchar *name;
Tidy ups for SASL/GSSAPI support: 1) Handle empty (zero length) saslCredentials 2) Handle "GSSAPI" auth_mech when identified from the bind 3) Annotate column info to show SASL service applied to LDAP operation svn path=/trunk/; revision=20830
2007-02-17 11:06:25 +00:00
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
/* The name data MUST start at offset 0 of the tvb */
compr_len = expand_dns_name(tvb, offset, max_len, 0, &name);
g_strlcpy(str, name, max_len);
return offset + compr_len;
Tidy ups for SASL/GSSAPI support: 1) Handle empty (zero length) saslCredentials 2) Handle "GSSAPI" auth_mech when identified from the bind 3) Annotate column info to show SASL service applied to LDAP operation svn path=/trunk/; revision=20830
2007-02-17 11:06:25 +00:00
}
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
/* These are the cldap DC flags
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
http://msdn.microsoft.com/en-us/library/cc201036.aspx
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
*/
static const true_false_string tfs_ads_pdc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This is a PDC",
"This is NOT a pdc"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_gc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This is a GLOBAL CATALOGUE of forest",
"This is NOT a global catalog of forest"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_ldap = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This is an LDAP server",
"This is NOT an ldap server"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_ds = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This dc supports DS",
"This dc does NOT support ds"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_kdc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This is a KDC (kerberos)",
"This is NOT a kdc (kerberos)"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_timeserv = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This dc is running TIME SERVICES (ntp)",
"This dc is NOT running time services (ntp)"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_closest = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This server is in the same site as the client",
"This server is NOT in the same site as the client"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_writable = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This dc is WRITABLE",
"This dc is NOT writable"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_good_timeserv = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"This dc has a GOOD TIME SERVICE (i.e. hardware clock)",
"This dc does NOT have a good time service (i.e. no hardware clock)"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
static const true_false_string tfs_ads_ndnc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Domain is NON-DOMAIN NC serviced by ldap server",
"Domain is NOT non-domain nc serviced by ldap server"
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
};
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
static const true_false_string tfs_ads_rodc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Domain controller is a Windows 2008 RODC",
"Domain controller is not a Windows 2008 RODC"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ads_wdc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Domain controller is a Windows 2008 writable NC",
"Domain controller is not a Windows 2008 writable NC"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ads_dns = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Server name is in DNS format (Windows 2008)",
"Server name is not in DNS format (Windows 2008)"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ads_dnc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"The NC is the default NC (Windows 2008)",
"The NC is not the default NC (Windows 2008)"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
static const true_false_string tfs_ads_fnc = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"The NC is the default forest NC(Windows 2008)",
"The NC is not the default forest NC (Windows 2008)"
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
};
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset)
{
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * flags[] = {
&hf_mscldap_netlogon_flags_fnc,
&hf_mscldap_netlogon_flags_dnc,
&hf_mscldap_netlogon_flags_dns,
&hf_mscldap_netlogon_flags_wdc,
&hf_mscldap_netlogon_flags_rodc,
&hf_mscldap_netlogon_flags_ndnc,
&hf_mscldap_netlogon_flags_good_timeserv,
&hf_mscldap_netlogon_flags_writable,
&hf_mscldap_netlogon_flags_closest,
&hf_mscldap_netlogon_flags_timeserv,
&hf_mscldap_netlogon_flags_kdc,
&hf_mscldap_netlogon_flags_ds,
&hf_mscldap_netlogon_flags_ldap,
&hf_mscldap_netlogon_flags_gc,
&hf_mscldap_netlogon_flags_pdc,
NULL
};
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hf_mscldap_netlogon_flags,
ett_mscldap_netlogon_flags, flags, ENC_LITTLE_ENDIAN, BMT_NO_FALSE);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
offset += 4;
return offset;
}
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
{
Tidy ups for SASL/GSSAPI support: 1) Handle empty (zero length) saslCredentials 2) Handle "GSSAPI" auth_mech when identified from the bind 3) Annotate column info to show SASL service applied to LDAP operation svn path=/trunk/; revision=20830
2007-02-17 11:06:25 +00:00
int old_offset, offset=0;
char str[256];
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
guint16 itype;
guint16 len;
guint32 version;
const char *fn;
int fn_len;
guint16 bc;
proto_item *item;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
ldm_tree = NULL;
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
/* Get the length of the buffer */
batch of tvb-length conversions Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21 00:36:59 +00:00
len=tvb_reported_length_remaining(tvb,offset);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
/* check the len if it is to small return */
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
if (len < 10)
return tvb_captured_length(tvb);
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
/* Type */
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
proto_tree_add_item(tree, hf_mscldap_netlogon_opcode, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
itype = tvb_get_letohs(tvb, offset);
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
offset += 2;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
switch(itype){
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
case LOGON_SAM_LOGON_RESPONSE:
Don't use the captured length, and don't fetch the version until we need it. The captured length reflects the way the capture was done; it should not affect actual lengths used in the dissection. Don't fetch the version until we need it; that lets us dissect more of the packet if the previous change caused us to throw an exception trying to fetch the version from the correct location rather than not throwing an exception by fetching it from an incorrect location that happens to be within the captured data. Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf Reviewed-on: https://code.wireshark.org/review/4101 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:10:49 +00:00
bc = tvb_reported_length_remaining(tvb, offset);
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* logon server name */
fn = get_unicode_or_ascii_string(tvb,&offset,TRUE,&fn_len,FALSE,FALSE,&bc);
proto_tree_add_string(tree, hf_mscldap_nb_hostname, tvb,offset, fn_len, fn);
offset +=fn_len;
/* username */
fn = get_unicode_or_ascii_string(tvb,&offset,TRUE,&fn_len,FALSE,FALSE,&bc);
proto_tree_add_string(tree, hf_mscldap_username, tvb,offset, fn_len, fn);
offset +=fn_len;
/* domain name */
fn = get_unicode_or_ascii_string(tvb,&offset,TRUE,&fn_len,FALSE,FALSE,&bc);
proto_tree_add_string(tree, hf_mscldap_nb_domain, tvb,offset, fn_len, fn);
offset +=fn_len;
Don't use the captured length, and don't fetch the version until we need it. The captured length reflects the way the capture was done; it should not affect actual lengths used in the dissection. Don't fetch the version until we need it; that lets us dissect more of the packet if the previous change caused us to throw an exception trying to fetch the version from the correct location rather than not throwing an exception by fetching it from an incorrect location that happens to be within the captured data. Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf Reviewed-on: https://code.wireshark.org/review/4101 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:10:49 +00:00
/* get the version number from the end of the buffer, as the
length is variable and the version determines what fields
need to be decoded */
version = tvb_get_letohl(tvb,len-8);
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* include the extra version 5 fields */
if ((version & NETLOGON_NT_VERSION_5) == NETLOGON_NT_VERSION_5){
/* domain guid */
proto_tree_add_item(tree, hf_mscldap_domain_guid, tvb, offset, 16, ENC_LITTLE_ENDIAN);
offset += 16;
/* domain guid part 2
there is another 16 byte guid but this is alway zero, so we will skip it */
offset += 16;
/* Forest */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_forest, tvb, old_offset, offset-old_offset, str);
/* Domain */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_domain, tvb, old_offset, offset-old_offset, str);
/* Hostname */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_hostname, tvb, old_offset, offset-old_offset, str);
/* DC IP Address */
proto_tree_add_ipv4(tree, hf_mscldap_netlogon_ipaddress, tvb, offset, 4, tvb_get_ntohl(tvb,offset));
offset += 4;
/* Flags */
offset = dissect_mscldap_netlogon_flags(tree, tvb, offset);
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
}
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
break;
case LOGON_SAM_LOGON_RESPONSE_EX:
/* MS-ADTS 7.3.1.9 */
offset += 2; /* Skip over "Sbz" field (MUST be set to 0) */
/* Flags */
offset = dissect_mscldap_netlogon_flags(tree, tvb, offset);
/* Domain GUID */
proto_tree_add_item(tree, hf_mscldap_domain_guid, tvb, offset, 16, ENC_LITTLE_ENDIAN);
offset += 16;
/* Forest */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_forest, tvb, old_offset, offset-old_offset, str);
/* Domain */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_domain, tvb, old_offset, offset-old_offset, str);
/* Hostname */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_hostname, tvb, old_offset, offset-old_offset, str);
/* NetBIOS Domain */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_nb_domain, tvb, old_offset, offset-old_offset, str);
/* NetBIOS Hostname */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_nb_hostname, tvb, old_offset, offset-old_offset, str);
/* User */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_username, tvb, old_offset, offset-old_offset, str);
/* Server Site */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_sitename, tvb, old_offset, offset-old_offset, str);
/* Client Site */
old_offset=offset;
offset=dissect_mscldap_string(tvb, offset, str, 255, FALSE);
proto_tree_add_string(tree, hf_mscldap_clientsitename, tvb, old_offset, offset-old_offset, str);
Don't use the captured length, and don't fetch the version until we need it. The captured length reflects the way the capture was done; it should not affect actual lengths used in the dissection. Don't fetch the version until we need it; that lets us dissect more of the packet if the previous change caused us to throw an exception trying to fetch the version from the correct location rather than not throwing an exception by fetching it from an incorrect location that happens to be within the captured data. Change-Id: I9f63afd4ef51f46c19b3afd2a651a5bb768fecaf Reviewed-on: https://code.wireshark.org/review/4101 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-14 00:10:49 +00:00
/* get the version number from the end of the buffer, as the
length is variable and the version determines what fields
need to be decoded */
version = tvb_get_letohl(tvb,len-8);
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* include the extra fields for version 5 with IP s */
if ((version & NETLOGON_NT_VERSION_5EX_WITH_IP) == NETLOGON_NT_VERSION_5EX_WITH_IP){
/* The ip address is returned as a sockaddr_in structure
*
* This section may need to be updated if the base Windows APIs
* are changed to support ipv6, which currently is not the case.
*
* The desector assumes the length is based on ipv4 and
* ignores the length
*/
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* skip the length of the sockaddr_in */
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
offset +=1;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* add IP address and desect the sockaddr_in structure */
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
old_offset = offset + 4;
item = proto_tree_add_ipv4(tree, hf_mscldap_netlogon_ipaddress, tvb, old_offset, 4, tvb_get_ipv4(tvb,old_offset));
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
if (tree){
proto_tree *subtree;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
subtree = proto_item_add_subtree(item, ett_mscldap_ipdetails);
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* get sockaddr family */
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_family, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset +=2;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* get sockaddr port */
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_port, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset +=2;
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* get IP address */
proto_tree_add_ipv4(subtree, hf_mscldap_netlogon_ipaddress_ipv4, tvb, offset, 4, tvb_get_ipv4(tvb,offset));
offset +=4;
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
/* skip the 8 bytes of zeros in the sockaddr structure */
offset += 8;
}
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
}
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Clean up indentation. Change-Id: Ie43c3a55aa954c1ec640ec90c74356b2b19e4156 Reviewed-on: https://code.wireshark.org/review/4100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-13 23:49:50 +00:00
break;
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
}
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
/* complete the decode with the version and token details */
offset = len-8;
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
/* NETLOGON_NT_VERISON Options (MS-ADTS 7.3.1.1) */
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
/* LM Token */
Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39294
2011-10-06 16:50:13 +00:00
proto_tree_add_item(tree, hf_mscldap_netlogon_lm_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
offset += 2;
/* NT Token */
Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39294
2011-10-06 16:50:13 +00:00
proto_tree_add_item(tree, hf_mscldap_netlogon_nt_token, tvb, offset, 2, ENC_LITTLE_ENDIAN);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
offset += 2;
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
return tvb_captured_length(tvb);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
}
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
static guint
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
get_sasl_ldap_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb,
int offset, void *data _U_)
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* sasl encapsulated ldap is 4 bytes plus the length in size */
return tvb_get_ntohl(tvb, offset)+4;
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
}
Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
static int
dissect_sasl_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissect_ldap_pdu(tvb, pinfo, tree, FALSE);
return tvb_captured_length(tvb);
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
}
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
static guint
ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-06 10:43:54 +00:00
get_normal_ldap_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb,
int offset, void *data _U_)
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
guint32 len;
gboolean ind;
int data_offset;
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* normal ldap is tag+len bytes plus the length
* offset is where the tag is
* offset+1 is where length starts
*/
data_offset=get_ber_length(tvb, offset+1, &len, &ind);
return len+data_offset-offset;
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
}
Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
static int
dissect_normal_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissect_ldap_pdu(tvb, pinfo, tree, FALSE);
return tvb_captured_length(tvb);
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
}
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int
dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
char *oid;
const char *oidname;
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* tvb here contains an ascii string that is really an oid */
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
/* XXX we should convert the string oid into a real oid so we can use
* proto_tree_add_oid() instead.
*/
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
oid=tvb_get_string_enc(wmem_packet_scope(), tvb, 0, tvb_reported_length(tvb), ENC_UTF_8|ENC_NA);
if(!oid){
return tvb_captured_length(tvb);
}
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
oidname=oid_resolved_from_string(wmem_packet_scope(), oid);
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
if(oidname){
proto_tree_add_string_format_value(tree, hf_ldap_oid, tvb, 0, tvb_reported_length(tvb), oid, "%s (%s)",oid,oidname);
} else {
proto_tree_add_string(tree, hf_ldap_oid, tvb, 0, tvb_captured_length(tvb), oid);
}
return tvb_captured_length(tvb);
the ldap values for supportedControl and supportedCapabilities is an oid in ascii format. resolve it into a anme if possible and present it. svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
}
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
#define LDAP_ACCESSMASK_ADS_CREATE_CHILD 0x00000001
#define LDAP_ACCESSMASK_ADS_DELETE_CHILD 0x00000002
#define LDAP_ACCESSMASK_ADS_LIST 0x00000004
#define LDAP_ACCESSMASK_ADS_SELF_WRITE 0x00000008
#define LDAP_ACCESSMASK_ADS_READ_PROP 0x00000010
#define LDAP_ACCESSMASK_ADS_WRITE_PROP 0x00000020
#define LDAP_ACCESSMASK_ADS_DELETE_TREE 0x00000040
#define LDAP_ACCESSMASK_ADS_LIST_OBJECT 0x00000080
#define LDAP_ACCESSMASK_ADS_CONTROL_ACCESS 0x00000100
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
static void
ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access)
{
proto_tree_add_boolean -> proto_tree_add_bitmask_list_value Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9 Reviewed-on: https://code.wireshark.org/review/15913 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15 03:17:25 +00:00
static const int * access_flags[] = {
&hf_ldap_AccessMask_ADS_CONTROL_ACCESS,
&hf_ldap_AccessMask_ADS_LIST_OBJECT,
&hf_ldap_AccessMask_ADS_DELETE_TREE,
&hf_ldap_AccessMask_ADS_WRITE_PROP,
&hf_ldap_AccessMask_ADS_READ_PROP,
&hf_ldap_AccessMask_ADS_SELF_WRITE,
&hf_ldap_AccessMask_ADS_LIST,
&hf_ldap_AccessMask_ADS_DELETE_CHILD,
&hf_ldap_AccessMask_ADS_CREATE_CHILD,
NULL
};
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
proto_tree_add_boolean -> proto_tree_add_bitmask_list_value Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9 Reviewed-on: https://code.wireshark.org/review/15913 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15 03:17:25 +00:00
proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
}
struct access_mask_info ldap_access_mask_info = {
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"LDAP", /* Name of specific rights */
ldap_specific_rights, /* Dissection function */
NULL, /* Generic mapping table */
NULL /* Standard mapping table */
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
};
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int
dissect_ldap_nt_sec_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
dissect nTSecurityDescriptor attribute as a security descriptor svn path=/trunk/; revision=18845
2006-08-07 10:29:39 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissect_nt_sec_desc(tvb, 0, pinfo, tree, NULL, TRUE, tvb_reported_length(tvb), &ldap_access_mask_info);
return tvb_captured_length(tvb);
dissect nTSecurityDescriptor attribute as a security descriptor svn path=/trunk/; revision=18845
2006-08-07 10:29:39 +00:00
}
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int
dissect_ldap_sid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
char *tmpstr;
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* this octet string contains an NT SID */
dissect_nt_sid(tvb, 0, tree, "SID", &tmpstr, hf_ldap_sid);
ldapvalue_string=tmpstr;
return tvb_captured_length(tvb);
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
}
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int
dissect_ldap_guid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
e_guid_t uuid;
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* This octet string contained a GUID */
dissect_dcerpc_uuid_t(tvb, 0, pinfo, tree, drep, hf_ldap_guid, &uuid);
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldapvalue_string=(char*)wmem_alloc(wmem_packet_scope(), 1024);
g_snprintf(ldapvalue_string, 1023, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
uuid.data1, uuid.data2, uuid.data3, uuid.data4[0], uuid.data4[1],
uuid.data4[2], uuid.data4[3], uuid.data4[4], uuid.data4[5],
uuid.data4[6], uuid.data4[7]);
return tvb_captured_length(tvb);
"objectGUID" should be dissected as a GUID also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
}
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. svn path=/trunk/; revision=53198
2013-11-09 17:46:28 +00:00
static int
dissect_ldap_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
guint32 sasl_len;
guint32 ldap_len;
gboolean ind;
conversation_t *conversation;
ldap_conv_info_t *ldap_info = NULL;
/*
* Do we have a conversation for this connection?
*/
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
if(conversation){
ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap);
}
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
ldm_tree = NULL;
Reset ldm_tree to NULL each time we dissect an LDAP packet. This should fix a current Buildbot crash. Fix up whitespace. svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* This is a bit tricky. We have to find out whether SASL is used
* so that we know how big a header we are supposed to pass
* to tcp_dissect_pdus()
* We must also cope with the case when a client connects to LDAP
* and performs a few unauthenticated searches of LDAP before
* it performs the bind on the same tcp connection.
*/
/* check for a SASL header, i.e. assume it is SASL if
* 1, first four bytes (SASL length) is an integer
* with a value that must be <LDAP_SASL_MAX_BUF and >2
* (>2 to fight false positives, 0x00000000 is a common
* "random" tcp payload)
* (SASL ldap PDUs might be >64k in size, which is why
* LDAP_SASL_MAX_BUF is used - defined in packet-ldap.h)
*
* 2, we must have a conversation and the auth type must
* be LDAP_AUTH_SASL
*/
sasl_len=tvb_get_ntohl(tvb, 0);
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
if( sasl_len<2 ){
goto this_was_not_sasl;
}
fix tcp reassembly to work again for ldap and ldap+sasl remove a recent ber length validation in packet-ber.c that cant work and breaks reassembly and also makes all ber pacvket sspanning multiple segments show up as malformed packets. svn path=/trunk/; revision=18465
2006-06-14 11:51:25 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
if( sasl_len>LDAP_SASL_MAX_BUF ){
goto this_was_not_sasl;
}
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
if((!ldap_info) || (ldap_info->auth_type!=LDAP_AUTH_SASL) ){
goto this_was_not_sasl;
}
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
tcp_dissect_pdus(tvb, pinfo, tree, ldap_desegment, 4, get_sasl_ldap_pdu_len, dissect_sasl_ldap_pdu, data);
return tvb_captured_length(tvb);
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
this_was_not_sasl:
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* check if it is a normal BER encoded LDAP packet
* i.e. first byte is 0x30 followed by a length that is
* <64k
* (no ldap PDUs are ever >64kb? )
*/
if(tvb_get_guint8(tvb, 0)!=0x30){
goto this_was_not_normal_ldap;
}
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* check that length makes sense */
get_ber_length(tvb, 1, &ldap_len, &ind);
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* don't check ind since indefinite length is never used for ldap (famous last words)*/
if(ldap_len<2){
goto this_was_not_normal_ldap;
}
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* The minimun size of a LDAP pdu is 7 bytes
*
* dumpasn1 -hh ldap-unbind-min.dat
*
* <30 05 02 01 09 42 00>
* 0 5: SEQUENCE {
* <02 01 09>
* 2 1: INTEGER 9
* <42 00>
* 5 0: [APPLICATION 2]
* : Error: Object has zero length.
* : }
*
* dumpasn1 -hh ldap-unbind-windows.dat
*
* <30 84 00 00 00 05 02 01 09 42 00>
* 0 5: SEQUENCE {
* <02 01 09>
* 6 1: INTEGER 9
* <42 00>
* 9 0: [APPLICATION 2]
* : Error: Object has zero length.
* : }
*
* 6 bytes would also be ok to get the full length of
* the pdu, but as the smallest pdu can be 7 bytes
* we can use 7.
*/
tcp_dissect_pdus(tvb, pinfo, tree, ldap_desegment, 7, get_normal_ldap_pdu_len, dissect_normal_ldap_pdu, data);
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
goto end;
in LDAP over TCP use tcp_dissect_pdus() which works insterad of trying to do the pdu tracking and signalling for reassembly manually. This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
this_was_not_normal_ldap:
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/* Ok it might be a strange case of SASL still
* It has been seen with Exchange setup to MS AD
* when Exchange pretend that there is SASL but in fact data are still
* in clear*/
if ((sasl_len + 4) == (guint32)tvb_reported_length_remaining(tvb, 0))
tcp_dissect_pdus(tvb, pinfo, tree, ldap_desegment, 4, get_sasl_ldap_pdu_len, dissect_sasl_ldap_pdu, data);
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
end:
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
return tvb_captured_length(tvb);
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
}
create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5 Reviewed-on: https://code.wireshark.org/review/12121 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24 23:03:04 +00:00
static int
dissect_mscldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissect_ldap_pdu(tvb, pinfo, tree, TRUE);
return tvb_captured_length(tvb);
Update to CLDAP dissect the CLDAP netlogon rpc call svn path=/trunk/; revision=9730
2004-01-19 10:54:06 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- proto_register_ldap -------------------------------------------*/
void proto_register_ldap(void) {
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* List of fields */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
static hf_register_info hf[] = {
try to dissect the ms cldap netlogon rpc flags bits. the information comes from the samba sources and may or may not be reliable or menaingful. ms documentation in their knowledgebase says that the only really important part in the netlogon response is the sitename. (i have reasons to belive at least one of the flags, closest, is completely bogous) svn path=/trunk/; revision=10649
2004-04-20 08:33:15 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_ldap_sasl_buffer_length,
{ "SASL Buffer Length", "ldap.sasl_buffer_length",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ldap_response_in,
{ "Response In", "ldap.response_in",
From Kovarththanan Rajaratnam: More FT_XXX cleanup. svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
"The response to this LDAP request is in this frame", HFILL }},
{ &hf_ldap_response_to,
{ "Response To", "ldap.response_to",
From Kovarththanan Rajaratnam: More FT_XXX cleanup. svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
"This is a response to the LDAP request in this frame", HFILL }},
{ &hf_ldap_time,
{ "Time", "ldap.time",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The time between the Call and the Reply", HFILL }},
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
{ &hf_mscldap_netlogon_opcode,
{ "Operation code", "mscldap.netlogon.opcode",
FT_UINT16, BASE_DEC, VALS(netlogon_opcode_vals), 0x0,
"LDAP ping operation code", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ &hf_mscldap_netlogon_ipaddress_family,
{ "Family", "mscldap.netlogon.ipaddress.family",
FT_UINT16, BASE_DEC, NULL, 0x0,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
NULL, HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ &hf_mscldap_netlogon_ipaddress_ipv4,
{ "IPv4", "mscldap.netlogon.ipaddress.ipv4",
From Kovarththanan Rajaratnam: Cleanup header_field_info definitions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 svn path=/trunk/; revision=28940
2009-07-05 11:49:36 +00:00
FT_IPv4, BASE_NONE, NULL, 0x0,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
"IP Address", HFILL }},
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_ipaddress_port,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "Port", "mscldap.netlogon.ipaddress.port",
FT_UINT16, BASE_DEC, NULL, 0x0,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
NULL, HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_ipaddress,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "IP Address","mscldap.netlogon.ipaddress",
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
FT_IPv4, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam: Cleanup header_field_info definitions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 svn path=/trunk/; revision=28940
2009-07-05 11:49:36 +00:00
"Domain Controller IP Address", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_netlogon_lm_token,
{ "LM Token", "mscldap.netlogon.lm_token",
FT_UINT16, BASE_HEX, NULL, 0x0,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
"MUST be set to 0xFFFF", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_netlogon_nt_token,
{ "NT Token", "mscldap.netlogon.nt_token",
FT_UINT16, BASE_HEX, NULL, 0x0,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
"MUST be set to 0xFFFF", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_netlogon_flags,
{ "Flags", "mscldap.netlogon.flags",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Netlogon flags describing the DC properties", HFILL }},
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_ntver_flags,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
{ "Version Flags", "mscldap.ntver.flags",
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
FT_UINT32, BASE_HEX, NULL, 0x0,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
"NETLOGON_NT_VERSION Options Bits", HFILL }},
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_domain_guid,
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ "Domain GUID", "mscldap.domain.guid",
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
FT_GUID, BASE_NONE, NULL, 0x0,
"Value of the NC's GUID attribute", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_forest,
{ "Forest", "mscldap.forest",
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"DNS name of the forest", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_domain,
{ "Domain", "mscldap.domain",
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"DNS name of the NC", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_hostname,
{ "Hostname", "mscldap.hostname",
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"DNS name of server", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_nb_domain,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
{ "NetBIOS Domain", "mscldap.nb_domain",
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"NetBIOS name of the NC", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_nb_hostname,
More minor cleanup/fixes for MS Active Directory's use of CLDAP. svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
{ "NetBIOS Hostname", "mscldap.nb_hostname",
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"NetBIOS name of the server", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_username,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "Username", "mscldap.username",
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"User specified in client's request", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_sitename,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
{ "Server Site", "mscldap.sitename",
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"Site name of the server", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_clientsitename,
{ "Client Site", "mscldap.clientsitename",
FT_STRING, BASE_NONE, NULL, 0x0,
More misc. CLDAP improvements for Active Directory including updating field names and adding descriptions, changing the Domain GUID in the "LDAP ping" response to a FT_GUID instead of FT_BYTES, etc. svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
"Site name of the client", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
{ &hf_ldap_sid,
{ "Sid", "ldap.sid",
FT_STRING, BASE_NONE, NULL, 0x0,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
NULL, HFILL }},
objectSid attribute contains a sid so decode it nively as a sid svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_v1,
{ "V1", "mscldap.ntver.searchflags.v1", FT_BOOLEAN, 32,
TFS(&tfs_ntver_v1), 0x00000001, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_v5,
{ "V5", "mscldap.ntver.searchflags.v5", FT_BOOLEAN, 32,
TFS(&tfs_ntver_v5), 0x00000002, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_ntver_flags_v5ex,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "V5EX", "mscldap.ntver.searchflags.v5ex", FT_BOOLEAN, 32,
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
TFS(&tfs_ntver_v5ex), 0x00000004, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_v5ep,
{ "V5EP", "mscldap.ntver.searchflags.v5ep", FT_BOOLEAN, 32,
TFS(&tfs_ntver_v5ep), 0x00000008, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_vcs,
{ "VCS", "mscldap.ntver.searchflags.vcs", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vcs), 0x00000010, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
{ &hf_mscldap_ntver_flags_vnt4,
{ "VNT4", "mscldap.ntver.searchflags.vnt4", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vnt4), 0x01000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_vpdc,
{ "VPDC", "mscldap.ntver.searchflags.vpdc", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vpdc), 0x10000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_vip,
{ "VIP", "mscldap.ntver.searchflags.vip", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vip), 0x20000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_vl,
{ "VL", "mscldap.ntver.searchflags.vl", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vl), 0x40000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
{ &hf_mscldap_ntver_flags_vgc,
{ "VGC", "mscldap.ntver.searchflags.vgc", FT_BOOLEAN, 32,
TFS(&tfs_ntver_vgc), 0x80000000, "See section 7.3.1.1 of MS-ADTS specification", HFILL }},
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_flags_pdc,
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ "PDC", "mscldap.netlogon.flags.pdc", FT_BOOLEAN, 32,
TFS(&tfs_ads_pdc), 0x00000001, "Is this DC a PDC or not?", HFILL }},
{ &hf_mscldap_netlogon_flags_gc,
{ "GC", "mscldap.netlogon.flags.gc", FT_BOOLEAN, 32,
TFS(&tfs_ads_gc), 0x00000004, "Does this dc service as a GLOBAL CATALOGUE?", HFILL }},
{ &hf_mscldap_netlogon_flags_ldap,
{ "LDAP", "mscldap.netlogon.flags.ldap", FT_BOOLEAN, 32,
TFS(&tfs_ads_ldap), 0x00000008, "Does this DC act as an LDAP server?", HFILL }},
{ &hf_mscldap_netlogon_flags_ds,
{ "DS", "mscldap.netlogon.flags.ds", FT_BOOLEAN, 32,
TFS(&tfs_ads_ds), 0x00000010, "Does this dc provide DS services?", HFILL }},
{ &hf_mscldap_netlogon_flags_kdc,
{ "KDC", "mscldap.netlogon.flags.kdc", FT_BOOLEAN, 32,
TFS(&tfs_ads_kdc), 0x00000020, "Does this dc act as a KDC?", HFILL }},
{ &hf_mscldap_netlogon_flags_timeserv,
{ "Time Serv", "mscldap.netlogon.flags.timeserv", FT_BOOLEAN, 32,
TFS(&tfs_ads_timeserv), 0x00000040, "Does this dc provide time services (ntp) ?", HFILL }},
{ &hf_mscldap_netlogon_flags_closest,
{ "Closest", "mscldap.netlogon.flags.closest", FT_BOOLEAN, 32,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
TFS(&tfs_ads_closest), 0x00000080, "Is this the closest dc?", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_netlogon_flags_writable,
{ "Writable", "mscldap.netlogon.flags.writable", FT_BOOLEAN, 32,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
TFS(&tfs_ads_writable), 0x00000100, "Is this dc writable?", HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
{ &hf_mscldap_netlogon_flags_good_timeserv,
{ "Good Time Serv", "mscldap.netlogon.flags.good_timeserv", FT_BOOLEAN, 32,
TFS(&tfs_ads_good_timeserv), 0x00000200, "Is this a Good Time Server? (i.e. does it have a hardware clock)", HFILL }},
{ &hf_mscldap_netlogon_flags_ndnc,
{ "NDNC", "mscldap.netlogon.flags.ndnc", FT_BOOLEAN, 32,
TFS(&tfs_ads_ndnc), 0x00000400, "Is this an NDNC dc?", HFILL }},
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_flags_rodc,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "RODC", "mscldap.netlogon.flags.rodc", FT_BOOLEAN, 32,
TFS(&tfs_ads_rodc), 0x00000800, "Is this an read only dc?", HFILL }},
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_flags_wdc,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "WDC", "mscldap.netlogon.flags.writabledc.", FT_BOOLEAN, 32,
TFS(&tfs_ads_wdc), 0x00001000, "Is this an writable dc (Windows 2008)?", HFILL }},
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
{ &hf_mscldap_netlogon_flags_dns,
From Gary Reynolds: Extended the cldap desector to include all the current netlogon response data types. Expanded the cldap netlogon ntver option to be a bit mask of the search flags Updated the DS flags fields to include Windows 2008 options. svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
{ "DNS", "mscldap.netlogon.flags.dnsname", FT_BOOLEAN, 32,
TFS(&tfs_ads_dns), 0x20000000, "Does the server have a dns name (Windows 2008)?", HFILL }},
{ &hf_mscldap_netlogon_flags_dnc,
{ "DNC", "mscldap.netlogon.flags.defaultnc", FT_BOOLEAN, 32,
TFS(&tfs_ads_dnc), 0x40000000, "Is this the default NC (Windows 2008)?", HFILL }},
{ &hf_mscldap_netlogon_flags_fnc,
{ "FDC", "mscldap.netlogon.flags.forestnc", FT_BOOLEAN, 32,
TFS(&tfs_ads_fnc), 0x80000000, "Is the the NC the default forest root(Windows 2008)?", HFILL }},
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
{ &hf_ldap_guid,
{ "GUID", "ldap.guid", FT_GUID, BASE_NONE,
More header_field_info cleanup. svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
NULL, 0, NULL, HFILL }},
prettify dissection od ldap attributes special case some common special attributes such as DomainSid and DomainGuid and dissect them as SIDs and GUIDs examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_CREATE_CHILD,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Create Child", "ldap.AccessMask.ADS_CREATE_CHILD", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_CREATE_CHILD, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_DELETE_CHILD,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Delete Child", "ldap.AccessMask.ADS_DELETE_CHILD", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_DELETE_CHILD, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_LIST,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads List", "ldap.AccessMask.ADS_LIST", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_LIST, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_SELF_WRITE,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Self Write", "ldap.AccessMask.ADS_SELF_WRITE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_SELF_WRITE, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_READ_PROP,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Read Prop", "ldap.AccessMask.ADS_READ_PROP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_READ_PROP, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_WRITE_PROP,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Write Prop", "ldap.AccessMask.ADS_WRITE_PROP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_WRITE_PROP, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_DELETE_TREE,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Delete Tree", "ldap.AccessMask.ADS_DELETE_TREE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_DELETE_TREE, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_LIST_OBJECT,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads List Object", "ldap.AccessMask.ADS_LIST_OBJECT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_LIST_OBJECT, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
{ &hf_ldap_AccessMask_ADS_CONTROL_ACCESS,
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ "Ads Control Access", "ldap.AccessMask.ADS_CONTROL_ACCESS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), LDAP_ACCESSMASK_ADS_CONTROL_ACCESS, NULL, HFILL }},
for sec descriptors found inside ldap decode the specific bits of the accessmask as the ldap specific accessmask bits bit definitions from samba4 svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. Cleanup a forgotten pinfo->private_data use in the H245 dissector. svn path=/trunk/; revision=53160
2013-11-08 02:02:43 +00:00
{ &hf_ldap_LDAPMessage_PDU,
{ "LDAPMessage", "ldap.LDAPMessage_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-08 13:19:29 +00:00
{ &hf_ldap_object_security_flag,
{ "Flag Object_Security", "ldap.object_security_flag", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }},
{ &hf_ldap_ancestor_first_flag,
{ "Flag Ancestor_First", "ldap.ancestor_first_flag", FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL }},
{ &hf_ldap_public_data_only_flag,
{ "Flag Public_Data_Only", "ldap.public_data_only_flag", FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL }},
{ &hf_ldap_incremental_value_flag,
{ "Flag Incremental_Value", "ldap.incremental_value_flag", FT_BOOLEAN, 32, NULL, 0x80000000, NULL, HFILL }},
{ &hf_ldap_oid,
{ "OID", "ldap.oid", FT_STRING, BASE_NONE,
NULL, 0, NULL, HFILL }},
{ &hf_ldap_gssapi_encrypted_payload,
{ "GSS-API Encrypted payload", "ldap.gssapi_encrypted_payload", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Included file: packet-ldap-hfarr.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-hfarr.c"
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_SearchControlValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SearchControlValue", "ldap.SearchControlValue_element",
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_SortKeyList_PDU,
{ "SortKeyList", "ldap.SortKeyList",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_SortResult_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SortResult", "ldap.SortResult_element",
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
{ &hf_ldap_DirSyncControlValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "DirSyncControlValue", "ldap.DirSyncControlValue_element",
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_PasswdModifyRequestValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "PasswdModifyRequestValue", "ldap.PasswdModifyRequestValue_element",
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_CancelRequestValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "CancelRequestValue", "ldap.CancelRequestValue_element",
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_SyncRequestValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SyncRequestValue", "ldap.SyncRequestValue_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_SyncStateValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SyncStateValue", "ldap.SyncStateValue_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_SyncDoneValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SyncDoneValue", "ldap.SyncDoneValue_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_SyncInfoValue_PDU,
{ "SyncInfoValue", "ldap.SyncInfoValue",
FT_UINT32, BASE_DEC, VALS(ldap_SyncInfoValue_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
{ &hf_ldap_PasswordPolicyResponseValue_PDU,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "PasswordPolicyResponseValue", "ldap.PasswordPolicyResponseValue_element",
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_messageID,
{ "messageID", "ldap.messageID",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_protocolOp,
{ "protocolOp", "ldap.protocolOp",
FT_UINT32, BASE_DEC, VALS(ldap_ProtocolOp_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_controls,
{ "controls", "ldap.controls",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_bindRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "bindRequest", "ldap.bindRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_bindResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "bindResponse", "ldap.bindResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_unbindRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "unbindRequest", "ldap.unbindRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_searchRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "searchRequest", "ldap.searchRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_searchResEntry,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "searchResEntry", "ldap.searchResEntry_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SearchResultEntry", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_searchResDone,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "searchResDone", "ldap.searchResDone_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SearchResultDone", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_searchResRef,
{ "searchResRef", "ldap.searchResRef",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SearchResultReference", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_modifyRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modifyRequest", "ldap.modifyRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_modifyResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modifyResponse", "ldap.modifyResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_addRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "addRequest", "ldap.addRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_addResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "addResponse", "ldap.addResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_delRequest,
{ "delRequest", "ldap.delRequest",
fix field attributes handling for tagged types regenerate involved dissectors svn path=/trunk/; revision=23783
2007-12-06 11:23:35 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_delResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "delResponse", "ldap.delResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_modDNRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modDNRequest", "ldap.modDNRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ModifyDNRequest", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_modDNResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modDNResponse", "ldap.modDNResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ModifyDNResponse", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_compareRequest,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "compareRequest", "ldap.compareRequest_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_compareResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "compareResponse", "ldap.compareResponse_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_abandonRequest,
{ "abandonRequest", "ldap.abandonRequest",
fix field attributes handling for tagged types regenerate involved dissectors svn path=/trunk/; revision=23783
2007-12-06 11:23:35 +00:00
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_extendedReq,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "extendedReq", "ldap.extendedReq_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ExtendedRequest", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_extendedResp,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "extendedResp", "ldap.extendedResp_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ExtendedResponse", HFILL }},
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
{ &hf_ldap_intermediateResponse,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "intermediateResponse", "ldap.intermediateResponse_element",
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_AttributeDescriptionList_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "AttributeDescription", "ldap.AttributeDescription",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_attributeDesc,
{ "attributeDesc", "ldap.attributeDesc",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeDescription", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_assertionValue,
{ "assertionValue", "ldap.assertionValue",
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_type,
{ "type", "ldap.type",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeDescription", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_vals,
{ "vals", "ldap.vals",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SET_OF_AttributeValue", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_vals_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "AttributeValue", "ldap.AttributeValue",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_resultCode,
{ "resultCode", "ldap.resultCode",
FT_UINT32, BASE_DEC, VALS(ldap_T_resultCode_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_matchedDN,
{ "matchedDN", "ldap.matchedDN",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_errorMessage,
{ "errorMessage", "ldap.errorMessage",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_referral,
{ "referral", "ldap.referral",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_Referral_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "LDAPURL", "ldap.LDAPURL",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_Controls_item,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "Control", "ldap.Control_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_controlType,
{ "controlType", "ldap.controlType",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_criticality,
{ "criticality", "ldap.criticality",
Re-generate asn1 dissectors after hf_register_info cleanup. svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_controlValue,
{ "controlValue", "ldap.controlValue",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_version,
{ "version", "ldap.version",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER_1_127", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_name,
{ "name", "ldap.name",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_authentication,
{ "authentication", "ldap.authentication",
FT_UINT32, BASE_DEC, VALS(ldap_AuthenticationChoice_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AuthenticationChoice", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_simple,
{ "simple", "ldap.simple",
LDAP: Display simple field as string The simple bind credential is a string. This commit changes the ldap.simple field to FT_STRING. Change-Id: If98f7d481994ca187668c75631de8913cdd4c865 Reviewed-on: https://code.wireshark.org/review/14933 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-15 20:10:12 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_sasl,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "sasl", "ldap.sasl_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SaslCredentials", HFILL }},
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
{ &hf_ldap_ntlmsspNegotiate,
{ "ntlmsspNegotiate", "ldap.ntlmsspNegotiate",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
{ &hf_ldap_ntlmsspAuth,
{ "ntlmsspAuth", "ldap.ntlmsspAuth",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_mechanism,
{ "mechanism", "ldap.mechanism",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_credentials,
{ "credentials", "ldap.credentials",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_bindResponse_resultCode,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "resultCode", "ldap.resultCode",
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
FT_UINT32, BASE_DEC, VALS(ldap_BindResponse_resultCode_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BindResponse_resultCode", HFILL }},
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
{ &hf_ldap_bindResponse_matchedDN,
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ "matchedDN", "ldap.matchedDN",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"T_bindResponse_matchedDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_serverSaslCreds,
{ "serverSaslCreds", "ldap.serverSaslCreds",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_baseObject,
{ "baseObject", "ldap.baseObject",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_scope,
{ "scope", "ldap.scope",
FT_UINT32, BASE_DEC, VALS(ldap_T_scope_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_derefAliases,
{ "derefAliases", "ldap.derefAliases",
FT_UINT32, BASE_DEC, VALS(ldap_T_derefAliases_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_sizeLimit,
{ "sizeLimit", "ldap.sizeLimit",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER_0_maxInt", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_timeLimit,
{ "timeLimit", "ldap.timeLimit",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER_0_maxInt", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_typesOnly,
{ "typesOnly", "ldap.typesOnly",
Re-generate asn1 dissectors after hf_register_info cleanup. svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_filter,
{ "filter", "ldap.filter",
FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_searchRequest_attributes,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "attributes", "ldap.attributes",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeDescriptionList", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_and,
{ "and", "ldap.and",
FT_UINT32, BASE_DEC, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_and_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "and item", "ldap.and_item",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_or,
{ "or", "ldap.or",
FT_UINT32, BASE_DEC, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_or_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "or item", "ldap.or_item",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_not,
{ "not", "ldap.not",
FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_equalityMatch,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "equalityMatch", "ldap.equalityMatch_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_substrings,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "substrings", "ldap.substrings_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SubstringFilter", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_greaterOrEqual,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "greaterOrEqual", "ldap.greaterOrEqual_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_lessOrEqual,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "lessOrEqual", "ldap.lessOrEqual_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_present,
{ "present", "ldap.present",
FT_STRING, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_approxMatch,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "approxMatch", "ldap.approxMatch_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_extensibleMatch,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "extensibleMatch", "ldap.extensibleMatch_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_substringFilter_substrings,
{ "substrings", "ldap.substrings",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"T_substringFilter_substrings", HFILL }},
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
{ &hf_ldap_substringFilter_substrings_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "substrings item", "ldap.substrings_item",
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
FT_UINT32, BASE_DEC, VALS(ldap_T_substringFilter_substrings_item_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"T_substringFilter_substrings_item", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_initial,
{ "initial", "ldap.initial",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPString", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_any,
{ "any", "ldap.any",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPString", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_final,
{ "final", "ldap.final",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPString", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_matchingRule,
{ "matchingRule", "ldap.matchingRule",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"MatchingRuleId", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_matchValue,
{ "matchValue", "ldap.matchValue",
rework the previous patch slightly since we really need to push a string upward to our callers to be able to generate and display nice filter expressions on the top line as the original ldap dissectopr did svn path=/trunk/; revision=18421
2006-06-10 06:48:09 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AssertionValue", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_dnAttributes,
{ "dnAttributes", "ldap.dnAttributes",
Re-generate asn1 dissectors after hf_register_info cleanup. svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_objectName,
{ "objectName", "ldap.objectName",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_searchResultEntry_attributes,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "attributes", "ldap.attributes",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"PartialAttributeList", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_PartialAttributeList_item,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "PartialAttributeList item", "ldap.PartialAttributeList_item_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
{ &hf_ldap__untag_item,
Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
{ "LDAPURL", "ldap.LDAPURL",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_object,
{ "object", "ldap.object",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_modifyRequest_modification,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "modification", "ldap.modification",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ModifyRequest_modification", HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_modifyRequest_modification_item,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modification item", "ldap.modification_item_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"T_modifyRequest_modification_item", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_operation,
{ "operation", "ldap.operation",
FT_UINT32, BASE_DEC, VALS(ldap_T_operation_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_modification,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "modification", "ldap.modification_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeTypeAndValues", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_entry,
{ "entry", "ldap.entry",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_attributes,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "attributes", "ldap.attributes",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeList", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_AttributeList_item,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "AttributeList item", "ldap.AttributeList_item_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_newrdn,
{ "newrdn", "ldap.newrdn",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"RelativeLDAPDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_deleteoldrdn,
{ "deleteoldrdn", "ldap.deleteoldrdn",
Re-generate asn1 dissectors after hf_register_info cleanup. svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_newSuperior,
{ "newSuperior", "ldap.newSuperior",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPDN", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_ava,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "ava", "ldap.ava_element",
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeValueAssertion", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_requestName,
{ "requestName", "ldap.requestName",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"LDAPOID", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_requestValue,
{ "requestValue", "ldap.requestValue",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
{ &hf_ldap_extendedResponse_resultCode,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ "resultCode", "ldap.resultCode",
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
FT_UINT32, BASE_DEC, VALS(ldap_ExtendedResponse_resultCode_vals), 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"ExtendedResponse_resultCode", HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_responseName,
{ "responseName", "ldap.responseName",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
{ &hf_ldap_response,
{ "response", "ldap.response",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
{ &hf_ldap_intermediateResponse_responseValue,
{ "responseValue", "ldap.responseValue",
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"T_intermediateResponse_responseValue", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_size,
{ "size", "ldap.size",
FT_INT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_cookie,
{ "cookie", "ldap.cookie",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_SortKeyList_item,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "SortKeyList item", "ldap.SortKeyList_item_element",
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_attributeType,
{ "attributeType", "ldap.attributeType",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"AttributeDescription", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_orderingRule,
{ "orderingRule", "ldap.orderingRule",
FT_STRING, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"MatchingRuleId", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_reverseOrder,
{ "reverseOrder", "ldap.reverseOrder",
Re-generate asn1 dissectors after hf_register_info cleanup. svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
{ &hf_ldap_sortResult,
{ "sortResult", "ldap.sortResult",
FT_UINT32, BASE_DEC, VALS(ldap_T_sortResult_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
{ &hf_ldap_flags,
{ "flags", "ldap.flags",
LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex. Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e Reviewed-on: https://code.wireshark.org/review/5684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09 03:24:33 +00:00
FT_UINT32, BASE_HEX, NULL, 0,
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
"DirSyncFlags", HFILL }},
{ &hf_ldap_maxBytes,
{ "maxBytes", "ldap.maxBytes",
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
FT_INT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER", HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_userIdentity,
{ "userIdentity", "ldap.userIdentity",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_oldPasswd,
{ "oldPasswd", "ldap.oldPasswd",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_newPasswd,
{ "newPasswd", "ldap.newPasswd",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
{ &hf_ldap_cancelID,
{ "cancelID", "ldap.cancelID",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"MessageID", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_mode,
{ "mode", "ldap.mode",
FT_UINT32, BASE_DEC, VALS(ldap_T_mode_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_reloadHint,
{ "reloadHint", "ldap.reloadHint",
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_state,
{ "state", "ldap.state",
FT_UINT32, BASE_DEC, VALS(ldap_T_state_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_entryUUID,
{ "entryUUID", "ldap.entryUUID",
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SyncUUID", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_refreshDeletes,
{ "refreshDeletes", "ldap.refreshDeletes",
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_newcookie,
{ "newcookie", "ldap.newcookie",
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"OCTET_STRING", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_refreshDelete,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "refreshDelete", "ldap.refreshDelete_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_refreshDone,
{ "refreshDone", "ldap.refreshDone",
FT_BOOLEAN, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"BOOLEAN", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_refreshPresent,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "refreshPresent", "ldap.refreshPresent_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_syncIdSet,
Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402 svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
{ "syncIdSet", "ldap.syncIdSet_element",
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
FT_NONE, BASE_NONE, NULL, 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_syncUUIDs,
{ "syncUUIDs", "ldap.syncUUIDs",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"SET_OF_SyncUUID", HFILL }},
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
{ &hf_ldap_syncUUIDs_item,
{ "SyncUUID", "ldap.SyncUUID",
FT_BYTES, BASE_NONE, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
NULL, HFILL }},
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
{ &hf_ldap_warning,
{ "warning", "ldap.warning",
FT_UINT32, BASE_DEC, VALS(ldap_T_warning_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
{ &hf_ldap_timeBeforeExpiration,
{ "timeBeforeExpiration", "ldap.timeBeforeExpiration",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER_0_maxInt", HFILL }},
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
{ &hf_ldap_graceAuthNsRemaining,
{ "graceAuthNsRemaining", "ldap.graceAuthNsRemaining",
FT_UINT32, BASE_DEC, NULL, 0,
Regenerate a few more of the ASN.1 dissectors svn path=/trunk/; revision=32744
2010-05-11 02:33:30 +00:00
"INTEGER_0_maxInt", HFILL }},
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
{ &hf_ldap_error,
{ "error", "ldap.error",
FT_UINT32, BASE_DEC, VALS(ldap_T_error_vals), 0,
Add a little more code to avoid not-very-useful blurbs: - Change spaces in the name to underscores before comparing it to the blurb. - Check if the type simply as T_ prepended to the name. - Don't put in a blurb of "NULL". and regenerate the dissectors. svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
NULL, HFILL }},
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- End of included file: packet-ldap-hfarr.c ---*/
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
#line 2155 "./asn1/ldap/packet-ldap-template.c"
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
};
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* List of subtrees */
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
static gint *ett[] = {
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
&ett_ldap,
&ett_ldap_payload,
from metze various bugfixes and enhancements to decryption of secure ldap svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
&ett_ldap_sasl_blob,
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
&ett_ldap_msg,
do some template magic to make ethereal dissect CLDAP RPC again. i dont think it is the optimal way to solve this but it is better than nothing for the time being. svn path=/trunk/; revision=18083
2006-05-03 10:59:15 +00:00
&ett_mscldap_netlogon_flags,
Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1, revision 26 (11/19/2010). Also re-format code a bit. svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
&ett_mscldap_ntver_flags,
&ett_mscldap_ipdetails,
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
&ett_ldap_DirSyncFlagsSubEntry,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- Included file: packet-ldap-ettarr.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-ettarr.c"
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_LDAPMessage,
&ett_ldap_ProtocolOp,
&ett_ldap_AttributeDescriptionList,
&ett_ldap_AttributeValueAssertion,
&ett_ldap_Attribute,
&ett_ldap_SET_OF_AttributeValue,
&ett_ldap_LDAPResult,
&ett_ldap_Referral,
&ett_ldap_Controls,
&ett_ldap_Control,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_BindRequest_U,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_AuthenticationChoice,
&ett_ldap_SaslCredentials,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_BindResponse_U,
&ett_ldap_SearchRequest_U,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_Filter,
prettify dissection of LDAP search filters. svn path=/trunk/; revision=18431
2006-06-12 08:30:07 +00:00
&ett_ldap_T_and,
&ett_ldap_T_or,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_SubstringFilter,
make CLDAP show up as CLDAP in the dissectyion tree and not as LDAP this also makes the "cldap" filter work svn path=/trunk/; revision=18419
2006-06-10 04:29:26 +00:00
&ett_ldap_T_substringFilter_substrings,
&ett_ldap_T_substringFilter_substrings_item,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_MatchingRuleAssertion,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_SearchResultEntry_U,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_PartialAttributeList,
&ett_ldap_PartialAttributeList_item,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_SEQUENCE_OF_LDAPURL,
&ett_ldap_ModifyRequest_U,
LDAP wasn't 'fixed' to handle -T option... svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
&ett_ldap_ModifyRequest_modification,
&ett_ldap_T_modifyRequest_modification_item,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_AttributeTypeAndValues,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_AddRequest_U,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
&ett_ldap_AttributeList,
&ett_ldap_AttributeList_item,
LDAP with -T svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
&ett_ldap_ModifyDNRequest_U,
&ett_ldap_CompareRequest_U,
&ett_ldap_ExtendedRequest_U,
&ett_ldap_ExtendedResponse_U,
From Mathieu Parent: As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol], see the attached patch that dissects IntermediateMessage. svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
&ett_ldap_IntermediateResponse_U,
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
&ett_ldap_SearchControlValue,
&ett_ldap_SortKeyList,
&ett_ldap_SortKeyList_item,
&ett_ldap_SortResult,
From Matthieu Patou <mat@samba.org> Dissect LDAP DirSyncFlags to show the bits of this bitmap. svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
&ett_ldap_DirSyncControlValue,
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
&ett_ldap_PasswdModifyRequestValue,
&ett_ldap_CancelRequestValue,
From Mathieu Parent: Dissector for LDAP Content Synchronization Operation (Modified in order to remove the unneeded oid_add_from_string's) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309 svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
&ett_ldap_SyncRequestValue,
&ett_ldap_SyncStateValue,
&ett_ldap_SyncDoneValue,
&ett_ldap_SyncInfoValue,
&ett_ldap_T_refreshDelete,
&ett_ldap_T_refreshPresent,
&ett_ldap_T_syncIdSet,
&ett_ldap_SET_OF_SyncUUID,
LDAP control support for Password policy for LDAP directories. svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
&ett_ldap_PasswordPolicyResponseValue,
&ett_ldap_T_warning,
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- End of included file: packet-ldap-ettarr.c ---*/
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
#line 2169 "./asn1/ldap/packet-ldap-template.c"
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
};
/* UAT for header fields */
static uat_field_t custom_attribute_types_uat_fields[] = {
UAT_FLD_CSTRING(attribute_types, attribute_type, "Attribute type", "Attribute type"),
UAT_FLD_CSTRING(attribute_types, attribute_desc, "Description", "Description of the value matching type"),
UAT_END_FIELDS
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
};
Convert ASN.1 dissectors to use filterable expert info. NOTE: Kerberos ASN.1 template was updated, but not generated to source. svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
static ei_register_info ei[] = {
{ &ei_ldap_exceeded_filter_length, { "ldap.exceeded_filter_length", PI_UNDECODED, PI_ERROR, "Filter length exceeds number. Giving up", EXPFILL }},
{ &ei_ldap_too_many_filter_elements, { "ldap.too_many_filter_elements", PI_UNDECODED, PI_ERROR, "Found more than %%u filter elements. Giving up.", EXPFILL }},
};
expert_module_t* expert_ldap;
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
module_t *ldap_module;
uat_t *attributes_uat;
Fix spelling/typos found using a list of commonly misspelled words. The misspellings were mostly in comments but some were in text strings visible to the user. svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/* Register protocol */
proto_ldap = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
Doug Nazar's LDAP dissector. svn path=/trunk/; revision=1756
2000-03-28 07:12:36 +00:00
proto_register_field_array(proto_ldap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
Convert ASN.1 dissectors to use filterable expert info. NOTE: Kerberos ASN.1 template was updated, but not generated to source. svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
expert_ldap = expert_register_protocol(proto_ldap);
expert_register_field_array(expert_ldap, ei, array_length(ei));
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
ASN.1 dissectors - don't try to find yourself. If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx function and then calling find_dissector for itself in its proto_reg_handoff_xxx function then just create a static handle for that dissector and use the return value of register_dissector, so the find isn't necessary. Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447 Reviewed-on: https://code.wireshark.org/review/16233 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-01 00:41:45 +00:00
ldap_handle = register_dissector("ldap", dissect_ldap_tcp, proto_ldap);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
ldap_module = prefs_register_protocol(proto_ldap, prefs_register_ldap);
Add support for TCP desegmentation. svn path=/trunk/; revision=4538
2002-01-14 02:50:28 +00:00
prefs_register_bool_preference(ldap_module, "desegment_ldap_messages",
Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions. I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences. Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect. If you encounter any mistakes I've made here, please let me know... svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
"Reassemble LDAP messages spanning multiple TCP segments",
"Whether the LDAP dissector should reassemble messages spanning multiple TCP segments."
Add a missing space in a tooltip. svn path=/trunk/; revision=26706
2008-11-06 15:21:03 +00:00
" To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
Add support for TCP desegmentation. svn path=/trunk/; revision=4538
2002-01-14 02:50:28 +00:00
&ldap_desegment);
If we see SASL authentication in a bind request, attach to the 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
2002-09-09 23:41:12 +00:00
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
prefs_register_uint_preference(ldap_module, "ssl.port", "LDAPS TCP Port",
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Set the port for LDAP operations over SSL",
10, &global_ldaps_tcp_port);
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
/* UAT */
Adjusted UAT name. svn path=/trunk/; revision=41844
2012-03-30 12:45:43 +00:00
attributes_uat = uat_new("Custom LDAP AttributeValue types",
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
sizeof(attribute_type_t),
"custom_ldap_attribute_types",
TRUE,
Fix all -fstrict-alias warnings found by gcc 4.1.2 The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-30 17:43:52 +00:00
&attribute_types,
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
&num_attribute_types,
UATs could be put into "categories". The categories were defined only implicitly by the #define name and string they were defined to; not all UATs neatly fit into any of the categories, so some of them were put into categories that weren't obviously correct for them, and one - the display filter macro UAT - wasn't put into any category at all (which caused crashes when editing them, as the GUI code that handled UAT changes from a dialog assumed the category field was non-null). The category was, in practice, used only to decide, in the aforementioned GUI code, whether the packet summary pane needed to be updated or not. It also offered no option of "don't update the packet summary pane *and* don't redissect anything", which is what would be appropriate for the display filter macro UAT. Replace the category with a set of fields indicating what the UAT affects; we currently offer "dissection", which applies to most UATs (any UAT in libwireshark presumably affects dissection at a minimum) and "the set of named fields that exist". Changing any UAT that affects dissection requires a redissection; changing any UAT that affects the set of named fields that exist requires a redissection *and* rebuilding the packet summary pane. Perhaps we also need "filtering", so that if you change a display filter macro, we re-filter, in case the display is currently filtered with a display filter that uses a macro that changed. svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
/* specifies named fields, so affects dissection
and the set of named fields */
UAT_AFFECTS_DISSECTION|UAT_AFFECTS_FIELDS,
Added support for configuring custom LDAP AttributeValue types. svn path=/trunk/; revision=41841
2012-03-30 09:08:55 +00:00
NULL,
attribute_types_copy_cb,
attribute_types_update_cb,
attribute_types_free_cb,
attribute_types_initialize_cb,
custom_attribute_types_uat_fields);
prefs_register_uat_preference(ldap_module, "custom_ldap_attribute_types",
"Custom AttributeValue types",
"A table to define custom LDAP attribute type values for which fields can be setup and used for filtering/data extraction etc.",
attributes_uat);
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Don't remove a preference, make it obsolete instead. svn path=/trunk/; revision=19818
2006-11-06 11:41:02 +00:00
prefs_register_obsolete_preference(ldap_module, "max_pdu");
Put CLDAP instead of LDAP in COL_INFO for LDAP over UDP. svn path=/trunk/; revision=8161
2003-08-12 20:14:05 +00:00
proto_cldap = proto_register_protocol(
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
"Connectionless Lightweight Directory Access Protocol",
"CLDAP", "cldap");
Put CLDAP instead of LDAP in COL_INFO for LDAP over UDP. svn path=/trunk/; revision=8161
2003-08-12 20:14:05 +00:00
update for LDAP measure the response time for some LDAP commands and add a service response time dialog for it svn path=/trunk/; revision=8885
2003-11-05 09:04:17 +00:00
ldap_tap=register_tap("ldap");
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Don't do any Decode As stuff for dissector tables not used with Decode As. Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 22:51:54 +00:00
ldap_name_dissector_table = register_dissector_table("ldap.name", "LDAP Attribute Type Dissectors", proto_cldap, FT_STRING, BASE_NONE);
LDAP attribute type dissector framework including support for "netlogon" attribute and PKI attributes svn path=/trunk/; revision=18109
2006-05-08 17:52:42 +00:00
Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16 21:07:04 +00:00
register_srt_table(proto_ldap, NULL, 1, ldapstat_packet, ldapstat_init, NULL);
added ldap dissector placeholder, just does request/response for now, until I have a chance to figure out ASN.1 svn path=/trunk/; revision=1254
1999-12-09 04:06:54 +00:00
}
Move calls to "dissector_add()" out of the register routines for TCP and 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
2000-04-08 07:07:42 +00:00
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
/*--- proto_reg_handoff_ldap ---------------------------------------*/
Move calls to "dissector_add()" out of the register routines for TCP and 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
2000-04-08 07:07:42 +00:00
void
proto_reg_handoff_ldap(void)
{
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
dissector_handle_t cldap_handle;
Make "dissector_add()", "dissector_delete()", and "dissector_change()" 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
2001-12-03 04:00:26 +00:00
"new" dissector API -> dissector API for ASN.1 dissectors. Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 02:06:20 +00:00
cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
Convert most UDP dissectors to use "auto" preferences. Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67, convert dissectors that use "udp.port". More cleanup done on dissectors that use both TCP and UDP dissector tables, so that less preference callbacks exist. Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3 Reviewed-on: https://code.wireshark.org/review/18120 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-05 20:33:54 +00:00
dissector_add_uint_with_preference("udp.port", UDP_PORT_CLDAP, cldap_handle);
Dissect SASL credentials. svn path=/trunk/; revision=6087
2002-08-26 09:21:54 +00:00
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
gssapi_handle = find_dissector_add_dependency("gssapi", proto_ldap);
gssapi_wrap_handle = find_dissector_add_dependency("gssapi_verf", proto_ldap);
spnego_handle = find_dissector_add_dependency("spnego", proto_ldap);
From Graeme Lunt: The ftbp.patch file includes: a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings. b) New EXPORTs for the FTAM dissector for use in FTBP. c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do. * Better ROS handling and registration * Simplified RTSE registration * X411 column information, extension naming and use of new RTSE/ROS registration * X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch). * Better highlighting of S4406 protocol. svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_ldap);
fix for 1148 pretty horrible hack to store an ntlmssp blob inside an ldap string the info column is not entirely pretty but the payload is at least decoded svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
ssl_handle = find_dissector_add_dependency("ssl", proto_ldap);
Basic support for the LDAP start_tls extended operation and fix to match up extended operation arguments and results. svn path=/trunk/; revision=24076
2008-01-13 14:12:47 +00:00
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
prefs_register_ldap();
Small changes related to proto_reg_handoff; Use find_dissector; Initialize saved tcp_port pref properly; This should fix a possble bug wherein LDAP over SSL would not be dissected properly. (I don't have a test capture to verify this fix). svn path=/trunk/; revision=26764
2008-11-12 23:55:52 +00:00
From Graeme Lunt: The ftbp.patch file includes: a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings. b) New EXPORTs for the FTAM dissector for use in FTBP. c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do. * Better ROS handling and registration * Simplified RTSE registration * X411 column information, extension naming and use of new RTSE/ROS registration * X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch). * Better highlighting of S4406 protocol. svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
/* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
oid_add_from_string("LDAP_PAGED_RESULT_OID_STRING","1.2.840.113556.1.4.319");
oid_add_from_string("LDAP_SERVER_SHOW_DELETED_OID","1.2.840.113556.1.4.417");
oid_add_from_string("LDAP_SERVER_SORT_OID","1.2.840.113556.1.4.473");
oid_add_from_string("LDAP_CONTROL_SORT_RESP_OID","1.2.840.113556.1.4.474");
oid_add_from_string("LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID","1.2.840.113556.1.4.521");
oid_add_from_string("LDAP_SERVER_NOTIFICATION_OID","1.2.840.113556.1.4.528");
oid_add_from_string("LDAP_SERVER_EXTENDED_DN_OID","1.2.840.113556.1.4.529");
oid_add_from_string("meetingAdvertiseScope","1.2.840.113556.1.4.582");
oid_add_from_string("LDAP_SERVER_LAZY_COMMIT_OID","1.2.840.113556.1.4.619");
oid_add_from_string("mhsORAddress","1.2.840.113556.1.4.650");
oid_add_from_string("managedObjects","1.2.840.113556.1.4.654");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_OID","1.2.840.113556.1.4.800");
oid_add_from_string("LDAP_SERVER_SD_FLAGS_OID","1.2.840.113556.1.4.801");
oid_add_from_string("LDAP_OID_COMPARATOR_OR","1.2.840.113556.1.4.804");
oid_add_from_string("LDAP_SERVER_TREE_DELETE_OID","1.2.840.113556.1.4.805");
oid_add_from_string("LDAP_SERVER_DIRSYNC_OID","1.2.840.113556.1.4.841");
oid_add_from_string("None","1.2.840.113556.1.4.970");
oid_add_from_string("LDAP_SERVER_VERIFY_NAME_OID","1.2.840.113556.1.4.1338");
oid_add_from_string("LDAP_SERVER_DOMAIN_SCOPE_OID","1.2.840.113556.1.4.1339");
oid_add_from_string("LDAP_SERVER_SEARCH_OPTIONS_OID","1.2.840.113556.1.4.1340");
oid_add_from_string("LDAP_SERVER_PERMISSIVE_MODIFY_OID","1.2.840.113556.1.4.1413");
oid_add_from_string("LDAP_SERVER_ASQ_OID","1.2.840.113556.1.4.1504");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_V51_OID","1.2.840.113556.1.4.1670");
oid_add_from_string("LDAP_SERVER_FAST_BIND_OID","1.2.840.113556.1.4.1781");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID","1.2.840.113556.1.4.1791");
oid_add_from_string("msDS-ObjectReference","1.2.840.113556.1.4.1840");
oid_add_from_string("msDS-QuotaEffective","1.2.840.113556.1.4.1848");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID","1.2.840.113556.1.4.1851");
oid_add_from_string("msDS-PortSSL","1.2.840.113556.1.4.1860");
oid_add_from_string("msDS-isRODC","1.2.840.113556.1.4.1960");
oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
oid_add_from_string("None","1.3.6.1.4.1.1466.101.119.1");
oid_add_from_string("LDAP_START_TLS_OID","1.3.6.1.4.1.1466.20037");
oid_add_from_string("LDAP_CONTROL_VLVREQUEST VLV","2.16.840.1.113730.3.4.9");
oid_add_from_string("LDAP_CONTROL_VLVRESPONSE VLV","2.16.840.1.113730.3.4.10");
oid_add_from_string("LDAP_SERVER_QUOTA_CONTROL_OID","1.2.840.113556.1.4.1852");
oid_add_from_string("LDAP_SERVER_RANGE_OPTION_OID","1.2.840.113556.1.4.802");
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
ldap: Add inetOrgPerson from RFC2798. Change-Id: I3e2e3143f66db62c416fd7031d290e2a5b21fa93 Reviewed-on: https://code.wireshark.org/review/12677 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-16 11:18:01 +00:00
/* RFC2798 */
oid_add_from_string("inetOrgPerson","2.16.840.1.113730.3.2.2");
"new" dissector API -> dissector API for ASN.1 dissectors. Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 02:06:20 +00:00
dissector_add_string("ldap.name", "netlogon", create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
dissector_add_string("ldap.name", "objectGUID", create_dissector_handle(dissect_ldap_guid, proto_ldap));
dissector_add_string("ldap.name", "supportedControl", create_dissector_handle(dissect_ldap_oid, proto_ldap));
dissector_add_string("ldap.name", "supportedCapabilities", create_dissector_handle(dissect_ldap_oid, proto_ldap));
dissector_add_string("ldap.name", "objectSid", create_dissector_handle(dissect_ldap_sid, proto_ldap));
dissector_add_string("ldap.name", "nTSecurityDescriptor", create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
/*--- Included file: packet-ldap-dis-tab.c ---*/
Move /asn1 to /epan/dissectors Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09 03:17:51 +00:00
#line 1 "./asn1/ldap/packet-ldap-dis-tab.c"
Convert ASN.1 dissectors to remove "new" from "new-style" dissector function names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10 02:50:10 +00:00
register_ber_oid_dissector("1.2.840.113556.1.4.319", dissect_SearchControlValue_PDU, proto_ldap, "pagedResultsControl");
register_ber_oid_dissector("1.2.840.113556.1.4.473", dissect_SortKeyList_PDU, proto_ldap, "sortKeyList");
register_ber_oid_dissector("1.2.840.113556.1.4.474", dissect_SortResult_PDU, proto_ldap, "sortResult");
register_ber_oid_dissector("1.2.840.113556.1.4.841", dissect_DirSyncControlValue_PDU, proto_ldap, "dirsync");
register_ber_oid_dissector("1.3.6.1.4.1.4203.1.11.1", dissect_PasswdModifyRequestValue_PDU, proto_ldap, "passwdModifyOID");
register_ber_oid_dissector("1.3.6.1.1.8", dissect_CancelRequestValue_PDU, proto_ldap, "cancelRequestOID");
register_ber_oid_dissector("1.3.6.1.4.1.4203.1.9.1.1", dissect_SyncRequestValue_PDU, proto_ldap, "syncRequestOID");
register_ber_oid_dissector("1.3.6.1.4.1.4203.1.9.1.2", dissect_SyncStateValue_PDU, proto_ldap, "syncStateOID");
register_ber_oid_dissector("1.3.6.1.4.1.4203.1.9.1.3", dissect_SyncDoneValue_PDU, proto_ldap, "syncDoneOID");
register_ber_oid_dissector("1.3.6.1.4.1.4203.1.9.1.4", dissect_SyncInfoValue_PDU, proto_ldap, "syncInfoOID");
register_ber_oid_dissector("1.3.6.1.4.1.42.2.27.8.5.1", dissect_PasswordPolicyResponseValue_PDU, proto_ldap, "passwordPolicy");
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
/*--- End of included file: packet-ldap-dis-tab.c ---*/
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
#line 2314 "./asn1/ldap/packet-ldap-template.c"
General updates to: *) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed. *) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID. *) Remove reference to removed BER preference in the LDAP reassembly preference. *) Mark a LDAPURL as a URL svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Combine Decode As and port preferences for tcp.port dissector table. This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:25:01 +00:00
dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle);
Move calls to "dissector_add()" out of the register routines for TCP and 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
2000-04-08 07:07:42 +00:00
}
Use the asn2eth generated ldap dissector. svn path=/trunk/; revision=18057
2006-05-01 10:04:10 +00:00
Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.) svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
static void
prefs_register_ldap(void)
{
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
if(ssl_port != global_ldaps_tcp_port) {
if(ssl_port)
Create real dissector tables for SSL and DTLS to use. Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call. Change-Id: I0fdf941389934c20cbacf910250e17520614e706 Reviewed-on: https://code.wireshark.org/review/11591 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 04:20:45 +00:00
ssl_dissector_delete(ssl_port, ldap_handle);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
/* Set our port number for future use */
ssl_port = global_ldaps_tcp_port;
Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
if(ssl_port)
Create real dissector tables for SSL and DTLS to use. Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call. Change-Id: I0fdf941389934c20cbacf910250e17520614e706 Reviewed-on: https://code.wireshark.org/review/11591 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-06 04:20:45 +00:00
ssl_dissector_add(ssl_port, ldap_handle);
1) Support for configurable LDAP over SSL port 2) Support for RFC 3909 - cancelRequest extendedOperation 3) Support for RFC 3062 - passwordModify extendedOperation 4) Column information for ExtendedRequest, SearchResultRef and AbandonRequest 5) Column information for multiple LDAP operations in the same packet (uses " | " separator) svn path=/trunk/; revision=24195
2008-01-26 10:12:22 +00:00
}
}
LDAP: fix indent (use 2 spaces) Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f Reviewed-on: https://code.wireshark.org/review/12234 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 22:06:01 +00:00
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/