Complete replacement notifiers with subscriptions.

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

diff --git a/projects/sgauth/web.cpp b/projects/sgauth/web.cpp
index ffab862b76882df51600c8b7ef158b594ed3705a..a162acc4eabf4efd9333854f92e406b0759ff2c2 100644 (file)
--- a/projects/sgauth/web.cpp
+++ b/projects/sgauth/web.cpp
@@ -23,14 +23,16 @@
  $Date: 2010/03/15 12:58:17 $
  */
 
  $Date: 2010/03/15 12:58:17 $
  */
 

-#include <stdio.h>
-#include <string.h>
-#include <time.h>

 #include <libintl.h>
 
 #include <libintl.h>
 

+#include <csignal>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+
+#include "stg/common.h"
+#include "stg/ia.h"

 #include "web.h"
 #include "web.h"

-#include "common.h"
-#include "ia_auth_c.h"

 
 extern WEB * web;
 extern IA_CLIENT_PROT * clnp;
 
 extern WEB * web;
 extern IA_CLIENT_PROT * clnp;


@@ -42,10 +44,15 @@ extern IA_CLIENT_PROT * clnp;
 //---------------------------------------------------------------------------
 #ifndef WIN32
 void * RunWeb(void *)
 //---------------------------------------------------------------------------
 #ifndef WIN32
 void * RunWeb(void *)

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

 #else
 unsigned long WINAPI RunWeb(void *)
 #else
 unsigned long WINAPI RunWeb(void *)

-#endif

 {
 {

+#endif

 while (1)
     web->Run();
 return NULL;
 while (1)
     web->Run();
 return NULL;


@@ -66,6 +73,8 @@ for (int i = 0; i < DIR_NUM; i++)
     dirName[i] = "-";
 
 refreshPeriod = 5;
     dirName[i] = "-";
 
 refreshPeriod = 5;

+
+memset(&ls, 0, sizeof(ls));

 }
 //---------------------------------------------------------------------------
 void WEB::Start()
 }
 //---------------------------------------------------------------------------
 void WEB::Start()


@@ -94,9 +103,8 @@ listenAddr.sin_family = AF_INET;
 listenAddr.sin_port = htons(LISTEN_PORT);
 listenAddr.sin_addr.s_addr = listenWebAddr;
 
 listenAddr.sin_port = htons(LISTEN_PORT);
 listenAddr.sin_addr.s_addr = listenWebAddr;
 

-int lng = 1;
-

 #ifndef WIN32
 #ifndef WIN32

+int lng = 1;

 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     printf("Setsockopt Fail\n");
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     printf("Setsockopt Fail\n");


@@ -181,7 +189,8 @@ while (1)
         #ifdef WIN32
         Sleep(1000);
         #else
         #ifdef WIN32
         Sleep(1000);
         #else

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

         #endif
         exit(0);
         }
         #endif
         exit(0);
         }


@@ -285,7 +294,7 @@ for (j = 0; j < DIR_NUM; j++)
     {
     if (dirName[j][0] == 0)
         continue;
     {
     if (dirName[j][0] == 0)
         continue;

-    string s;
+    std::string s;

     KOIToWin(dirName[j], &s);// +++++++++ sigsegv ==========   TODO too long dir name crashes sgauth
     sprintf(str, "       <TD id=\"TraffTableCaptionCell%d\">%s</TD>\n", rowNum++, s.c_str());
     send(outerSocket, str, strlen(str), 0);
     KOIToWin(dirName[j], &s);// +++++++++ sigsegv ==========   TODO too long dir name crashes sgauth
     sprintf(str, "       <TD id=\"TraffTableCaptionCell%d\">%s</TD>\n", rowNum++, s.c_str());
     send(outerSocket, str, strlen(str), 0);


@@ -349,7 +358,6 @@ res = send(outerSocket, str, strlen(str), 0);
 sprintf(str,"        <TD id=\"TraffTableDSCellC\">%s</TD>\n", gettext("Session Download"));
 res = send(outerSocket, str, strlen(str), 0);
 
 sprintf(str,"        <TD id=\"TraffTableDSCellC\">%s</TD>\n", gettext("Session Download"));
 res = send(outerSocket, str, strlen(str), 0);
 

-rowNum = 0;

 for (j = 0; j < DIR_NUM; j++)
     {
     if (dirName[j][0] == 0)
 for (j = 0; j < DIR_NUM; j++)
     {
     if (dirName[j][0] == 0)


@@ -379,7 +387,7 @@ if (!messages.empty())
     sprintf(str,"        </TR>\n");
     send(outerSocket, str, strlen(str), 0);
 
     sprintf(str,"        </TR>\n");
     send(outerSocket, str, strlen(str), 0);
 

-    list<STG_MESSAGE>::reverse_iterator it;
+    std::list<STG_MESSAGE>::reverse_iterator it;

     it = messages.rbegin();
     while (it != messages.rend())
         {
     it = messages.rbegin();
     while (it != messages.rend())
         {


@@ -418,18 +426,18 @@ const char * replyHeader =
 const char * replyFooter= "\n\n";
 
 send(outerSocket, replyHeader, strlen(replyHeader), 0);
 const char * replyFooter= "\n\n";
 
 send(outerSocket, replyHeader, strlen(replyHeader), 0);

-send(outerSocket, css, strlen(css), 0);
+send(outerSocket, SGAuth::css, strlen(SGAuth::css), 0);

 send(outerSocket, replyFooter, strlen(replyFooter), 0);
 
 return 0;
 }
 //---------------------------------------------------------------------------
 send(outerSocket, replyFooter, strlen(replyFooter), 0);
 
 return 0;
 }
 //---------------------------------------------------------------------------

-void WEB::SetDirName(const string & dn, int n)
+void WEB::SetDirName(const std::string & dn, int n)

 {
 web->dirName[n] =  dn;
 }
 //---------------------------------------------------------------------------
 {
 web->dirName[n] =  dn;
 }
 //---------------------------------------------------------------------------

-void WEB::AddMessage(const string & message, int type)
+void WEB::AddMessage(const std::string & message, int type)

 {
 time_t t = time(NULL);
 STG_MESSAGE m;
 {
 time_t t = time(NULL);
 STG_MESSAGE m;