Merge branch 'stg-2.409' into stg-2.409-radius

[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..917d0e511fa18c68bef09587725a765dff3ab191 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -18,61 +18,41 @@
  *    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_RLM_CLIENT_H__
+#define __STG_RLM_CLIENT_H__

 
 

-#ifndef STG_CLIENT_H
-#define STG_CLIENT_H
+#include "types.h"

 
 

-#include <string>
+#include "stg/os_int.h"

 
 

-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h> // socklen_t
+#include <boost/scoped_ptr.hpp>

 
 

-#include "stg/blowfish.h"
-#include "stg/rad_packets.h"
+#include <string>

 
 

-#include "stgpair.h"
+namespace STG
+{
+namespace RLM
+{

 
 

-class STG_CLIENT
+class Client

 {
 public:
 {
 public:

-    STG_CLIENT(const std::string & host, uint16_t port, const std::string & password);
-    ~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);
+    explicit Client(const std::string& address);
+    ~Client();

 
 

-private:
-    std::string password;
+    bool stop();

 
 

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

 
 

-    int Request(RAD_PACKET * packet, const std::string & login, const std::string & svc, uint8_t packetType);
+    RESULT request(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);
+private:
+    class Impl;
+    boost::scoped_ptr<Impl> m_impl;

 };
 
 };
 

-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;
-};
+} // namespace RLM
+} // namespace STG

 
 #endif
 
 #endif