libtransport.git Changeset - 2626035bc26c

Changeset - 2626035bc26c

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 14 years ago 2011-11-14 20:29:57
hanzz.k@gmail.com

Disconnect if ping is not received for 30 seconds

3 files changed with 15 insertions and 1 deletions:

backends/libpurple/main.cpp

include/transport/networkplugin.h

plugin/src/networkplugin.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -1227,12 +1227,17 @@ static gboolean disconnectMe(void *data) { @@
 	if (account) {
 		np->handleLogoutRequest(np->m_accounts[account], purple_account_get_username(account));
+	}
 	return FALSE;
+}
 static gboolean pingTimeout(void *data) {
 	np->checkPing();
 	return TRUE;
+}
 static void connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason, const char *text){
 	PurpleAccount *account = purple_connection_get_account(gc);
 	np->handleDisconnected(np->m_accounts[account], (int) reason, text ? text : "");
 	Dis *d = new Dis;
 	d->name = purple_account_get_username(account);
 	d->protocol = purple_account_get_protocol_id(account);
@@ @@ -1957,12 +1962,13 @@ int main(int argc, char **argv) { @@
 		initPurple();
 		m_sock = create_socket(host, port);
 		purple_input_add(m_sock, PURPLE_INPUT_READ, &transportDataReceived, NULL);
 		purple_timeout_add_seconds(30, pingTimeout, NULL);
 		np = new SpectrumNetworkPlugin(host, port);
 		bool libev = KEYFILE_STRING("service", "eventloop") == "libev";
 		GMainLoop *m_loop;
 #ifdef WITH_LIBEVENT

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -211,13 +211,14 @@ class NetworkPlugin { @@
 		virtual void handleFTPauseRequest(unsigned long ftID) {}
 		virtual void handleFTContinueRequest(unsigned long ftID) {}
 		virtual void handleExitRequest() { exit(1); }
 		void handleDataRead(std::string &data);
 		virtual void sendData(const std::string &string) {}
 		void checkPing();
 	private:
 		void handleLoginPayload(const std::string &payload);
 		void handleLogoutPayload(const std::string &payload);
 		void handleStatusChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload);

plugin/src/networkplugin.cpp

➞

Show inline comments

@@ @@ -550,12 +550,19 @@ void NetworkPlugin::handleDataRead(std::string &data) { @@
 void NetworkPlugin::send(const std::string &data) {
 	char header[4];
 	*((int*)(header)) = htonl(data.size());
 	sendData(std::string(header, 4) + data);
+}
 void NetworkPlugin::checkPing() {
 	if (m_pingReceived == false) {
 		handleExitRequest();
+	}
 	m_pingReceived = false;
+}
 void NetworkPlugin::sendPong() {
 	m_pingReceived = true;
 	std::string message;
 	pbnetwork::WrapperMessage wrap;
 	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PONG);
 	wrap.SerializeToString(&message);

0 comments (0 inline, 0 general)