libtransport.git Changeset - 82d2492c99cb

Changeset - 82d2492c99cb

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

HanzZ - 13 years ago 2012-04-13 08:59:38
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

2 files changed with 18 insertions and 0 deletions:

include/transport/transport.h

src/transport.cpp

0 comments (0 inline, 0 general)

include/transport/transport.h

➞

Show inline comments

@@ @@ -37,6 +37,7 @@ @@
 #include "transport/config.h"
 #include "transport/factory.h"
 #include "transport/presenceoracle.h"
 #include <Swiften/Network/BoostConnectionServer.h>
 namespace Transport {
 	// typedef enum { 	CLIENT_FEATURE_ROSTERX = 2,
@@ @@ -165,6 +166,7 @@ namespace Transport { @@
 		private:
 			void handleConnected();
 			void handleConnectionError(const Swift::ComponentError &error);
 			void handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e);
 			void handlePresence(Swift::Presence::ref presence);
 			void handleDataRead(const Swift::SafeByteArray &data);
 			void handleDataWritten(const Swift::SafeByteArray &data);

src/transport.cpp

➞

Show inline comments

@@ @@ -203,6 +203,11 @@ void Component::start() { @@
 	else if (m_server) {
 		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server->start();
 		//Type casting to BoostConnectionServer since onStopped signal is not defined in ConnectionServer
 		//Ideally, onStopped must be defined in ConnectionServer
 		boost::dynamic_pointer_cast<Swift::BoostConnectionServer>(m_server->getConnectionServer())->onStopped.connect(boost::bind(&Component::handleServerStopped, this, _1));
 		// We're connected right here, because we're in server mode...
 		handleConnected();
+	}
@@ @@ -226,6 +231,17 @@ void Component::handleConnected() { @@
 	m_reconnectCount = 0;
+}
 void Component::handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e) {
 	if(e != NULL ) {
 		if(*e == Swift::BoostConnectionServer::Conflict)
 			LOG4CXX_INFO(logger, "Port "<< CONFIG_INT(m_config, "service.port") << " already in use! Stopping server..");
 		if(*e == Swift::BoostConnectionServer::UnknownError)
 			LOG4CXX_INFO(logger, "Unknown error occured! Stopping server..");
 		exit(1);
+	}
+}
 void Component::handleConnectionError(const ComponentError &error) {
 	onConnectionError(error);
 // 	if (m_reconnectCount == 2)

0 comments (0 inline, 0 general)