Initialize some fields via initializer lists in USER_IMPL and

[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..61ed80269f9bf9275460cb451c43d12f8575c761 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),


@@ -276,8 +283,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;