Full and correct rollback in SMUX::Stop method

[stg.git] / projects / stargazer / plugins / other / radius / radius.cpp

diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp
index afcc46fd65d446265436146d47211e8a2f098f26..efa995704ad0baad95a33c7f2523767730d9dc50 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -34,6 +34,7 @@
 #include "stg/common.h"
 #include "stg/user_conf.h"
 #include "stg/user_property.h"
 #include "stg/common.h"
 #include "stg/user_conf.h"
 #include "stg/user_property.h"

+#include "stg/plugin_creator.h"

 #include "radius.h"
 
 extern volatile const time_t stgTime;
 #include "radius.h"
 
 extern volatile const time_t stgTime;


@@ -45,29 +46,7 @@ void Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class RAD_CREATOR {
-private:
-    RADIUS * rad;
-
-public:
-    RAD_CREATOR()
-        : rad(new RADIUS())
-        {
-        }
-    ~RAD_CREATOR()
-        {
-        delete rad;
-        }
-
-    RADIUS * GetPlugin()
-        {
-        return rad;
-        }
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-RAD_CREATOR radc;
+PLUGIN_CREATOR<RADIUS> radc;

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -276,7 +255,7 @@ for (it = sessions.begin(); it != sessions.end(); ++it)
     USER_PTR ui;
     if (users->FindByName(it->second.userName, &ui))
         {
     USER_PTR ui;
     if (users->FindByName(it->second.userName, &ui))
         {

-        ui->Unauthorize(this);
+        users->Unauthorize(ui->GetLogin(), this);

         }
     }
 sessions.erase(sessions.begin(), sessions.end());
         }
     }
 sessions.erase(sessions.begin(), sessions.end());


@@ -316,7 +295,7 @@ rad->isRunning = true;
 
 while (rad->nonstop)
     {
 
 while (rad->nonstop)
     {

-    if (!rad->WaitPackets(rad->sock))
+    if (!WaitPackets(rad->sock))

         {
         continue;
         }
         {
         continue;
         }


@@ -519,7 +498,7 @@ if (CanAcctService((char *)packet->service))
         return -1;
         }
     USER_IPS ips = ui->GetProperty().ips;
         return -1;
         }
     USER_IPS ips = ui->GetProperty().ips;

-    if (ui->Authorize(ips[0].ip, 0xffFFffFF, this))
+    if (users->Authorize(ui->GetLogin(), ips[0].ip, 0xffFFffFF, this))

         {
         printfd(__FILE__, "RADIUS::ProcessAcctStartPacket cannot authorize user '%s'\n", packet->login);
         packet->packetType = RAD_REJECT_PACKET;
         {
         printfd(__FILE__, "RADIUS::ProcessAcctStartPacket cannot authorize user '%s'\n", packet->login);
         packet->packetType = RAD_REJECT_PACKET;


@@ -560,7 +539,7 @@ if (!FindUser(&ui, sid->second.userName))
 
 sessions.erase(sid);
 
 
 sessions.erase(sid);
 

-ui->Unauthorize(this);
+users->Unauthorize(ui->GetLogin(), this);

 
 packet->packetType = RAD_ACCEPT_PACKET;
 return 0;
 
 packet->packetType = RAD_ACCEPT_PACKET;
 return 0;


@@ -609,34 +588,6 @@ bool RADIUS::IsAllowedService(const std::string & svc) const
 return CanAuthService(svc) || CanAcctService(svc);
 }
 //-----------------------------------------------------------------------------
 return CanAuthService(svc) || CanAcctService(svc);
 }
 //-----------------------------------------------------------------------------

-bool RADIUS::WaitPackets(int sd) const
-{
-fd_set rfds;
-FD_ZERO(&rfds);
-FD_SET(sd, &rfds);
-
-struct timeval tv;
-tv.tv_sec = 0;
-tv.tv_usec = 500000;
-
-int res = select(sd + 1, &rfds, NULL, NULL, &tv);
-if (res == -1) // Error
-    {
-    if (errno != EINTR)
-        {
-        printfd(__FILE__, "Error on select: '%s'\n", strerror(errno));
-        }
-    return false;
-    }
-
-if (res == 0) // Timeout
-    {
-    return false;
-    }
-
-return true;
-}
-//-----------------------------------------------------------------------------

 inline
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password)
 {
 inline
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password)
 {