Рефакторинг класса STG_CLIENT плагина rlm_stg

diff --git a/projects/rlm_stg/stg_client.cpp b/projects/rlm_stg/stg_client.cpp
index 7be0a55e159ebd1c53da2f9f03d3ff63816899ce..75d443adfee748a58a4279b78f885308807af6cb 100644 (file)
--- a/projects/rlm_stg/stg_client.cpp
+++ b/projects/rlm_stg/stg_client.cpp
@@ -29,8 +29,12 @@
 #include <netdb.h>
 #include <sys/types.h>
 #include <unistd.h> // close
 #include <netdb.h>
 #include <sys/types.h>
 #include <unistd.h> // close

+
+#include <cerrno>

 #include <cstring>
 
 #include <cstring>
 

+#include <stdexcept>
+

 #include "stg_client.h"
 
 using namespace std;
 #include "stg_client.h"
 
 using namespace std;


@@ -38,35 +42,36 @@ using namespace std;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-STG_CLIENT::STG_CLIENT()
-    : port(0),
-      localPort(0),
-      sock(0)
+STG_CLIENT::STG_CLIENT(const std::string & host, uint16_t port, uint16_t lp, const std::string & pass)
+    : localPort(lp),
+      password(pass),
+      framedIP(0)

 {
 {

+sock = socket(AF_INET, SOCK_DGRAM, 0);
+if (sock == -1)
+    {
+    std::string message = strerror(errno);
+    message = "Socket create error: '" + message + "'";
+    throw std::runtime_error(message);
+    }
+
+struct hostent * he = NULL;
+he = gethostbyname(host.c_str());
+if (he == NULL)
+    {
+    throw std::runtime_error("gethostbyname error");
+    }
+
+outerAddr.sin_family = AF_INET;
+outerAddr.sin_port = htons(port);
+outerAddr.sin_addr.s_addr = *(uint32_t *)he->h_addr;
+
+InitEncrypt();

 }
 //-----------------------------------------------------------------------------
 STG_CLIENT::~STG_CLIENT()
 {
 }
 //-----------------------------------------------------------------------------
 STG_CLIENT::~STG_CLIENT()
 {

-}
-//-----------------------------------------------------------------------------
-void STG_CLIENT::SetServer(const string & host)
-{
-STG_CLIENT::host = host;
-}
-//-----------------------------------------------------------------------------
-void STG_CLIENT::SetPort(uint16_t port)
-{
-STG_CLIENT::port = port;
-}
-//-----------------------------------------------------------------------------
-void STG_CLIENT::SetLocalPort(uint16_t port)
-{
-STG_CLIENT::localPort = port;
-}
-//-----------------------------------------------------------------------------
-void STG_CLIENT::SetPassword(const string & password)
-{
-STG_CLIENT::password = password;
+close(sock);

 }
 //-----------------------------------------------------------------------------
 uint32_t STG_CLIENT::GetFramedIP() const
 }
 //-----------------------------------------------------------------------------
 uint32_t STG_CLIENT::GetFramedIP() const


@@ -74,6 +79,7 @@ uint32_t STG_CLIENT::GetFramedIP() const
 return framedIP;
 }
 //-----------------------------------------------------------------------------
 return framedIP;
 }
 //-----------------------------------------------------------------------------

+inline

 void STG_CLIENT::InitEncrypt()
 {
 unsigned char keyL[RAD_PASSWORD_LEN];
 void STG_CLIENT::InitEncrypt()
 {
 unsigned char keyL[RAD_PASSWORD_LEN];


@@ -84,21 +90,6 @@ Blowfish_Init(&ctx, keyL, RAD_PASSWORD_LEN);
 //-----------------------------------------------------------------------------
 int STG_CLIENT::PrepareNet()
 {
 //-----------------------------------------------------------------------------
 int STG_CLIENT::PrepareNet()
 {

-sock = socket(AF_INET, SOCK_DGRAM, 0);
-if (sock == -1)
-    {
-    errorStr = "Socket create error";
-    return -1;
-    }
-
-struct hostent * he = NULL;
-he = gethostbyname(host.c_str());
-if (he == NULL)
-    {
-    errorStr = "gethostbyname error";
-    return -1;
-    }
-

 if (localPort != 0)
     {
     struct sockaddr_in localAddr;
 if (localPort != 0)
     {
     struct sockaddr_in localAddr;


@@ -112,32 +103,16 @@ if (localPort != 0)
         return -1;
         }
     }
         return -1;
         }
     }

-
-outerAddr.sin_family = AF_INET;
-outerAddr.sin_port = htons(port);
-outerAddr.sin_addr.s_addr = *(uint32_t *)he->h_addr;
-
-outerAddrLen = sizeof(struct sockaddr_in);
-

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void STG_CLIENT::FinalizeNet()
-{
-close(sock);
-}
-//-----------------------------------------------------------------------------

 int STG_CLIENT::Start()
 {
 int STG_CLIENT::Start()
 {

-InitEncrypt();
-

 return PrepareNet();
 }
 //-----------------------------------------------------------------------------
 int STG_CLIENT::Stop()
 {
 return PrepareNet();
 }
 //-----------------------------------------------------------------------------
 int STG_CLIENT::Stop()
 {

-FinalizeNet();
-

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -152,7 +127,7 @@ char buf[RAD_MAX_PACKET_LEN];
     
 Encrypt(buf, (char *)&packet, sizeof(RAD_PACKET) / 8);
 
     
 Encrypt(buf, (char *)&packet, sizeof(RAD_PACKET) / 8);
 

-int res = sendto(sock, buf, sizeof(RAD_PACKET), 0, (struct sockaddr *)&outerAddr, outerAddrLen);
+int res = sendto(sock, buf, sizeof(RAD_PACKET), 0, (struct sockaddr *)&outerAddr, sizeof(outerAddr));

 
 if (res == -1)
     errorStr = "Error sending data";
 
 if (res == -1)
     errorStr = "Error sending data";


@@ -165,9 +140,10 @@ int STG_CLIENT::RecvData(RAD_PACKET * packet)
 char buf[RAD_MAX_PACKET_LEN];
 int res;
 
 char buf[RAD_MAX_PACKET_LEN];
 int res;
 

-outerAddrLen = sizeof(struct sockaddr_in);
+struct sockaddr_in addr;
+socklen_t len = sizeof(struct sockaddr_in);

 
 

-res = recvfrom(sock, buf, RAD_MAX_PACKET_LEN, 0, (struct sockaddr *)&outerAddr, &outerAddrLen);
+res = recvfrom(sock, buf, RAD_MAX_PACKET_LEN, 0, reinterpret_cast<struct sockaddr *>(&addr), &len);

 if (res == -1)
     {
     errorStr = "Error receiving data";
 if (res == -1)
     {
     errorStr = "Error receiving data";


@@ -307,7 +283,7 @@ if (dst != src)
 for (int i = 0; i < len8; i++)
     Blowfish_Encrypt(&ctx, (uint32_t *)(dst + i*8), (uint32_t *)(dst + i*8 + 4));
 }
 for (int i = 0; i < len8; i++)
     Blowfish_Encrypt(&ctx, (uint32_t *)(dst + i*8), (uint32_t *)(dst + i*8 + 4));
 }

-//-----------------------------------------------------------------------------          
+//-----------------------------------------------------------------------------

 void STG_CLIENT::Decrypt(char * dst, const char * src, int len8)
 {
 // len8 - длина в 8-ми байтовых блоках
 void STG_CLIENT::Decrypt(char * dst, const char * src, int len8)
 {
 // len8 - длина в 8-ми байтовых блоках

diff --git a/projects/rlm_stg/stg_client.h b/projects/rlm_stg/stg_client.h
index 60ed6af899ac4bd780edb29f1f236dfe3e30b73c..253b262f8afc72f4360b863e450dc4d9c0afbc63 100644 (file)
--- a/projects/rlm_stg/stg_client.h
+++ b/projects/rlm_stg/stg_client.h
@@ -41,14 +41,9 @@
 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();
 
     int Start();
     int Stop();
 


@@ -61,19 +56,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,7 +73,6 @@ 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 InitEncrypt();
     void Encrypt(char * dst, const char * src, int len8);


@@ -92,7 +82,6 @@ private:
 
     int RecvData(RAD_PACKET * packet);
     int Send(const RAD_PACKET & packet);
 
     int RecvData(RAD_PACKET * packet);
     int Send(const RAD_PACKET & packet);

-

 };
 
 #endif
 };
 
 #endif