libtransport.git Changeset - df369e65d8f0

Changeset - df369e65d8f0

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 12 years ago 2013-01-30 18:59:14
hanzz.k@gmail.com

libtransport: support service.server also in server-mode

5 files changed with 14 insertions and 6 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/Server.h

spectrum/src/sample2.cfg

src/tests/userregistry.cpp

src/transport.cpp

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

@@ @@ -35,20 +35,22 @@ namespace Swift { @@
 Server::Server(
 		EventLoop* eventLoop,
 		NetworkFactories* networkFactories,
 		UserRegistry *userRegistry,
 		const JID& jid,
 		const std::string &address,
 		int port) :
 			userRegistry_(userRegistry),
 			port_(port),
 			eventLoop(eventLoop),
 			networkFactories_(networkFactories),
 			stopping(false),
 			selfJID(jid),
 			stanzaChannel_(){
 			stanzaChannel_(),
 			address_(address){
 	stanzaChannel_ = new ServerStanzaChannel();
 	iqRouter_ = new IQRouter(stanzaChannel_);
 	tlsFactory = NULL;
 	parserFactory_ = new PlatformXMLParserFactory();
+}
@@ @@ -60,13 +62,18 @@ Server::~Server() { @@
+}
 void Server::start() {
 	if (serverFromClientConnectionServer) {
 		return;
+	}
 	serverFromClientConnectionServer = networkFactories_->getConnectionServerFactory()->createConnectionServer(port_);
 	if (address_ == "0.0.0.0") {
 		serverFromClientConnectionServer = networkFactories_->getConnectionServerFactory()->createConnectionServer(port_);
+	}
 	else {
 		serverFromClientConnectionServer = networkFactories_->getConnectionServerFactory()->createConnectionServer(Swift::HostAddress(address_), port_);
+	}
 	serverFromClientConnectionServerSignalConnections.push_back(
 		serverFromClientConnectionServer->onNewConnection.connect(
 				boost::bind(&Server::handleNewClientConnection, this, _1)));
 // 	serverFromClientConnectionServerSignalConnections.push_back(
 // 		serverFromClientConnectionServer->onStopped.connect(
 // 				boost::bind(&Server::handleClientConnectionServerStopped, this, _1)));

include/Swiften/Server/Server.h

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ namespace Swift { @@
 	class StanzaChannel;
 	class IQRouter;
 	class TLSServerContextFactory;
 	class Server : public Entity {
 		public:
 			Server(EventLoop* eventLoop, NetworkFactories* networkFactories, UserRegistry *userRegistry, const JID& jid, int port);
+			Server(EventLoop* eventLoop, NetworkFactories* networkFactories, UserRegistry *userRegistry, const JID& jid, const std::string &address, int port);
 			~Server();
 			void start();
 			void stop();
 			int getPort() const {
@@ @@ -83,8 +83,9 @@ namespace Swift { @@
 			JID selfJID;
 			StanzaChannel *stanzaChannel_;
 			IQRouter *iqRouter_;
 			TLSServerContextFactory *tlsFactory;
 			CertificateWithKey::ref cert;
 			PlatformXMLParserFactory *parserFactory_;
 			std::string address_;
 	};
+}

spectrum/src/sample2.cfg

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ jid = localhost @@
 # Password used to connect the XMPP server in gateway mode.
 # In server mode, this option is ignored.
 password = secret
 # XMPP server to which Spectrum connects in gateway mode.
-# In server mode, this option is ignored.
+# To bind to all ipv4 interfaces, use server=0.0.0.0
 server = 127.0.0.1
 # XMPP server port.
 port = 5222
 # Interface on which Spectrum listens for backends.

src/tests/userregistry.cpp

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { @@
 			factories = new Swift::DummyNetworkFactories(loop);
 			userRegistry = new UserRegistry(cfg, factories);
 			userRegistry->onConnectUser.connect(bind(&UserRegistryTest::handleConnectUser, this, _1));
 			userRegistry->onDisconnectUser.connect(bind(&UserRegistryTest::handleDisconnectUser, this, _1));
 			server = new Swift::Server(loop, factories, userRegistry, "localhost", 5222);
+			server = new Swift::Server(loop, factories, userRegistry, "localhost", "0.0.0.0", 5222);
 			server->start();
 			connectionServer = server->getConnectionServer();
 			client1 = factories->getConnectionFactory()->createConnection();
 			dynamic_cast<Swift::DummyConnectionServer *>(connectionServer.get())->acceptConnection(client1);

src/transport.cpp

➞

Show inline comments

 	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(3000);
 	m_reconnectTimer->onTick.connect(bind(&Component::start, this));
 	if (CONFIG_BOOL(m_config, "service.server_mode")) {
 		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));
+		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_STRING(m_config, "service.server"), CONFIG_INT(m_config, "service.port"));
 		if (!CONFIG_STRING(m_config, "service.cert").empty()) {
 #ifndef _WIN32
 //TODO: fix
 			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));
 			LOG4CXX_INFO(logger, "SSLv23_server_method used.");
 			TLSServerContextFactory *f = new OpenSSLServerContextFactory();

0 comments (0 inline, 0 general)