Entry rwlock is no longer needed as concurrency is managed

[openldap] / contrib / ldapc++ / src / LDAPExtRequest.cpp

diff --git a/contrib/ldapc++/src/LDAPExtRequest.cpp b/contrib/ldapc++/src/LDAPExtRequest.cpp
index 3e85b5277ea0ab29c6d21df4ecd84025a790009f..b7f54eeecd3b6899bb1347c2cbd3b4edd4396961 100644 (file)
--- a/contrib/ldapc++/src/LDAPExtRequest.cpp
+++ b/contrib/ldapc++/src/LDAPExtRequest.cpp
@@ -10,39 +10,49 @@
 
 #include "LDAPExtRequest.h"
 #include "LDAPException.h"
+#include "LDAPResult.h"
+
+using namespace std;
 
 LDAPExtRequest::LDAPExtRequest(const LDAPExtRequest& req) :
         LDAPRequest(req){
-    DEBUG(LDAP_DEBUG_TRACE,
-            "LDAPExtRequest::LDAPExtRequest(LDAPExtRequest&)" << endl);
+    DEBUG(LDAP_DEBUG_CONSTRUCT,"LDAPExtRequest::LDAPExtRequest(&)" << endl);
+    m_data=req.m_data;
+    m_oid=req.m_oid;
 }
 
-LDAPExtRequest::LDAPExtRequest(const char *oid, const BerValue* data, 
-        const LDAPAsynConnection *connect, const LDAPConstraints *cons,
-        bool isReferral=false) : LDAPRequest(connect, cons, isReferral){
-    DEBUG(LDAP_DEBUG_TRACE, "LDAPExtRequest::LDAPExtRequest()" << endl);
-    DEBUG(LDAP_DEBUG_PARAMETER, "   oid:" << oid << endl);
-    assert(oid);
-    m_oid=strdup(oid);
-    if(data){
-        m_data=ber_bvdup(data);
-    }else{
-        m_data=0;
-    }
+LDAPExtRequest::LDAPExtRequest(const string& oid, const string& data, 
+        LDAPAsynConnection *connect, const LDAPConstraints *cons,
+        bool isReferral, const LDAPRequest* parent) 
+        : LDAPRequest(connect, cons, isReferral, parent){
+    DEBUG(LDAP_DEBUG_CONSTRUCT, "LDAPExtRequest::LDAPExtRequest()" << endl);
+    DEBUG(LDAP_DEBUG_CONSTRUCT | LDAP_DEBUG_PARAMETER, 
+            "   oid:" << oid << endl);
+    m_oid=oid;
+    m_data=data;
 }
 
 LDAPExtRequest::~LDAPExtRequest(){
-    DEBUG(LDAP_DEBUG_TRACE, "LDAPExtRequest::~LDAPExtRequest()" << endl);
-    delete[] m_oid;
-    ber_bvfree(m_data);
+    DEBUG(LDAP_DEBUG_DESTROY, "LDAPExtRequest::~LDAPExtRequest()" << endl);
 }
 
 LDAPMessageQueue* LDAPExtRequest::sendRequest(){
     DEBUG(LDAP_DEBUG_TRACE, "LDAPExtRequest::sendRequest()" << endl);
     int msgID=0;
-    int err=ldap_extended_operation(m_connection->getSessionHandle(),m_oid, 
-            m_data, m_cons->getSrvCtrlsArray(), m_cons->getClCtrlsArray(),
-            &msgID);
+    BerValue* tmpdata=0;
+    if(m_data != ""){
+        tmpdata=(BerValue*) malloc(sizeof(BerValue));
+        tmpdata->bv_len = m_data.size();
+        tmpdata->bv_val = (char*) malloc(sizeof(char) * (m_data.size()) );
+        m_data.copy(tmpdata->bv_val, string::npos);
+    }
+    LDAPControl** tmpSrvCtrls=m_cons->getSrvCtrlsArray();
+    LDAPControl** tmpClCtrls=m_cons->getClCtrlsArray();
+    int err=ldap_extended_operation(m_connection->getSessionHandle(),
+            m_oid.c_str(), tmpdata, tmpSrvCtrls, tmpClCtrls, &msgID);
+    LDAPControlSet::freeLDAPControlArray(tmpSrvCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpClCtrls);
+    ber_bvfree(tmpdata);
     if(err != LDAP_SUCCESS){
         delete this;
         throw LDAPException(err);
@@ -52,9 +62,21 @@ LDAPMessageQueue* LDAPExtRequest::sendRequest(){
     }
 }
 
-LDAPRequest* LDAPExtRequest::followReferral(LDAPUrlList *urls){
+LDAPRequest* LDAPExtRequest::followReferral(LDAPMsg* ref){
     DEBUG(LDAP_DEBUG_TRACE, "LDAPExtRequest::followReferral()" << endl);
-    cerr << "to be implemented" << endl;
+    LDAPUrlList::const_iterator usedUrl;
+    LDAPUrlList urls = ((LDAPResult*)ref)->getReferralUrls();
+    LDAPAsynConnection* con = 0;
+    try {
+        con = getConnection()->referralConnect(urls,usedUrl,m_cons);
+    } catch(LDAPException e){
+        delete con;
+        return 0;
+    }
+    if(con != 0){
+        return new LDAPExtRequest(m_oid, m_data, con, m_cons,true,this);
+    }
     return 0;
 }
 
+