Add proper header to use struct sockaddr_in in sgauthstress

[stg.git] / projects / stargazer / plugins / other / smux / smux.cpp

diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index 8faccc2d3ed8de0fee1abd2c82beba906ae527d5..fcc0a9c2349e5afbe070072f3ee9a85beb73f001 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -34,8 +34,10 @@ return a.first.PrefixLess(b.first);
 }
 
 SMUX_SETTINGS::SMUX_SETTINGS()
 }
 
 SMUX_SETTINGS::SMUX_SETTINGS()

-    : ip(0),
-      port(0)
+    : errorStr(),
+      ip(0),
+      port(0),
+      password()

 {}
 
 int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {}
 
 int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)


@@ -94,6 +96,11 @@ SMUX::SMUX()
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),

+      errorStr(),
+      smuxSettings(),
+      settings(),
+      thread(),
+      mutex(),

       running(false),
       stopped(true),
       sock(-1),
       running(false),
       stopped(true),
       sock(-1),


@@ -217,22 +224,10 @@ if (!stopped)
         struct timespec ts = {0, 200000000};
         nanosleep(&ts, NULL);
         }
         struct timespec ts = {0, 200000000};
         nanosleep(&ts, NULL);
         }

-
-    //after 5 seconds waiting thread still running. now killing it
-    if (!stopped)
-        {
-        printfd(__FILE__, "SMUX::Stop() - failed to stop thread, killing it\n");
-        if (pthread_kill(thread, SIGINT))
-            {
-            errorStr = "Cannot kill thread.";
-            printfd(__FILE__, "SMUX::Stop() - Cannot kill thread\n");
-            return -1;
-            }
-        printfd(__FILE__, "SMUX::Stop() -  killed Run\n");
-        }

     }
 
     }
 

-pthread_join(thread, NULL);
+if (stopped)
+    pthread_join(thread, NULL);

 
 ResetNotifiers();
 
 
 ResetNotifiers();
 


@@ -252,6 +247,12 @@ sensors.erase(sensors.begin(), sensors.end());
 
 close(sock);
 
 
 close(sock);
 

+if (!stopped)
+    {
+    running = true;
+    return -1;
+    }
+

 printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }
 printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }


@@ -267,6 +268,10 @@ return 0;
 
 void * SMUX::Runner(void * d)
 {
 
 void * SMUX::Runner(void * d)
 {

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

 SMUX * smux = static_cast<SMUX *>(d);
 
 smux->Run();
 SMUX * smux = static_cast<SMUX *>(d);
 
 smux->Run();


@@ -276,8 +281,11 @@ return NULL;
 
 void SMUX::Run()
 {
 
 void SMUX::Run()
 {

-SendOpenPDU(sock);
-SendRReqPDU(sock);
+stopped = true;
+if (!SendOpenPDU(sock))
+    return;
+if (!SendRReqPDU(sock))
+    return;

 running = true;
 stopped = false;
 
 running = true;
 stopped = false;