Minor ChangeLog fix

[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 a6540d6f0409e66644d8a5755c351a67f1d9427e..a6d2073abe709b4457f186f0e6bf4d2b3d58d25a 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

-#include <unistd.h> // usleep, close
+#include <unistd.h> // close

 
 #include <csignal>
 #include <cstdlib>
 
 #include <csignal>
 #include <cstdlib>


@@ -70,6 +70,7 @@ AUTH_IA_SETTINGS::AUTH_IA_SETTINGS()
     : userDelay(0),
       userTimeout(0),
       port(0),
     : userDelay(0),
       userTimeout(0),
       port(0),

+      errorStr(),

       freeMbShowType(freeMbCash)
 {
 }
       freeMbShowType(freeMbCash)
 {
 }


@@ -173,13 +174,15 @@ return 0;
 #ifdef IA_PHASE_DEBUG
 IA_PHASE::IA_PHASE()
     : phase(1),
 #ifdef IA_PHASE_DEBUG
 IA_PHASE::IA_PHASE()
     : phase(1),

+      phaseTime(),

       flog(NULL)
 {
 gettimeofday(&phaseTime, NULL);
 }
 #else
 IA_PHASE::IA_PHASE()
       flog(NULL)
 {
 gettimeofday(&phaseTime, NULL);
 }
 #else
 IA_PHASE::IA_PHASE()

-    : phase(1)
+    : phase(1),
+      phaseTime()

 {
 gettimeofday(&phaseTime, NULL);
 }
 {
 gettimeofday(&phaseTime, NULL);
 }


@@ -295,12 +298,29 @@ return phaseTime;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 AUTH_IA::AUTH_IA()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 AUTH_IA::AUTH_IA()

-    : nonstop(false),
+    : ctxS(),
+      errorStr(),
+      iaSettings(),
+      settings(),
+      nonstop(false),

       isRunningRun(false),
       isRunningRunTimeouter(false),
       users(NULL),
       stgSettings(NULL),
       isRunningRun(false),
       isRunningRunTimeouter(false),
       users(NULL),
       stgSettings(NULL),

+      ip2user(),
+      recvThread(),
+      timeouterThread(),
+      mutex(),

       listenSocket(-1),
       listenSocket(-1),

+      connSynAck6(),
+      connSynAck8(),
+      disconnSynAck6(),
+      disconnSynAck8(),
+      aliveSyn6(),
+      aliveSyn8(),
+      fin6(),
+      fin8(),
+      packetTypes(),

       WriteServLog(GetStgLogger()),
       enabledDirs(0xFFffFFff),
       onDelUserNotifier(*this)
       WriteServLog(GetStgLogger()),
       enabledDirs(0xFFffFFff),
       onDelUserNotifier(*this)


@@ -408,29 +428,8 @@ if (isRunningRun)
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunningRun; i++)
         {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunningRun; i++)
         {

-        usleep(200000);
-        }
-
-    //after 5 seconds waiting thread still running. now killing it
-    if (isRunningRun)
-        {
-        if (pthread_kill(recvThread, SIGINT))
-            {
-            errorStr = "Cannot kill thread.";
-            printfd(__FILE__, "Cannot kill thread\n");
-            return -1;
-            }
-        for (int i = 0; i < 25 && isRunningRun; ++i)
-            usleep(200000);
-        if (isRunningRun)
-            {
-            printfd(__FILE__, "Failed to stop recv thread\n");
-            }
-        else
-            {
-            pthread_join(recvThread, NULL);
-            }
-        printfd(__FILE__, "AUTH_IA killed Run\n");
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
     }
 
         }
     }
 


@@ -441,37 +440,26 @@ if (isRunningRunTimeouter)
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunningRunTimeouter; i++)
         {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && isRunningRunTimeouter; i++)
         {

-        usleep(200000);
-        }
-
-    //after 5 seconds waiting thread still running. now killing it
-    if (isRunningRunTimeouter)
-        {
-        if (pthread_kill(timeouterThread, SIGINT))
-            {
-            errorStr = "Cannot kill thread.";
-            return -1;
-            }
-        for (int i = 0; i < 25 && isRunningRunTimeouter; ++i)
-            usleep(200000);
-        if (isRunningRunTimeouter)
-            {
-            printfd(__FILE__, "Failed to stop timeouter thread\n");
-            }
-        else
-            {
-            pthread_join(timeouterThread, NULL);
-            }
-        printfd(__FILE__, "AUTH_IA killed Timeouter\n");
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
     }
         }
     }

-printfd(__FILE__, "AUTH_IA::Stoped successfully.\n");
+

 users->DelNotifierUserDel(&onDelUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);

+
+if (isRunningRun || isRunningRunTimeouter)
+    return -1;
+
+printfd(__FILE__, "AUTH_IA::Stoped successfully.\n");

 return 0;
 }
 //-----------------------------------------------------------------------------
 void * AUTH_IA::Run(void * d)
 {
 return 0;
 }
 //-----------------------------------------------------------------------------
 void * AUTH_IA::Run(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 AUTH_IA * ia = static_cast<AUTH_IA *>(d);
 
 ia->isRunningRun = true;
 AUTH_IA * ia = static_cast<AUTH_IA *>(d);
 
 ia->isRunningRun = true;


@@ -497,6 +485,10 @@ return NULL;
 //-----------------------------------------------------------------------------
 void * AUTH_IA::RunTimeouter(void * d)
 {
 //-----------------------------------------------------------------------------
 void * AUTH_IA::RunTimeouter(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 AUTH_IA * ia = static_cast<AUTH_IA *>(d);
 
 ia->isRunningRunTimeouter = true;
 AUTH_IA * ia = static_cast<AUTH_IA *>(d);
 
 ia->isRunningRunTimeouter = true;


@@ -505,7 +497,8 @@ int a = -1;
 string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_t";
 while (ia->nonstop)
     {
 string monFile = ia->stgSettings->GetMonitorDir() + "/inetaccess_t";
 while (ia->nonstop)
     {

-    usleep(20000);
+    struct timespec ts = {0, 20000000};
+    nanosleep(&ts, NULL);

     ia->Timeouter();
     // TODO change counter to timer and MONITOR_TIME_DELAY_SEC
     if (++a % (50 * 60) == 0 && ia->stgSettings->GetMonitoring())
     ia->Timeouter();
     // TODO change counter to timer and MONITOR_TIME_DELAY_SEC
     if (++a % (50 * 60) == 0 && ia->stgSettings->GetMonitoring())


@@ -599,13 +592,14 @@ uint32_t sip = outerAddr.sin_addr.s_addr;
 uint16_t sport = htons(outerAddr.sin_port);
 
 USER_PTR user;
 uint16_t sport = htons(outerAddr.sin_port);
 
 USER_PTR user;

-if (users->FindByName(login, &user) == 0)
+if (users->FindByName(login, &user))

     {
     WriteServLog("User's connect failed: user '%s' not found. IP %s",
                  login,
                  inet_ntostring(sip).c_str());
     {
     WriteServLog("User's connect failed: user '%s' not found. IP %s",
                  login,
                  inet_ntostring(sip).c_str());

-    printfd(__FILE__, "User %s NOT found!\n", login);
+    printfd(__FILE__, "User '%s' NOT found!\n", login);

     SendError(sip, sport, protoVer, "îÅÐÒÁ×ÉÌØÎÙÊ ÌÏÇÉÎ!");
     SendError(sip, sport, protoVer, "îÅÐÒÁ×ÉÌØÎÙÊ ÌÏÇÉÎ!");

+    return -1;

     }
 
 printfd(__FILE__, "User '%s' FOUND!\n", user->GetLogin().c_str());
     }
 
 printfd(__FILE__, "User '%s' FOUND!\n", user->GetLogin().c_str());


@@ -772,25 +766,16 @@ if (it == ip2user.end())
             return 0;
             }
         }
             return 0;
             }
         }

-    // åÝÅ ÎÅ ÂÙÌÏ ÚÁÐÒÏÓÏ× Ó ÜÔÏÇÏ IP
+

     printfd(__FILE__, "Add new user '%s' from ip %s\n",
             login.c_str(), inet_ntostring(sip).c_str());
     printfd(__FILE__, "Add new user '%s' from ip %s\n",
             login.c_str(), inet_ntostring(sip).c_str());

-    ip2user[sip].login = login;
-    ip2user[sip].user = user;
-    ip2user[sip].protoVer = protoVer;
-    ip2user[sip].port = sport;
+    std::pair<std::map<uint32_t, IA_USER>::iterator, bool> res;
+    res = ip2user.insert(std::make_pair(sip, IA_USER(login, user, sport, protoVer)));
+    it = res.first;

     #ifdef IA_PHASE_DEBUG
     #ifdef IA_PHASE_DEBUG

-    ip2user[sip].phase.SetLogFileName(stgSettings->GetLogFileName());
-    ip2user[sip].phase.SetUserLogin(login);
+    it->second.phase.SetLogFileName(stgSettings->GetLogFileName());
+    it->second.phase.SetUserLogin(login);

     #endif
     #endif

-
-
-    it = ip2user.find(sip); //TODO
-    if (it == ip2user.end())
-        {
-        printfd(__FILE__, "+++ ERROR +++\n");
-        return -1;
-        }

     }
 else if (user->GetID() != it->second.user->GetID())
     {
     }
 else if (user->GetID() != it->second.user->GetID())
     {


@@ -808,9 +793,6 @@ else if (user->GetID() != it->second.user->GetID())
 
 IA_USER * iaUser = &(it->second);
 
 
 IA_USER * iaUser = &(it->second);
 

-if (iaUser->port != sport)
-    iaUser->port = sport;
-

 if (iaUser->password != user->GetProperty().password.Get())
     {
     InitEncrypt(&iaUser->ctx, user->GetProperty().password.Get());
 if (iaUser->password != user->GetProperty().password.Get())
     {
     InitEncrypt(&iaUser->ctx, user->GetProperty().password.Get());


@@ -1028,9 +1010,6 @@ sendAddr.sin_addr.s_addr = ip;
 
 int res = sendto(listenSocket, buffer, len, 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr));
 
 
 int res = sendto(listenSocket, buffer, len, 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr));
 

-static struct timeval tv;
-gettimeofday(&tv, NULL);
-

 if (res == len)
     return 0;
 
 if (res == len)
     return 0;
 


@@ -1170,7 +1149,7 @@ SwapBytes(connAck->len);
 SwapBytes(connAck->rnd);
 #endif
 printfd( __FILE__, "CONN_ACK_6 %s\n", connAck->type);
 SwapBytes(connAck->rnd);
 #endif
 printfd( __FILE__, "CONN_ACK_6 %s\n", connAck->type);

-// ÕÓÔÁÎÏ×ÉÔØ ÎÏ×ÕÀ ÆÁÚÕ É ×ÒÅÍÑ É ÒÁÚÒÅÛÉÔØ ÉÎÅÔ
+

 if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
     {
     iaUser->phase.UpdateTime();
 if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
     {
     iaUser->phase.UpdateTime();


@@ -1647,9 +1626,12 @@ SwapBytes(fin6.len);
 Encrypt(&iaUser->ctx, (char*)&fin6, (char*)&fin6, Min8(sizeof(fin6))/8);
 
 users->Unauthorize(iaUser->login, this);
 Encrypt(&iaUser->ctx, (char*)&fin6, (char*)&fin6, Min8(sizeof(fin6))/8);
 
 users->Unauthorize(iaUser->login, this);

+
+int res = Send(sip, iaSettings.GetUserPort(), (char*)&fin6, Min8(sizeof(fin6)));
+

 ip2user.erase(it);
 
 ip2user.erase(it);
 

-return Send(sip, iaSettings.GetUserPort(), (char*)&fin6, Min8(sizeof(fin6)));
+return res;

 }
 //-----------------------------------------------------------------------------
 int AUTH_IA::Send_FIN_7(IA_USER * iaUser, uint32_t sip, map<uint32_t, IA_USER>::iterator it)
 }
 //-----------------------------------------------------------------------------
 int AUTH_IA::Send_FIN_7(IA_USER * iaUser, uint32_t sip, map<uint32_t, IA_USER>::iterator it)


@@ -1674,9 +1656,12 @@ SwapBytes(fin8.len);
 Encrypt(&iaUser->ctx, (char*)&fin8, (char*)&fin8, Min8(sizeof(fin8))/8);
 
 users->Unauthorize(iaUser->login, this);
 Encrypt(&iaUser->ctx, (char*)&fin8, (char*)&fin8, Min8(sizeof(fin8))/8);
 
 users->Unauthorize(iaUser->login, this);

+
+int res = Send(sip, iaUser->port, (char*)&fin8, Min8(sizeof(fin8)));
+

 ip2user.erase(it);
 
 ip2user.erase(it);
 

-return Send(sip, iaUser->port, (char*)&fin8, Min8(sizeof(fin8)));
+return res;

 }
 //-----------------------------------------------------------------------------
 inline
 }
 //-----------------------------------------------------------------------------
 inline