Fixed deps between conn and proto.

[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 60ed6af899ac4bd780edb29f1f236dfe3e30b73c..d57af7dacfc7c2201d0404750e0d31d89d213a8c 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -18,81 +18,74 @@
  *    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 <string>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h> // socklen_t
-
-#include "blowfish.h"
-#include "rad_packets.h"
-
-class STG_CLIENT
-{
-public:
-    STG_CLIENT();
-    ~STG_CLIENT();
-
-    void SetServer(const std::string & host);
-    void SetPort(uint16_t port);
-    void SetLocalPort(uint16_t port);
-    void SetPassword(const std::string & password);
+#include "stg/sgcp_proto.h" // Proto
+#include "stg/sgcp_types.h" // TransportType
+#include "stg/os_int.h"

 
 

-    int Start();
-    int Stop();
+#include <boost/thread.hpp>

 
 

-    std::string GetUserPassword() const;
+#include <string>
+#include <vector>
+#include <utility>

 
 

-    int Authorize(const std::string & login, const std::string & svc);
-    int Authenticate(const std::string & login, const std::string & svc);
-    int PostAuthenticate(const std::string & login, const std::string & svc);
-    int Account(const std::string & type, const std::string & login, const std::string & svc, const std::string & sessid);
+typedef std::vector<std::pair<std::string, std::string> > PAIRS;

 
 

-    uint32_t GetFramedIP() const;
+struct RESULT
+{
+    PAIRS modify;
+    PAIRS reply;
+};

 
 

+struct ChannelConfig {
+    struct Error : std::runtime_error {
+        Error(const std::string& message) : runtime_error(message) {}
+    };

 
 

-    const std::string & GetError() const { return errorStr; };
+    ChannelConfig(std::string address);

 
 

-private:
-    std::string host;
+    STG::SGCP::TransportType transport;
+    std::string key;
+    std::string address;

     uint16_t port;
     uint16_t port;

-    uint16_t localPort;
-    std::string password;
-    int sock;
-    std::string errorStr;
-
-    struct sockaddr_in outerAddr;
-    socklen_t outerAddrLen;
-
-    std::string userPassword;
+};

 
 

-    uint32_t framedIP;
+class STG_CLIENT
+{
+public:
+    enum TYPE {
+        AUTHORIZE,
+        AUTHENTICATE,
+        POST_AUTH,
+        PRE_ACCT,
+        ACCOUNT
+    };
+    struct Error : std::runtime_error {
+        Error(const std::string& message) : runtime_error(message) {}
+    };
+
+    STG_CLIENT(const std::string& address);
+    ~STG_CLIENT();

 
 

-    BLOWFISH_CTX ctx;
+    bool stop();

 
 

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

 
 

-    void InitEncrypt();
-    void Encrypt(char * dst, const char * src, int len8);
-    void Decrypt(char * dst, const char * src, int len8);
+    RESULT request(TYPE type, const std::string& userName, const std::string& password, const PAIRS& pairs);

 
 

-    int Request(RAD_PACKET * packet, const std::string & login, const std::string & svc, uint8_t packetType);
+private:
+    ChannelConfig m_config;
+    STG::SGCP::Proto m_proto;
+    boost::thread m_thread;

 
 

-    int RecvData(RAD_PACKET * packet);
-    int Send(const RAD_PACKET & packet);
+    void m_writeHeader(TYPE type, const std::string& userName, const std::string& password);
+    void m_writePairBlock(const PAIRS& source);
+    PAIRS m_readPairBlock();

 
 

+    void m_run();

 };
 
 #endif
 };
 
 #endif