Make fee charging rules inclusive (2 includes 0 and 3 includes fee)

[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..f87f816fbf1e6cc33665c07358455f1ab67149ee 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -35,23 +35,15 @@
 #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"

 
 class STG_CLIENT
 {
 public:
 
 class STG_CLIENT
 {
 public:

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

     ~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);
     std::string GetUserPassword() const;
 
     int Authorize(const std::string & login, const std::string & svc);


@@ -61,19 +53,15 @@ public:
 
     uint32_t GetFramedIP() const;
 
 
     uint32_t GetFramedIP() const;
 

-

     const std::string & GetError() const { return errorStr; };
 
 private:
     const std::string & GetError() const { return errorStr; };
 
 private:

-    std::string host;
-    uint16_t port;

     uint16_t localPort;
     std::string password;
     int sock;
     std::string errorStr;
 
     struct sockaddr_in outerAddr;
     uint16_t localPort;
     std::string password;
     int sock;
     std::string errorStr;
 
     struct sockaddr_in outerAddr;

-    socklen_t outerAddrLen;

 
     std::string userPassword;
 
 
     std::string userPassword;
 


@@ -82,17 +70,11 @@ private:
     BLOWFISH_CTX ctx;
 
     int PrepareNet();
     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);
 
     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