Handle EINTR in mod_radius correctly.

[stg.git] / projects / rlm_stg / stg_client.h

diff --git a/projects/rlm_stg/stg_client.h b/projects/rlm_stg/stg_client.h
index 5ee000c7e949b1e8735815c122db7d510036e10a..ee15774f1a8b720b7243aab7c8908cd73bac4da8 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -18,61 +18,68 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-/*
- *  Header file for client part of data access via Stargazer for RADIUS
- *
- *  $Revision: 1.4 $
- *  $Date: 2010/04/16 12:30:02 $
- *
- */
-

 #ifndef STG_CLIENT_H
 #define STG_CLIENT_H
 
 #ifndef STG_CLIENT_H
 #define STG_CLIENT_H
 

+#include "stg/os_int.h"
+
+#include <boost/scoped_ptr.hpp>
+

 #include <string>
 #include <string>

+#include <vector>
+#include <stdexcept>
+
+typedef std::vector<std::pair<std::string, std::string> > PAIRS;
+
+struct RESULT
+{
+    PAIRS modify;
+    PAIRS reply;
+};

 
 

-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h> // socklen_t
+struct ChannelConfig {
+    struct Error : std::runtime_error {
+        Error(const std::string& message) : runtime_error(message) {}
+    };

 
 

-#include "stg/blowfish.h"
-#include "stg/rad_packets.h"
+    ChannelConfig(std::string address);

 
 

-#include "stgpair.h"
+    std::string transport;
+    std::string key;
+    std::string address;
+    std::string portStr;
+    uint16_t port;
+};

 
 class STG_CLIENT
 {
 public:
 
 class STG_CLIENT
 {
 public:

-    STG_CLIENT(const std::string & host, uint16_t port, const std::string & password);
+    enum TYPE {
+        AUTHORIZE,
+        AUTHENTICATE,
+        POST_AUTH,
+        PRE_ACCT,
+        ACCOUNT
+    };
+    struct Error : std::runtime_error {
+        Error(const std::string& message) : runtime_error(message) {}
+    };
+
+    typedef bool (*Callback)(void* /*data*/, const RESULT& /*result*/, bool /*status*/);
+
+    STG_CLIENT(const std::string& address, Callback callback, void* data);

     ~STG_CLIENT();
 
     ~STG_CLIENT();
 

-    const STG_PAIR * Authorize(const std::string & login, const std::string & service);
-    const STG_PAIR * Authenticate(const std::string & login, const std::string & service);
-    const STG_PAIR * PostAuth(const std::string & login, const std::string & service);
-    const STG_PAIR * PreAcct(const std::string & login, const std::string & service);
-    const STG_PAIR * Account(const std::string & type, const std::string & login, const std::string & service, const std::string & sessionId);
-
-private:
-    std::string password;
+    bool stop();

 
 

-    int PrepareNet();
+    static STG_CLIENT* get();
+    static bool configure(const std::string& address, Callback callback, void* data);

 
 

-    int Request(RAD_PACKET * packet, const std::string & login, const std::string & svc, uint8_t packetType);
+    bool request(TYPE type, const std::string& userName, const std::string& password, const PAIRS& pairs);

 
 

-    int RecvData(RAD_PACKET * packet);
-    int Send(const RAD_PACKET & packet);
-};
-
-struct STG_CLIENT_ST
-{
-    public:
-        static void Configure(const std::string & host, uint16_t port, const std::string & password);
-        static STG_CLIENT * Get();
-
-    private:
-        static std::string m_host;
-        static uint16_t m_port;
-        static std::string m_password;
+private:
+    class Impl;
+    boost::scoped_ptr<Impl> m_impl;

 };
 
 #endif
 };
 
 #endif