X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/65a51d11c64daa4df3d4388df60bb4efc3e67e14..fad2dd8911abd78eaf95005e68c32796650a091a:/projects/rlm_stg/iface.cpp?ds=sidebyside

diff --git a/projects/rlm_stg/iface.cpp b/projects/rlm_stg/iface.cpp
index 485e9ef7..2f8f3e37 100644
--- a/projects/rlm_stg/iface.cpp
+++ b/projects/rlm_stg/iface.cpp
@@ -1,11 +1,21 @@
 #include "iface.h"
 
 #include "stg_client.h"
+#include "types.h"
+#include "radlog.h"
 
+#include <stdexcept>
 #include <cstring>
 
 #include <strings.h>
 
+namespace RLM = STG::RLM;
+
+using RLM::Client;
+using RLM::PAIRS;
+using RLM::RESULT;
+using RLM::REQUEST_TYPE;
+
 namespace
 {
 
@@ -13,14 +23,13 @@ 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[pos].key, sizeof(pairs[pos].key));
+        bzero(pairs[pos].value, sizeof(pairs[pos].value));
+        strncpy(pairs[pos].key, source[pos].first.c_str(), sizeof(pairs[pos].key));
+        strncpy(pairs[pos].value, source[pos].second.c_str(), sizeof(pairs[pos].value));
     }
-    bzero(pairs[source.size()].key, sizeof(STG_PAIR::key));
-    bzero(pairs[source.size()].value, sizeof(STG_PAIR::value));
+    bzero(pairs[source.size()].key, sizeof(pairs[source.size()].key));
+    bzero(pairs[source.size()].value, sizeof(pairs[source.size()].value));
 
     return pairs;
 }
@@ -60,17 +69,17 @@ std::string toString(const char* value)
         return value;
 }
 
-STG_RESULT stgRequest(STG_CLIENT::TYPE type, const char* userName, const char* password, const STG_PAIR* pairs)
+STG_RESULT stgRequest(REQUEST_TYPE type, const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    STG_CLIENT* client = STG_CLIENT::get();
+    Client* client = Client::get();
     if (client == NULL) {
-        // TODO: log "Not configured"
+        RadLog("Client is 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
+    } catch (const std::runtime_error& ex) {
+        RadLog("Error: '%s'.", ex.what());
         return emptyResult();
     }
 }
@@ -79,7 +88,7 @@ STG_RESULT stgRequest(STG_CLIENT::TYPE type, const char* userName, const char* p
 
 int stgInstantiateImpl(const char* address)
 {
-    if (STG_CLIENT::configure(toString(address)))
+    if (Client::configure(toString(address)))
         return 1;
 
     return 0;
@@ -87,25 +96,25 @@ int stgInstantiateImpl(const char* address)
 
 STG_RESULT stgAuthorizeImpl(const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    return stgRequest(STG_CLIENT::AUTHORIZE, userName, password, pairs);
+    return stgRequest(RLM::AUTHORIZE, userName, password, pairs);
 }
 
 STG_RESULT stgAuthenticateImpl(const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    return stgRequest(STG_CLIENT::AUTHENTICATE, userName, password, pairs);
+    return stgRequest(RLM::AUTHENTICATE, userName, password, pairs);
 }
 
 STG_RESULT stgPostAuthImpl(const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    return stgRequest(STG_CLIENT::POST_AUTH, userName, password, pairs);
+    return stgRequest(RLM::POST_AUTH, userName, password, pairs);
 }
 
 STG_RESULT stgPreAcctImpl(const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    return stgRequest(STG_CLIENT::PRE_ACCT, userName, password, pairs);
+    return stgRequest(RLM::PRE_ACCT, userName, password, pairs);
 }
 
 STG_RESULT stgAccountingImpl(const char* userName, const char* password, const STG_PAIR* pairs)
 {
-    return stgRequest(STG_CLIENT::ACCOUNT, userName, password, pairs);
+    return stgRequest(RLM::ACCOUNT, userName, password, pairs);
 }