diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp index 8ece5f56568bd9b7d7801147d4dd0689c8ccc4a7..8a0aa8006da7dab80238e6cc9f374f446de20fbb 100644 --- a/src/networkpluginserver.cpp +++ b/src/networkpluginserver.cpp @@ -106,7 +106,6 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U m_userManager = userManager; m_config = config; component->m_factory = new NetworkFactory(this); - m_pongReceived = false; m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1)); m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1)); @@ -127,24 +126,30 @@ NetworkPluginServer::~NetworkPluginServer() { } void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr c) { - if (m_client) { - c->disconnect(); - } - m_client = c; - m_pongReceived = false; - + Client client; + client.pongReceived = true; + + m_clients[c] = client; c->onDisconnected.connect(boost::bind(&NetworkPluginServer::handleSessionFinished, this, c)); c->onDataRead.connect(boost::bind(&NetworkPluginServer::handleDataRead, this, c, _1)); - sendPing(); + sendPing(c); m_pingTimer->start(); } void NetworkPluginServer::handleSessionFinished(boost::shared_ptr c) { - if (c == m_client) { - m_client.reset(); + for (std::list::const_iterator it = m_clients[c].users.begin(); it != m_clients[c].users.end(); it++) { + (*it)->handleDisconnected("Internal Server Error, please reconnect."); + } + + m_clients.erase(c); + + // Execute new session only if there's no free one after this crash/disconnection + for (std::map, Client>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) { + if ((*it).second.users.size() < 1) { + return; + } } - m_pingTimer->stop(); exec_(CONFIG_STRING(m_config, "service.backend").c_str(), "localhost", "10000", m_config->getConfigFile().c_str()); } @@ -274,23 +279,23 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool void NetworkPluginServer::handleDataRead(boost::shared_ptr c, const Swift::ByteArray &data) { long expected_size = 0; - m_data += data.toString(); + m_clients[c].data += data.toString(); // std::cout << "received data; size = " << m_data.size() << "\n"; - while (m_data.size() != 0) { - if (m_data.size() >= 4) { - unsigned char * head = (unsigned char*) m_data.c_str(); + while (m_clients[c].data.size() != 0) { + if (m_clients[c].data.size() >= 4) { + unsigned char * head = (unsigned char*) m_clients[c].data.c_str(); expected_size = (((((*head << 8) | *(head + 1)) << 8) | *(head + 2)) << 8) | *(head + 3); //expected_size = m_data[0]; // std::cout << "expected_size=" << expected_size << "\n"; - if (m_data.size() - 4 < expected_size) + if (m_clients[c].data.size() - 4 < expected_size) return; } else { return; } - std::string msg = m_data.substr(4, expected_size); - m_data.erase(0, 4 + expected_size); + std::string msg = m_clients[c].data.substr(4, expected_size); + m_clients[c].data.erase(0, 4 + expected_size); pbnetwork::WrapperMessage wrapper; if (wrapper.ParseFromString(msg) == false) { @@ -315,7 +320,7 @@ void NetworkPluginServer::handleDataRead(boost::shared_ptr c, handleConvMessagePayload(wrapper.payload(), true); break; case pbnetwork::WrapperMessage_Type_TYPE_PONG: - m_pongReceived = true; + m_clients[c].pongReceived = true; break; case pbnetwork::WrapperMessage_Type_TYPE_PARTICIPANT_CHANGED: handleParticipantChangedPayload(wrapper.payload()); @@ -339,12 +344,14 @@ void NetworkPluginServer::send(boost::shared_ptr &c, const st void NetworkPluginServer::pingTimeout() { std::cout << "pingtimeout\n"; - if (m_pongReceived) { - sendPing(); - m_pingTimer->start(); - } - else { - exec_(CONFIG_STRING(m_config, "service.backend").c_str(), "localhost", "10000", m_config->getConfigFile().c_str()); + for (std::map, Client>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) { + if ((*it).second.pongReceived) { + sendPing((*it).first); + m_pingTimer->start(); + } + else { + exec_(CONFIG_STRING(m_config, "service.backend").c_str(), "localhost", "10000", m_config->getConfigFile().c_str()); + } } } @@ -367,8 +374,10 @@ void NetworkPluginServer::handleUserReadyToConnect(User *user) { login.SerializeToString(&message); WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGIN); + user->connection = getFreeClient(); + m_clients[user->connection].users.push_back(user); - send(m_client, message); + send(user->connection, message); } void NetworkPluginServer::handleRoomJoined(User *user, const std::string &r, const std::string &nickname, const std::string &password) { @@ -385,7 +394,7 @@ void NetworkPluginServer::handleRoomJoined(User *user, const std::string &r, con WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_JOIN_ROOM); - send(m_client, message); + send(user->connection, message); NetworkConversation *conv = new NetworkConversation(user->getConversationManager(), r, true); conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2)); @@ -406,7 +415,7 @@ void NetworkPluginServer::handleRoomLeft(User *user, const std::string &r) { WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LEAVE_ROOM); - send(m_client, message); + send(user->connection, message); NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(r); if (!conv) { @@ -428,7 +437,15 @@ void NetworkPluginServer::handleUserDestroyed(User *user) { WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGOUT); - send(m_client, message); + send(user->connection, message); + + m_clients[user->connection].users.remove(user); + if (m_clients[user->connection].users.size() == 0) { + std::cout << "DISCONNECTING\n"; + user->connection->disconnect(); + user->connection.reset(); + m_clients.erase(user->connection); + } } void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr &msg) { @@ -442,19 +459,31 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE); - send(m_client, message); + send(conv->getConversationManager()->getUser()->connection, message); } -void NetworkPluginServer::sendPing() { +void NetworkPluginServer::sendPing(boost::shared_ptr c) { std::string message; pbnetwork::WrapperMessage wrap; wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PING); wrap.SerializeToString(&message); - send(m_client, message); - m_pongReceived = false; + send(c, message); + m_clients[c].pongReceived = false; std::cout << "SENDING PING\n"; } +boost::shared_ptr NetworkPluginServer::getFreeClient() { + for (std::map, Client>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) { + if ((*it).second.users.size() < 1) { + if ((*it).second.users.size() + 1 == 1) { + exec_(CONFIG_STRING(m_config, "service.backend").c_str(), "localhost", "10000", m_config->getConfigFile().c_str()); + } + return (*it).first; + } + } + return boost::shared_ptr(); +} + }