Change Signal class constructor

src/peerconnect.cc

@@ -34,11 +34,7 @@ PeerConnect::PeerConnect(const std::string setting) {
 
   // create signal client
   if (signal_ == nullptr) {
-    signal_ = std::make_shared<pc::Signal>();
-
-    if (signal_) {
-      signal_->SetConfig(setting_.signal_uri_);
-    }
+    signal_ = std::make_shared<pc::Signal>(setting_.signal_uri_);
   }
 
   LOGP_F( INFO ) << "Done";

src/signalconnection.cc

@@ -40,13 +40,14 @@
 
 namespace pc {
 
-Signal::Signal() :
+Signal::Signal(const std::string url) :
       con_state_(con_closed),
       network_thread_(),
       reconn_attempts_(0xFFFFFFFF),
       reconn_made_(0),
       reconn_delay_(5000),
-      reconn_delay_max_(25000) {
+      reconn_delay_max_(25000),
+      url_(url) {
 
 #if _DEBUG || DEBUG
   client_.clear_access_channels(websocketpp::log::alevel::all);
@@ -56,6 +57,11 @@ Signal::Signal() :
   client_.clear_error_channels(websocketpp::log::alevel::all);
 #endif
 
+  // Default settings
+  if (url_.empty()) {
+    url_ = "wss://signal.throughnet.com/hello";
+  }
+
   // Initialize ASIO
   client_.init_asio();
 
@@ -86,16 +92,6 @@ Signal::~Signal() {
   LOGP_F( INFO ) << "Done";
 }
 
-
-void Signal::SetConfig(const std::string& url) {
-  url_ = url;
-
-  // Default settings
-  if (url_.empty()) {
-    url_ = "wss://signal.throughnet.com/hello";
-  }
-}
-
 void Signal::SignIn(const std::string& id, const std::string& password) {
   user_id_ = id;
   user_password_ = password;

src/signalconnection.h

@@ -60,7 +60,6 @@ public:
                            const Json::Value& data) = 0;
   virtual void SendGlobalCommand(const std::string commandname,
                            const Json::Value& data) = 0;
-  virtual void SetConfig(const std::string& url) = 0;
   std::string session_id() { return session_id_; }
  
   // sigslots
@@ -91,7 +90,7 @@ public:
 #endif //DEBUG
   typedef websocketpp::client<client_config> client_type;
 
-  Signal();
+  Signal(const std::string url);
   ~Signal();
 
   void SignIn(const std::string& id, const std::string& password);
@@ -104,7 +103,6 @@ public:
   void SendGlobalCommand(const std::string commandname,
                          const Json::Value& data);
 
-  void SetConfig(const std::string& url);
   void Teardown();
 
   bool opened() const { return con_state_ == con_opened;}