libtransport.git Changeset - 9d23a3ba8ba4

Changeset - 9d23a3ba8ba4

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-07-09 12:59:53
hanzz.k@gmail.com

Renamed NPS::Client into NPS::Backend. Better Spectrum Manager output formating

4 files changed with 71 insertions and 43 deletions:

include/transport/networkpluginserver.h

spectrum_manager/src/main.cpp

src/admininterface.cpp

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ class Config; @@
 class NetworkConversation;
 class VCardResponder;
 class RosterResponder;
 class NetworkPluginServer {
 	public:
-		struct Client {
+		struct Backend {
 			bool pongReceived;
 			std::list<User *> users;
 			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;
 		};
@@ @@ -54,18 +54,22 @@ class NetworkPluginServer { @@
 		virtual ~NetworkPluginServer();
 		int getBackendCount() {
 			return m_clients.size();
+		}
 		const std::list<Backend *> &getBackends() {
 			return m_clients;
+		}
 		void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &message);
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
 		void handleSessionFinished(Client *c);
 		void handleDataRead(Client *c, const Swift::SafeByteArray&);
 		void handleSessionFinished(Backend *c);
 		void handleDataRead(Backend *c, const Swift::SafeByteArray&);
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload, bool subject = false);
 		void handleParticipantChangedPayload(const std::string &payload);
@@ @@ -89,20 +93,20 @@ class NetworkPluginServer { @@
 		void handleVCardUpdated(User *user, boost::shared_ptr<Swift::VCard> vcard);
 		void handleVCardRequired(User *user, const std::string &name, unsigned int id);
 		void send(boost::shared_ptr<Swift::Connection> &, const std::string &data);
 		void pingTimeout();
 		void sendPing(Client *c);
 		Client *getFreeClient();
 		void sendPing(Backend *c);
 		Backend *getFreeClient();
 		UserManager *m_userManager;
 		VCardResponder *m_vcardResponder;
 		RosterResponder *m_rosterResponder;
 		Config *m_config;
 		boost::shared_ptr<Swift::BoostConnectionServer> m_server;
-		std::list<Client *>  m_clients;
+		std::list<Backend *>  m_clients;
 		Swift::Timer::ref m_pingTimer;
 		Component *m_component;
 };
+}

spectrum_manager/src/main.cpp

➞

Show inline comments

@@ @@ -26,13 +26,15 @@ static void handleConnected(Swift::Client *client) { @@
 	message->setBody(*m);
 	client->sendMessage(message);
+}
 static void handleMessageReceived(Swift::Client *client, Swift::Message::ref message) {
 	std::cout << "[      OK      ] " << client->getJID().getDomain() << ": " << message->getBody() <<  "\n";
 	std::string body = message->getBody();
 	boost::replace_all(body, "\n", "\n[      OK      ] " + client->getJID().getDomain() + ": ");
 	std::cout << "[      OK      ] " << client->getJID().getDomain() << ": " << body <<  "\n";
 	if (--finished == 0) {
 		exit(0);
+	}
+}
 int main(int argc, char **argv)

src/admininterface.cpp

➞

Show inline comments

 	if (message->getBody() == "status") {
 		int users = m_userManager->getUserCount();
 		int backends = m_server->getBackendCount() - 1;
 		message->setBody("Running (" + boost::lexical_cast<std::string>(users) + " users connected using " + boost::lexical_cast<std::string>(backends) + " backends)");
+	}
 	else if (message->getBody() == "online_users_count") {
 		int users = m_userManager->getUserCount();
 		message->setBody(boost::lexical_cast<std::string>(users));
+	}
 	else if (message->getBody() == "backends_count") {
 		int backends = m_server->getBackendCount() - 1;
 		message->setBody(boost::lexical_cast<std::string>(backends));
+	}
 	else if (message->getBody().find("has_online_user") == 0) {
 		User *user = m_userManager->getUser(getArg(message->getBody()));
 		std::cout << getArg(message->getBody()) << "\n";
 		message->setBody(boost::lexical_cast<std::string>(user != NULL));
+	}
 	else if (message->getBody().find("online_users") == 0) {
 	else if (message->getBody() == "online_users") {
 		std::string lst;
 		const std::map<std::string, User *> &users = m_userManager->getUsers();
 		if (users.size() == 0)
 			lst = "0";
 		for (std::map<std::string, User *>::const_iterator it = users.begin(); it != users.end(); it ++) {
 			lst += (*it).first + "\n";
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody() == "online_users_count") {
 		int users = m_userManager->getUserCount();
 		message->setBody(boost::lexical_cast<std::string>(users));
+	}
 	else if (message->getBody() == "online_users_per_backend") {
 		std::string lst;
 		int id = 1;
 		const std::list <NetworkPluginServer::Backend *> &backends = m_server->getBackends();
 		for (std::list <NetworkPluginServer::Backend *>::const_iterator b = backends.begin(); b != backends.end(); b++) {
 			NetworkPluginServer::Backend *backend = *b;
 			lst += "Backend " + boost::lexical_cast<std::string>(id) + ":\n";
 			if (backend->users.size() == 0) {
 				lst += "   waiting for users\n";
+			}
 			else {
 				for (std::list<User *>::const_iterator u = backend->users.begin(); u != backend->users.end(); u++) {
 					User *user = *u;
 					lst += "   " + user->getJID().toBare().toString() + "\n";
+				}
+			}
 			id++;
+		}
 		message->setBody(lst);
+	}
 	else if (message->getBody().find("has_online_user") == 0) {
 		User *user = m_userManager->getUser(getArg(message->getBody()));
 		std::cout << getArg(message->getBody()) << "\n";
 		message->setBody(boost::lexical_cast<std::string>(user != NULL));
+	}
 	else if (message->getBody() == "backends_count") {
 		int backends = m_server->getBackendCount() - 1;
 		message->setBody(boost::lexical_cast<std::string>(backends));
+	}
 	else if (message->getBody().find("help") == 0) {
 		std::string help;
 		help += "status - shows instance status\n";
 		help += "online_users - returns list of all online users\n";
 		help += "online_users_count - number of online users\n";
 		help += "has_online_user <bare_JID> - returns 1 if user is online\n";

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -169,13 +169,13 @@ NetworkPluginServer::~NetworkPluginServer() { @@
 	m_pingTimer->stop();
 	delete m_vcardResponder;
 	delete m_rosterResponder;
+}
 void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Connection> c) {
-	Client *client = new Client;
+	Backend *client = new Backend;
 	client->pongReceived = true;
 	client->connection = c;
 	LOG4CXX_INFO(logger, "New backend " << client << " connected. Current backend count=" << (m_clients.size() + 1));
 	if (m_clients.size() == 0) {
 	c->onDisconnected.connect(boost::bind(&NetworkPluginServer::handleSessionFinished, this, client));
 	c->onDataRead.connect(boost::bind(&NetworkPluginServer::handleDataRead, this, client, _1));
 	sendPing(client);
+}
-void NetworkPluginServer::handleSessionFinished(Client *c) {
+void NetworkPluginServer::handleSessionFinished(Backend *c) {
 	LOG4CXX_INFO(logger, "Backend " << c << " disconnected. Current backend count=" << (m_clients.size() - 1));
 	for (std::list<User *>::const_iterator it = c->users.begin(); it != c->users.end(); it++) {
 		LOG4CXX_ERROR(logger, "Backend " << c << " disconnected (probably crashed) with active user " << (*it)->getJID().toString());
 		(*it)->setData(NULL);
 		(*it)->handleDisconnected("Internal Server Error, please reconnect.");
+	}
 	m_clients.remove(c);
 	delete c;
 	// Execute new session only if there's no free one after this crash/disconnection
-	for (std::list<Client *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
+	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend")) {
 			return;
+		}
+	}
 	exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+}
 		conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
+	}
 	conv->handleMessage(msg);
+}
-void NetworkPluginServer::handleDataRead(Client *c, const Swift::SafeByteArray &data) {
+void NetworkPluginServer::handleDataRead(Backend *c, const Swift::SafeByteArray &data) {
 	c->data.insert(c->data.end(), data.begin(), data.end());
 	while (c->data.size() != 0) {
 		unsigned int expected_size;
 		if (c->data.size() >= 4) {
 			expected_size = *((unsigned int*) &c->data[0]);
 	*((int*)(header)) = htonl(data.size());
 	c->write(Swift::createSafeByteArray(std::string(header, 4) + data));
+}
 void NetworkPluginServer::pingTimeout() {
 	// check ping responses
-	for (std::list<Client *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
+	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->pongReceived) {
 			sendPing((*it));
+		}
 		else {
 			exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+		}
+	}
 	m_pingTimer->start();
+}
 void NetworkPluginServer::handleUserCreated(User *user) {
-	Client *c = getFreeClient();
+	Backend *c = getFreeClient();
 	if (!c) {
 		LOG4CXX_ERROR(logger, "There is no backend to handle user " << user->getJID().toString());
 		user->handleDisconnected("Internal Server Error, please reconnect.");
 		return;
+	}
 	user->setData(c);
 	std::string message;
 	login.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGIN);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleUserPresenceChanged(User *user, Swift::Presence::ref presence) {
 	if (presence->getShow() == Swift::StatusShow::None)
 		return;
 	std::string message;
 	status.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_STATUS_CHANGED);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleRoomJoined(User *user, const std::string &r, const std::string &nickname, const std::string &password) {
 	UserInfo userInfo = user->getUserInfo();
 	std::string message;
 	room.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_JOIN_ROOM);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
 	NetworkConversation *conv = new NetworkConversation(user->getConversationManager(), r, true);
 	conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
 	conv->setNickname(nickname);
+}
 	std::string message;
 	room.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LEAVE_ROOM);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(r);
 	if (!conv) {
 		return;
+	}
 	std::string message;
 	logout.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGOUT);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
 	c->users.remove(user);
 	if (c->users.size() == 0) {
 			std::string message;
 			buddy.SerializeToString(&message);
 			WRAP(message, type);
-			Client *c = (Client *) conv->getConversationManager()->getUser()->getData();
+			Backend *c = (Backend *) conv->getConversationManager()->getUser()->getData();
 			send(c->connection, message);
+		}
+	}
 	boost::shared_ptr<Swift::AttentionPayload> attentionPayload = msg->getPayload<Swift::AttentionPayload>();
 	if (attentionPayload) {
 		std::string message;
 		m.SerializeToString(&message);
 		WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_ATTENTION);
-		Client *c = (Client *) conv->getConversationManager()->getUser()->getData();
+		Backend *c = (Backend *) conv->getConversationManager()->getUser()->getData();
 		send(c->connection, message);
 		return;
+	}
 	if (!msg->getBody().empty()) {
 		std::string message;
 		m.SerializeToString(&message);
 		WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
-		Client *c = (Client *) conv->getConversationManager()->getUser()->getData();
+		Backend *c = (Backend *) conv->getConversationManager()->getUser()->getData();
 		send(c->connection, message);
+	}
+}
 void NetworkPluginServer::handleBuddyRemoved(Buddy *b) {
 	User *user = b->getRosterManager()->getUser();
@@ @@ -723,13 +723,13 @@ void NetworkPluginServer::handleBuddyRemoved(Buddy *b) { @@
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPayload &item) {
 	User *user = b->getRosterManager()->getUser();
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyAdded(Buddy *buddy, const Swift::RosterItemPayload &item) {
 	handleBuddyUpdated(buddy, item);
+}
 	std::string message;
 	vcard.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_VCARD);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleVCardRequired(User *user, const std::string &name, unsigned int id) {
 	pbnetwork::VCard vcard;
 	vcard.set_username(user->getJID().toBare());
 	std::string message;
 	vcard.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_VCARD);
-	Client *c = (Client *) user->getData();
+	Backend *c = (Backend *) user->getData();
 	send(c->connection, message);
+}
-void NetworkPluginServer::sendPing(Client *c) {
+void NetworkPluginServer::sendPing(Backend *c) {
 	std::string message;
 	pbnetwork::WrapperMessage wrap;
 	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PING);
 	wrap.SerializeToString(&message);
 	send(c->connection, message);
 	c->pongReceived = false;
 	LOG4CXX_INFO(logger, "PING to " << c);
+}
 NetworkPluginServer::Client *NetworkPluginServer::getFreeClient() {
 	NetworkPluginServer::Client *c = NULL;
 NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient() {
 	NetworkPluginServer::Backend *c = NULL;
 	bool spawnNew = false;
-	for (std::list<Client *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
+	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend")) {
 			if ((*it)->users.size() + 1 == CONFIG_INT(m_config, "service.users_per_backend")) {
 				spawnNew = true;
+			}
 			if (c == NULL) {
 				c = *it;

0 comments (0 inline, 0 general)