Add tariff change policy description.

[stg.git] / projects / stargazer / plugins / authorization / inetaccess / inetaccess.cpp

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
index 8be662e913457bf32b982f8dd578b380aa960fb4..9d5d6e91a9a3a6a88bb0fb8056933596993e06c7 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
@@ -23,7 +23,7 @@
  $Date: 2010/03/25 15:18:48 $
  $Author: faust $
  */
  $Date: 2010/03/25 15:18:48 $
  $Author: faust $
  */

- 
+

 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif


@@ -480,7 +480,7 @@ while (ia->nonstop)
         {
         touchTime = stgTime;
         std::string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_r";
         {
         touchTime = stgTime;
         std::string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_r";

-        TouchFile(monFile.c_str());
+        TouchFile(monFile);

         }
     }
 
         }
     }
 


@@ -508,7 +508,7 @@ while (ia->nonstop)
     // TODO change counter to timer and MONITOR_TIME_DELAY_SEC
     if (++a % (50 * 60) == 0 && ia->stgSettings->GetMonitoring())
         {
     // TODO change counter to timer and MONITOR_TIME_DELAY_SEC
     if (++a % (50 * 60) == 0 && ia->stgSettings->GetMonitoring())
         {

-        TouchFile(monFile.c_str());
+        TouchFile(monFile);

         }
     }
 
         }
     }
 


@@ -524,6 +524,22 @@ if (ret)
 return ret;
 }
 //-----------------------------------------------------------------------------
 return ret;
 }
 //-----------------------------------------------------------------------------

+int AUTH_IA::Reload(const MODULE_SETTINGS & ms)
+{
+AUTH_IA_SETTINGS newIaSettings;
+if (newIaSettings.ParseSettings(ms))
+    {
+    printfd(__FILE__, "AUTH_IA::Reload() - Failed to reload InetAccess.\n");
+    logger("AUTH_IA: Cannot reload InetAccess. Errors found.");
+    return -1;
+    }
+
+printfd(__FILE__, "AUTH_IA::Reload() -  Reloaded InetAccess successfully.\n");
+logger("AUTH_IA: Reloaded InetAccess successfully.");
+iaSettings = newIaSettings;
+return 0;
+}
+//-----------------------------------------------------------------------------

 int AUTH_IA::PrepareNet()
 {
 struct sockaddr_in listenAddr;
 int AUTH_IA::PrepareNet()
 {
 struct sockaddr_in listenAddr;


@@ -690,7 +706,7 @@ while (it != ip2user.end())
         && (currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay())
         {
         if (iaSettings.LogProtocolErrors())
         && (currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay())
         {
         if (iaSettings.LogProtocolErrors())

-            logger("User '%s'. Protocol version: %d. Phase 2: connect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay());
+            logger("User '%s'. Protocol version: %d. Phase 2: connect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay().GetSec());

         it->second.phase.SetPhase1();
         printfd(__FILE__, "Phase changed from 2 to 1. Reason: timeout\n");
         ip2user.erase(it++);
         it->second.phase.SetPhase1();
         printfd(__FILE__, "Phase changed from 2 to 1. Reason: timeout\n");
         ip2user.erase(it++);


@@ -734,7 +750,7 @@ while (it != ip2user.end())
         if ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserTimeout())
             {
             if (iaSettings.LogProtocolErrors())
         if ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserTimeout())
             {
             if (iaSettings.LogProtocolErrors())

-                logger("User '%s'. Protocol version: %d. Phase 3: alive timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserTimeout());
+                logger("User '%s'. Protocol version: %d. Phase 3: alive timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserTimeout().GetSec());

             users->Unauthorize(it->second.user->GetLogin(), this);
             ip2user.erase(it++);
             continue;
             users->Unauthorize(it->second.user->GetLogin(), this);
             ip2user.erase(it++);
             continue;


@@ -745,7 +761,7 @@ while (it != ip2user.end())
         && ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay()))
         {
         if (iaSettings.LogProtocolErrors())
         && ((currTime - it->second.phase.GetTime()) > iaSettings.GetUserDelay()))
         {
         if (iaSettings.LogProtocolErrors())

-            logger("User '%s'. Protocol version: %d. Phase 4: disconnect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay());
+            logger("User '%s'. Protocol version: %d. Phase 4: disconnect request timeout (%f > %d).", it->second.login.c_str(), it->second.protoVer, (currTime - it->second.phase.GetTime()).AsDouble(), iaSettings.GetUserDelay().GetSec());

         it->second.phase.SetPhase3();
         printfd(__FILE__, "Phase changed from 4 to 3. Reason: timeout\n");
         }
         it->second.phase.SetPhase3();
         printfd(__FILE__, "Phase changed from 4 to 3. Reason: timeout\n");
         }


@@ -1187,7 +1203,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
         return -1;
         }
     }
         return -1;
         }
     }

-printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd);
+printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1);

 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)
 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)


@@ -1232,7 +1248,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
         return -1;
         }
     }
         return -1;
         }
     }

-printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd);
+printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1);

 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)
 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)


@@ -1395,8 +1411,10 @@ for (int j = 0; j < DIR_NUM; j++)
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck6.rnd = iaUser->rnd;
 
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck6.rnd = iaUser->rnd;
 

-connSynAck6.userTimeOut = iaSettings.GetUserTimeout();
-connSynAck6.aliveDelay = iaSettings.GetUserDelay();
+printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd);
+
+connSynAck6.userTimeOut = iaSettings.GetUserTimeout().GetSec();
+connSynAck6.aliveDelay = iaSettings.GetUserDelay().GetSec();

 
 #ifdef ARCH_BE
 SwapBytes(connSynAck6.len);
 
 #ifdef ARCH_BE
 SwapBytes(connSynAck6.len);


@@ -1437,8 +1455,10 @@ for (int j = 0; j < DIR_NUM; j++)
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck8.rnd = iaUser->rnd;
 
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck8.rnd = iaUser->rnd;
 

-connSynAck8.userTimeOut = iaSettings.GetUserTimeout();
-connSynAck8.aliveDelay = iaSettings.GetUserDelay();
+printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd);
+
+connSynAck8.userTimeOut = iaSettings.GetUserTimeout().GetSec();
+connSynAck8.aliveDelay = iaSettings.GetUserDelay().GetSec();

 
 #ifdef ARCH_BE
 SwapBytes(connSynAck8.len);
 
 #ifdef ARCH_BE
 SwapBytes(connSynAck8.len);