libtransport.git Changeset - 6ec566375c7d

Changeset - 6ec566375c7d

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2012-03-09 17:13:32
hanzz.k@gmail.com

Send backend id back to main instance

4 files changed with 11 insertions and 0 deletions:

include/transport/networkpluginserver.h

include/transport/protocol.proto

plugin/cpp/networkplugin.cpp

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -47,24 +47,25 @@ class NetworkPluginServer { @@
 	public:
 		struct Backend {
 			int pongReceived;
 			std::list<User *> users;
 			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;
 			unsigned long res;
 			unsigned long init_res;
 			unsigned long shared;
 			bool acceptUsers;
 			bool longRun;
 			bool willDie;
 			std::string id;
 		};
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager, FileTransferManager *ftManager);
 		virtual ~NetworkPluginServer();
 		int getBackendCount() {
 			return m_clients.size();
+		}
 		const std::list<Backend *> &getBackends() {
 			return m_clients;

include/transport/protocol.proto

➞

Show inline comments

@@ @@ -97,24 +97,25 @@ message VCard { @@
+}
 message Status {
 	required string userName = 1;
 	required StatusType status = 3;
 	optional string statusMessage = 4;
+}
 message Stats {
 	required int32 res = 1;
 	required int32 init_res = 2;
 	required int32 shared = 3;
 	required string id = 4;
+}
 message File {
 	required string userName = 1;
 	required string buddyName = 2;
 	required string fileName = 3;
 	required int32 size = 4;
 	optional int32 ftID = 5;
+}
 message FileTransferData {
 	required int32 ftID = 1;

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -32,24 +32,30 @@ @@
 using namespace log4cxx;
 static LoggerPtr logger = Logger::getLogger("NetworkPlugin");
 namespace Transport {
 #define WRAP(MESSAGE, TYPE) 	pbnetwork::WrapperMessage wrap; \
 	wrap.set_type(TYPE); \
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
 template <class T> std::string stringOf(T object) {
 	std::ostringstream os;
 	os << object;
 	return (os.str());
+}
 NetworkPlugin::NetworkPlugin() {
 	m_pingReceived = false;
 	double shared;
 #ifndef WIN32
 	process_mem_usage(shared, m_init_res);
 #endif
+}
 NetworkPlugin::~NetworkPlugin() {
+}
@@ @@ -594,18 +600,20 @@ void NetworkPlugin::sendMemoryUsage() { @@
 #endif
 	double e_res;
 	double e_shared;
 	handleMemoryUsage(e_res, e_shared);
 	stats.set_res(res + e_res);
 	stats.set_shared(shared + e_shared);
 	std::string message;
 	stats.SerializeToString(&message);
 	stats.set_id(stringOf(getpid()));
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_STATS);
 	send(message);
+}
+}

src/networkpluginserver.cpp

➞

Show inline comments

+}
 void NetworkPluginServer::handleStatsPayload(Backend *c, const std::string &data) {
 	pbnetwork::Stats payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	c->res = payload.res();
 	c->init_res = payload.init_res();
 	c->shared = payload.shared();
 	c->id = payload.id();
+}
 void NetworkPluginServer::handleFTStartPayload(const std::string &data) {
 	pbnetwork::File payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;

0 comments (0 inline, 0 general)