Виправлено помилки виклику localtime із різних потоків

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

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
index 0e194db6d18e6ba8b099d1365d7c448dbddc0971..ad7db7a17a7f4daa4bdab85141c4f783ae2bd757 100644 (file)
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h
@@ -121,13 +121,12 @@ private:
 struct IA_USER
 {
     IA_USER()
 struct IA_USER
 {
     IA_USER()

+        : lastSendAlive(0),
+          rnd(random()),
+          port(0),
+          protoVer(0),
+          password("NO PASSWORD")

     {
     {

-        //phase     = 1;
-        //phaseTime = 0;
-        lastSendAlive = 0;
-        rnd       = random();
-        port      = 0;
-        password = "NO PASSWORD";

         // +++ Preparing CTX +++
         unsigned char keyL[PASSWD_LEN];  // ðÁÒÏÌØ ÄÌÑ ÛÉÆÒÏ×ËÉ
         memset(keyL, 0, PASSWD_LEN);
         // +++ Preparing CTX +++
         unsigned char keyL[PASSWD_LEN];  // ðÁÒÏÌØ ÄÌÑ ÛÉÆÒÏ×ËÉ
         memset(keyL, 0, PASSWD_LEN);


@@ -140,15 +139,15 @@ struct IA_USER
     };
 
     IA_USER(const IA_USER & u)
     };
 
     IA_USER(const IA_USER & u)

+        : user(u.user),
+          phase(u.phase),
+          lastSendAlive(u.lastSendAlive),
+          rnd(u.rnd),
+          port(u.port),
+          messagesToSend(u.messagesToSend),
+          protoVer(u.protoVer),
+          password(u.password)

     {
     {

-        user          = u.user;
-        phase         = u.phase;
-        //phaseTime     = u.phaseTime;
-        lastSendAlive = u.lastSendAlive;
-        rnd           = u.rnd;
-        password      = u.password;
-        protoVer      = u.protoVer;
-        port          = u.port;

         #ifdef IA_DEBUG
         aliveSent  = u.aliveSent;
         #endif
         #ifdef IA_DEBUG
         aliveSent  = u.aliveSent;
         #endif


@@ -280,10 +279,6 @@ private:
 
     int                 Timeouter();
 
 
     int                 Timeouter();
 

-    void                InitEncrypt(BLOWFISH_CTX * ctx, const string & password);
-    void                Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
-    void                Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
-

     int                 SendError(uint32_t ip, uint16_t port, int protoVer, const string & text);
     int                 Send(uint32_t ip, uint16_t port, const char * buffer, int len);
     int                 RealSendMessage6(const STG_MSG & msg, uint32_t ip, IA_USER & user);
     int                 SendError(uint32_t ip, uint16_t port, int protoVer, const string & text);
     int                 Send(uint32_t ip, uint16_t port, const char * buffer, int len);
     int                 RealSendMessage6(const STG_MSG & msg, uint32_t ip, IA_USER & user);