Added blockio library.

[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..680d088387907fede8851bde53e843642db9ef96 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -35,64 +35,27 @@
 #include <arpa/inet.h>
 #include <sys/socket.h> // socklen_t
 
 #include <arpa/inet.h>
 #include <sys/socket.h> // socklen_t
 

-#include "blowfish.h"
-#include "rad_packets.h"
+#include "stg/blowfish.h"
+#include "stg/rad_packets.h"
+
+typedef std::vector<std::pair<std::string, std::string> > PAIRS;

 
 class STG_CLIENT
 {
 public:
 
 class STG_CLIENT
 {
 public:

-    STG_CLIENT();
+    STG_CLIENT(const std::string & host, uint16_t port, const std::string & password);

     ~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);
-
-    int Start();
-    int Stop();
-
-    std::string GetUserPassword() const;
-
-    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);
+    static STG_CLIENT* get();
+    static void configure(const std::string& server, uint16_t port, const std::string& password);

 
 

-    uint32_t GetFramedIP() const;
-
-
-    const std::string & GetError() const { return errorStr; };
+    PAIRS authorize(const PAIRS& pairs);
+    PAIRS authenticate(const PAIRS& pairs);
+    PAIRS postAuth(const PAIRS& pairs);
+    PAIRS preAcct(const PAIRS& pairs);
+    PAIRS account(const PAIRS& pairs);

 
 private:
 
 private:

-    std::string host;
-    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;
-
-    BLOWFISH_CTX ctx;
-
-    int PrepareNet();
-    void FinalizeNet();
-
-    void InitEncrypt();
-    void Encrypt(char * dst, const char * src, int len8);
-    void Decrypt(char * dst, const char * src, int len8);
-
-    int Request(RAD_PACKET * packet, const std::string & login, const std::string & svc, uint8_t packetType);
-
-    int RecvData(RAD_PACKET * packet);
-    int Send(const RAD_PACKET & packet);
-

 };
 
 #endif
 };
 
 #endif