WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/vm/plugin/Console.cpp

 Console::Console(boost::asio::io_service& io_service, unsigned int port) : Plugin(io_service)
+{
     this->name_ = "console";
     Console::current_client_id_ = 0;
-    net::Manager::Instance()->ConnectSlots(net::Manager::SignalOnNewState::slot_type(&Console::SlotOnNewState, this, _1, _2, _3).track(this->tracker_),
+    net::Manager::Instance()->ConnectSlots(net::Manager::SignalOnNewState::slot_type(&Console::SlotOnNewState, this, _1, _2).track(this->tracker_),
+                                           net::Manager::SignalOnNewClient::slot_type(&Console::SlotOnNewClient, this, _1, _2).track(this->tracker_),
-                                           net::Manager::SignalOnNewData::slot_type(&Console::SlotOnNewData, this, _1, _2, _3).track(this->tracker_));
+                                           net::Manager::SignalOnNewData::slot_type(&Console::SlotOnNewData, this, _1, _2).track(this->tracker_));
     this->ExportFunction("ConsoleExport_PromptRequest",        Console::Export_PromptRequest);
     this->ExportFunction("ConsoleExport_AutoCompleteResponse", Console::Export_AutoCompleteResponse);
     this->ExportFunction("ConsoleExport_LogToClient",          Console::Export_LogToClient);
     this->ExportFunction("ConsoleExport_DisconnectClient",     Console::Export_DisconnectClient);
     packet += output;
     net::Manager::Instance()->SendTo(request_id, packet);
+}
+void Console::SlotOnNewData(net::SocketId id, common::Byteset data)
+{
+    this->io_service_.post(boost::bind(&Console::SlotOnNewDataHandler, this, id, data));
+}
+void Console::SlotOnNewClient(net::SocketId id, net::SocketId server_id)
+{
+  this->io_service_.post(boost::bind(&Console::SlotOnNewClientHandler, this, id, server_id));
+}
+void Console::SlotOnNewState(net::SocketId id, net::ClientState client_state)
+{
+    this->io_service_.post(boost::bind(&Console::SlotOnNewStateHandler, this, id, client_state));
+}
-void Console::SlotOnNewData(net::SocketId client_id, net::SocketId server_id, common::Byteset data)
+void Console::SlotOnNewDataHandler(net::SocketId id, common::Byteset data)
+{
+    v8::Locker lock;
+    v8::Context::Scope context_scope(vm::Manager::Instance()->GetContext());
+    v8::HandleScope handle_scope;
+    if (std::find(this->clients_.begin(), this->clients_.end(), id) == this->clients_.end())
+    {
-    if (server_id != this->server_id_)
-    {
-        return;
-    }
-    this->io_service_.post(boost::bind(&Console::SlotOnNewDataHandler, this, client_id, server_id, data));
-}
-void Console::SlotOnNewState(net::SocketId client_id, net::SocketId server_id, net::ClientState client_state)
-{
-    if (server_id != this->server_id_)
-    {
-        return;
-    }
-    this->io_service_.post(boost::bind(&Console::SlotOnNewStateHandler, this, client_id, server_id, client_state));
-}
-void Console::SlotOnNewDataHandler(net::SocketId client_id, net::SocketId server_id, common::Byteset data)
-{
-    v8::Locker lock;
-    v8::Context::Scope context_scope(vm::Manager::Instance()->GetContext());
-    v8::HandleScope handle_scope;
-    //LOG.Debug(std::string(__FUNCTION__) + " called!");
-    if (data.GetSize() == 0)
-    {
-        LOG.Error(std::string(__FUNCTION__) + " got empty data!");
-        return;
+      return;
+    }
+    //LOG.Debug(std::string(__FUNCTION__) + " called!");
+    if (data.GetSize() == 0)
+    {
+        LOG.Error(std::string(__FUNCTION__) + " got empty data!");
+        return;
+    }
     std::string s(data.ToCharString());
     if (s.length() < 8)
+    {
         LOG.Error(std::string(__FUNCTION__) + " got a packet which is to short, less then 8 bytes: \"" + s + "\"");
         return;
+    }
     std::string command = s.substr(0, 4);
     LOG.Debug(std::string(__FUNCTION__) + " parsed command: \"" + command + "\"");
     // TODO: Check cast exception!
     unsigned int payload_length = boost::lexical_cast<unsigned int>(s.substr(4, 4));
     LOG.Debug(std::string(__FUNCTION__) + " parsed payload_length: \"" + boost::lexical_cast<std::string>(payload_length) + "\"");
-    Console::current_client_id_ = client_id;
+    Console::current_client_id_ = id;
     if (command == "COMP")
+    {
         ArgumentListPointer call_arguments = ArgumentListPointer(new ArgumentList);
-        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(client_id)));
+        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
         call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(s.substr(8, 4))));
         call_arguments->push_back(v8::String::New(s.substr(12).data()));
-        if (!this->Call(client_id, "Console_AutocompleteRequest", call_arguments))
+        if (!this->Call(id, "Console_AutocompleteRequest", call_arguments))
+        {
             LOG.Error("Console_AutocompleteRequest failed, we are now in an undefined state!");
+        }
+    }
     else if (command == "RESP")
+    {
         LOG.Debug(std::string(__FUNCTION__) + " parsed data: \"" + s.substr(8).data() + "\"");
         ArgumentListPointer call_arguments = ArgumentListPointer(new ArgumentList);
-        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(client_id)));
+        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
         call_arguments->push_back(v8::String::New(s.substr(8).data()));
-        if (!this->Call(client_id, "Console_PromptResponse", call_arguments))
+        if (!this->Call(id, "Console_PromptResponse", call_arguments))
+        {
             LOG.Error("Console_PromptResponse failed, we are now in an undefined state!");
+        }
     }
     else
     {
         LOG.Error("Unknown packat received, we are now in an undefined state!");
     }
     Console::current_client_id_ = 0;
 }
+void Console::SlotOnNewClientHandler(net::SocketId id, net::SocketId server_id)
+{
+  if (server_id == this->server_id_)
+  {
+    this->clients_.insert(id);
+  }
+}
-void Console::SlotOnNewStateHandler(net::SocketId client_id, net::SocketId server_id, net::ClientState client_state)
+void Console::SlotOnNewStateHandler(net::SocketId id, net::ClientState client_state)
 {
     v8::Locker lock;
     v8::Context::Scope context_scope(vm::Manager::Instance()->GetContext());
     v8::HandleScope handle_scope;
+    if (std::find(this->clients_.begin(), this->clients_.end(), id) == this->clients_.end())
+    {
+      return;
+    }
     //LOG.Debug(std::string(__FUNCTION__) + " called!");
     if (client_state == net::CLIENT_STATE_DISCONNECTED)
+    {
-        LOG.Info("Client " + boost::lexical_cast<std::string>(client_id) + " has disconnected.");
+        LOG.Info("Client " + boost::lexical_cast<std::string>(id) + " has disconnected.");
+        this->clients_.erase(id);
+    }
     else if (client_state == net::CLIENT_STATE_CONNECTED)
+    {
-        LOG.Info("Client " + boost::lexical_cast<std::string>(client_id) + " has connected.");
+        LOG.Info("Client " + boost::lexical_cast<std::string>(id) + " has connected.");
-        Console::current_client_id_ = client_id;
+        Console::current_client_id_ = id;
         ArgumentListPointer call_arguments = ArgumentListPointer(new ArgumentList);
-        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(client_id)));
+        call_arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
-        if (!this->Call(client_id, "Console_NewConnection", call_arguments))
+        if (!this->Call(id, "Console_NewConnection", call_arguments))
+        {
             LOG.Error("Console_NewConnection failed, we are now in an undefined state!");
+        }
         Console::current_client_id_ = 0;

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/vm/plugin/Console.cpp – Rev 1959 → 1986