Fixed deps between conn and proto.

[stg.git] / projects / rlm_stg / iface.cpp

diff --git a/projects/rlm_stg/iface.cpp b/projects/rlm_stg/iface.cpp
index 9d6a78333c0ffcfee64ab8535e1b81d1ffc9aab1..485e9ef7439d9b3d1d5854e0a38429b8c6df472c 100644 (file)
--- a/projects/rlm_stg/iface.cpp
+++ b/projects/rlm_stg/iface.cpp
@@ -1,43 +1,111 @@
 #include "iface.h"
 
 #include "iface.h"
 

-#include "loki/Singleton.h"
+#include "stg_client.h"

 
 

-#include "thriftclient.h"
+#include <cstring>

 
 

-int stgInstantiateImpl(const char * server, uint16_t port, const char * password)
+#include <strings.h>
+
+namespace

 {
 {

-    if (STG_CLIENT_ST::Get().Configure(server, port, password))
-        return 1;

 
 

-    return 0;
+STG_PAIR* toSTGPairs(const PAIRS& source)
+{
+    STG_PAIR * pairs = new STG_PAIR[source.size() + 1];
+    for (size_t pos = 0; pos < source.size(); ++pos) {
+        bzero(pairs[pos].key, sizeof(STG_PAIR::key));
+        bzero(pairs[pos].value, sizeof(STG_PAIR::value));
+        strncpy(pairs[pos].key, source[pos].first.c_str(), sizeof(STG_PAIR::key));
+        strncpy(pairs[pos].value, source[pos].second.c_str(), sizeof(STG_PAIR::value));
+        ++pos;
+    }
+    bzero(pairs[source.size()].key, sizeof(STG_PAIR::key));
+    bzero(pairs[source.size()].value, sizeof(STG_PAIR::value));
+
+    return pairs;
+}
+
+PAIRS fromSTGPairs(const STG_PAIR* pairs)
+{
+    const STG_PAIR* pair = pairs;
+    PAIRS res;
+
+    while (!emptyPair(pair)) {
+        res.push_back(std::pair<std::string, std::string>(pair->key, pair->value));
+        ++pair;
+    }
+
+    return res;

 }
 
 }
 

-const STG_PAIR * stgAuthorizeImpl(const char * userName, const char * serviceType)
+STG_RESULT toResult(const RESULT& source)

 {
 {

-    return STG_CLIENT_ST::Get().Authorize(userName, serviceType);
+    STG_RESULT result;
+    result.modify = toSTGPairs(source.modify);
+    result.reply = toSTGPairs(source.reply);
+    return result;
+}
+
+STG_RESULT emptyResult()
+{
+    STG_RESULT result = {NULL, NULL};
+    return result;
+}
+
+std::string toString(const char* value)
+{
+    if (value == NULL)
+        return "";
+    else
+        return value;
+}
+
+STG_RESULT stgRequest(STG_CLIENT::TYPE type, const char* userName, const char* password, const STG_PAIR* pairs)
+{
+    STG_CLIENT* client = STG_CLIENT::get();
+    if (client == NULL) {
+        // TODO: log "Not configured"
+        return emptyResult();
+    }
+    try {
+        return toResult(client->request(type, toString(userName), toString(password), fromSTGPairs(pairs)));
+    } catch (const STG_CLIENT::Error& ex) {
+        // TODO: log error
+        return emptyResult();
+    }
+}
+
+}
+
+int stgInstantiateImpl(const char* address)
+{
+    if (STG_CLIENT::configure(toString(address)))
+        return 1;
+
+    return 0;

 }
 
 }
 

-const STG_PAIR * stgAuthenticateImpl(const char * userName, const char * serviceType)
+STG_RESULT stgAuthorizeImpl(const char* userName, const char* password, const STG_PAIR* pairs)

 {
 {

-    return STG_CLIENT_ST::Get().Authenticate(userName, serviceType);
+    return stgRequest(STG_CLIENT::AUTHORIZE, userName, password, pairs);

 }
 
 }
 

-const STG_PAIR * stgPostAuthImpl(const char * userName, const char * serviceType)
+STG_RESULT stgAuthenticateImpl(const char* userName, const char* password, const STG_PAIR* pairs)

 {
 {

-    return STG_CLIENT_ST::Get().PostAuth(userName, serviceType);
+    return stgRequest(STG_CLIENT::AUTHENTICATE, userName, password, pairs);

 }
 
 }
 

-const STG_PAIR * stgPreAcctImpl(const char * userName, const char * serviceType)
+STG_RESULT stgPostAuthImpl(const char* userName, const char* password, const STG_PAIR* pairs)

 {
 {

-    return STG_CLIENT_ST::Get().PreAcct(userName, serviceType);
+    return stgRequest(STG_CLIENT::POST_AUTH, userName, password, pairs);

 }
 
 }
 

-const STG_PAIR * stgAccountingImpl(const char * userName, const char * serviceType, const char * statusType, const char * sessionId)
+STG_RESULT stgPreAcctImpl(const char* userName, const char* password, const STG_PAIR* pairs)

 {
 {

-    return STG_CLIENT_ST::Get().Account(userName, serviceType, statusType, sessionId);
+    return stgRequest(STG_CLIENT::PRE_ACCT, userName, password, pairs);

 }
 
 }
 

-void deletePairs(const STG_PAIR * pairs)
+STG_RESULT stgAccountingImpl(const char* userName, const char* password, const STG_PAIR* pairs)

 {
 {

-    delete[] pairs;
+    return stgRequest(STG_CLIENT::ACCOUNT, userName, password, pairs);

 }
 }