From ebde0e303284d742fcaf2f4e3c305d039b25aa10 Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Tue, 16 Dec 2014 15:00:45 +0100
Subject: [PATCH] class Network: added 'port' to ctor parameter.

---
 src/ebusd/baseloop.cpp | 2 +-
 src/ebusd/network.cpp  | 7 +++----
 src/ebusd/network.h    | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index 4e40cc4b..e2f2b786 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -73,7 +73,7 @@ BaseLoop::BaseLoop()
 	m_busHandler->start("bushandler");
 
 	// create network
-	m_network = new Network(A.getOptVal<bool>("localhost"), &m_netQueue);
+	m_network = new Network(A.getOptVal<bool>("localhost"), A.getOptVal<int>("port"), &m_netQueue);
 	m_network->start("network");
 }
 
diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp
index 4b36ad78..396ac70c 100644
--- a/src/ebusd/network.cpp
+++ b/src/ebusd/network.cpp
@@ -33,7 +33,6 @@
 using namespace std;
 
 extern Logger& L;
-extern Appl& A;
 
 int Connection::m_ids = 0;
 
@@ -144,13 +143,13 @@ void Connection::run()
 }
 
 
-Network::Network(const bool local, WQueue<NetMessage*>* netQueue)
+Network::Network(const bool local, const int port, WQueue<NetMessage*>* netQueue)
 	: m_netQueue(netQueue), m_listening(false)
 {
 	if (local == true)
-		m_tcpServer = new TCPServer(A.getOptVal<int>("port"), "127.0.0.1");
+		m_tcpServer = new TCPServer(port, "127.0.0.1");
 	else
-		m_tcpServer = new TCPServer(A.getOptVal<int>("port"), "0.0.0.0");
+		m_tcpServer = new TCPServer(port, "0.0.0.0");
 
 	if (m_tcpServer != NULL && m_tcpServer->start() == 0)
 		m_listening = true;
diff --git a/src/ebusd/network.h b/src/ebusd/network.h
index ef1867e5..39e45d12 100644
--- a/src/ebusd/network.h
+++ b/src/ebusd/network.h
@@ -181,9 +181,10 @@ public:
 	/**
 	 * @brief create a network instance and listening for incoming connections.
 	 * @param local true to accept connections only for local host.
+	 * @param port the tcp port to listening.
 	 * @param netQueue the remote queue for network messages.
 	 */
-	Network(const bool local, WQueue<NetMessage*>* netQueue);
+	Network(const bool local, const int port, WQueue<NetMessage*>* netQueue);
 
 	/**
 	 * @brief destructor.