Fix sgauth compilation errors

[stg.git] / stglibs / ia_auth_c.lib / ia_auth_c.h

diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.h b/stglibs/ia_auth_c.lib/ia_auth_c.h
index 639646af29e355703f2c4c4dcba8977bae1a65e4..0a916f4cb4f86a3bc7c7e6b499d75f753a3d926f 100644 (file)
--- a/stglibs/ia_auth_c.lib/ia_auth_c.h
+++ b/stglibs/ia_auth_c.lib/ia_auth_c.h
@@ -38,8 +38,8 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

-#include "blowfish.h"
-#include "ia_packets.h"
+#include "stg/blowfish.h"
+#include "stg/ia_packets.h"

 
 #define IA_BIND_ERROR           (1)
 #define IA_SERVER_ERROR         (2)
 
 #define IA_BIND_ERROR           (1)
 #define IA_SERVER_ERROR         (2)


@@ -87,7 +87,7 @@ public:
 
     int         Connect();
     int         Disconnect();
 
     int         Connect();
     int         Disconnect();

-    int         GetAuthorized() const { return phase == 3 || phase == 4; };   // Ìû ïîäêëþ÷åíû èëè íåò?
+    int         GetAuthorized() const { return phase == 3 || phase == 4; };

     int         GetPhase() const { return phase; };
     int         GetStatus() const;
     int         GetReconnect() const { return reconnect; };
     int         GetPhase() const { return phase; };
     int         GetStatus() const;
     int         GetReconnect() const { return reconnect; };


@@ -131,8 +131,8 @@ private:
     LOADSTAT        stat;
     int             action;
     int             phase;
     LOADSTAT        stat;
     int             action;
     int             phase;

-    int             phaseTime;                  // Âðåìÿ âõîäà â ôàçó
-    string          messageText;                // Ñîîáùåíèå îá îøèáêå
+    int             phaseTime;
+    string          messageText;

     string          infoText;
     mutable string  strError;
     mutable int     codeError;
     string          infoText;
     mutable string  strError;
     mutable int     codeError;


@@ -154,17 +154,17 @@ private:
     pthread_t thread;
     #endif
 
     pthread_t thread;
     #endif
 

-    string          serverName;                     // Èìÿ ñåðâåðà
-    uint16_t        port;                           // Ïîðò ñåðâåðà
-    uint32_t        ip;                             // Proxy IP
+    string          serverName;
+    uint16_t        port;
+    uint32_t        ip;

     uint32_t        localPort;
 
     uint32_t        localPort;
 

-    struct sockaddr_in  servAddr;        // àäðåñ ñåðâåðà
+    struct sockaddr_in  servAddr;

 
     bool            firstConnect;
     int             reconnect;
     int             sockr;
 
     bool            firstConnect;
     int             reconnect;
     int             sockr;

-    int             protNum;                    // ×èñëî, êîòîðîå ó÷àñòâóåò â îáìåíå ñîîáùåíèÿìèa
+    int             protNum;

     int             userTimeout;
     int             aliveTimeout;
     unsigned int    rnd;
     int             userTimeout;
     int             aliveTimeout;
     unsigned int    rnd;


@@ -191,7 +191,6 @@ private:
     DISCONN_SYN_8     * disconnSyn8;
     DISCONN_SYN_ACK_8 * disconnSynAck8;
     DISCONN_ACK_8     * disconnAck8;
     DISCONN_SYN_8     * disconnSyn8;
     DISCONN_SYN_ACK_8 * disconnSynAck8;
     DISCONN_ACK_8     * disconnAck8;

-    ERR_8               err;

     INFO_8            * info;
 };
 //---------------------------------------------------------------------------
     INFO_8            * info;
 };
 //---------------------------------------------------------------------------


@@ -203,5 +202,3 @@ void * RunW(void *);
 
 //---------------------------------------------------------------------------
 #endif //IA_AUTH_C_H
 
 //---------------------------------------------------------------------------
 #endif //IA_AUTH_C_H

-
-