From 93098c5100c8885a112fffce64b3d5d6494135a7 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Wed, 25 Jul 2007 17:31:32 +0000
Subject: [PATCH] Fix for issue #1015: ldapsearch --verbose option doesn't work. This change causes ldapsearch and ldapmodify verbose options to trace the contents of incoming and outgoing LDAP messages and ASN.1 elements to standard error stream. It excludes search-result-entry messages from the trace since this would be rather too verbose and not very useful. The main use for verbose output is to investigate connection problems, referral following and such. A possible improvement would be to use a separate option for the ASN.1 tracing, and add session related output such as connection details, security context details and auth details as well as referral chasing details (all this must currently be derived from the protocol trace).
---
opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
index 6c1df65..13767c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -42,11 +42,8 @@
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
-import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.asn1.ASN1Reader;
-import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.ldap.AddRequestProtocolOp;
import org.opends.server.protocols.ldap.AddResponseProtocolOp;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
@@ -635,8 +632,8 @@
return LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR;
}
- ASN1Reader reader = connection.getASN1Reader();
- ASN1Writer writer = connection.getASN1Writer();
+ LDAPReader reader = connection.getLDAPReader();
+ LDAPWriter writer = connection.getLDAPWriter();
// Construct the add request to send to the server.
@@ -708,18 +705,16 @@
LDAPMessage responseMessage;
try
{
- writer.writeElement(requestMessage.encode());
+ writer.writeMessage(requestMessage);
- ASN1Element responseElement = reader.readElement();
- if (responseElement == null)
+ responseMessage = reader.readMessage();
+ if (responseMessage == null)
{
int msgID = MSGID_STOPDS_UNEXPECTED_CONNECTION_CLOSURE;
String message = getMessage(msgID);
err.println(wrapText(message, MAX_LINE_WIDTH));
return LDAPResultCode.CLIENT_SIDE_SERVER_DOWN;
}
-
- responseMessage = LDAPMessage.decode(responseElement.decodeAsSequence());
}
catch (IOException ioe)
{
--
Gitblit v1.10.0