1 files changed, 10 insertions, 1 deletions
diff --git a/Swiften/Network/BoostConnectionServer.cpp b/Swiften/Network/BoostConnectionServer.cpp
index 4c6403c..27a1008 100644
--- a/Swiften/Network/BoostConnectionServer.cpp
+++ b/Swiften/Network/BoostConnectionServer.cpp
@@ -10,25 +10,34 @@
 #include <boost/system/system_error.hpp>
 
 #include "Swiften/EventLoop/EventLoop.h"
 
 namespace Swift {
 
 BoostConnectionServer::BoostConnectionServer(int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(NULL) {
 }
 
+BoostConnectionServer::BoostConnectionServer(const HostAddress &address, int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : address_(address), port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(NULL) {
+}
 
 void BoostConnectionServer::start() {
 	try {
 		assert(!acceptor_);
-		acceptor_ = new boost::asio::ip::tcp::acceptor(
+		if (address_.isValid()) {
+			acceptor_ = new boost::asio::ip::tcp::acceptor(
+				*ioService_, 
+				boost::asio::ip::tcp::endpoint(address_.getRawAddress(), port_));
+		}
+		else {
+			acceptor_ = new boost::asio::ip::tcp::acceptor(
 				*ioService_, 
 				boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port_));
+		}
 		acceptNextConnection();
 	}
 	catch (const boost::system::system_error& e) {
 		if (e.code() == boost::asio::error::address_in_use) {
 			eventLoop->postEvent(boost::bind(boost::ref(onStopped), Conflict), shared_from_this());
 		}
 		else {
 			eventLoop->postEvent(boost::bind(boost::ref(onStopped), UnknownError), shared_from_this());
 		}