Merge branch 'master' into full-month-stats

[stg.git] / projects / sgauth / web.h

diff --git a/projects/sgauth/web.h b/projects/sgauth/web.h
index b734f16be9ca9f2ad4cd7e0acd680aef61a98c70..aa2227ee98a2d6d9f476e9d81a1d7cba0e15b3c7 100644 (file)
--- a/projects/sgauth/web.h
+++ b/projects/sgauth/web.h
@@ -39,8 +39,8 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "stg_const.h"
-#include "ia_packets.h"
+#include "stg/const.h"
+#include "stg/ia_packets.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -65,8 +65,10 @@ public:
     void UpdateStat(const LOADSTAT & ls);
     void Start();
 private:
     void UpdateStat(const LOADSTAT & ls);
     void Start();
 private:

-

     void PrepareNet();
     void PrepareNet();

+    int SendReply();
+    int SendCSS();
+    int Redirect(const char * url);

 
     #ifdef WIN32
     WSADATA wsaData;
 
     #ifdef WIN32
     WSADATA wsaData;


@@ -74,28 +76,15 @@ private:
     pthread_t thread;
     #endif
 
     pthread_t thread;
     #endif
 

-    int         SendReply();
-    int         SendCSS();
-    int         Redirect(const char * url);
-
-    string      dirName[DIR_NUM];
-    int         res;
-    int         listenSocket;
-    int         outerSocket;
-    struct sockaddr_in listenAddr;
-    struct sockaddr_in outerAddr;
-    int         refreshPeriod;
+    string dirName[DIR_NUM];
+    int res;
+    int listenSocket;
+    int outerSocket;
+    int refreshPeriod;

 
 

-    uint32_t    listenWebAddr;
-    LOADSTAT    ls;
+    uint32_t listenWebAddr;
+    LOADSTAT ls;

 
     list<STG_MESSAGE> messages;
 
     list<STG_MESSAGE> messages;

-
-    #ifndef WIN32
-    socklen_t   outerAddrLen;
-    #else
-    int         outerAddrLen;
-    #endif

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-