From 85110eade8afee981ba2ddc447b563ab5626dc5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 7 Jul 2009 19:38:41 +0000 Subject: [PATCH] Listeners are now intialized in a simple loop --- .../hub/main/nodes/class_BaseHubNode.php | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index 909343ea3..0823e5bc4 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -333,31 +333,21 @@ class BaseHubNode extends BaseHubSystem implements Updateable { // Get a new pool instance $this->listenerPoolInstance = ObjectFactory::createObjectByConfiguredName('listener_pool_class', array($this)); - // Initialize the TCP listener - $listenerInstance = ObjectFactory::createObjectByConfiguredName('tcp_listener_class', array($this)); + // Initialize both listeners + foreach (array('tcp', 'udp') as $protocol) { + // Get an instance + $listenerInstance = ObjectFactory::createObjectByConfiguredName($protocol . '_listener_class', array($this)); - // Setup address and port - $listenerInstance->setListenAddressByConfiguration('node_listen_addr'); - $listenerInstance->setListenPortByConfiguration('node_tcp_listen_port'); + // Setup address and port + $listenerInstance->setListenAddressByConfiguration('node_listen_addr'); + $listenerInstance->setListenPortByConfiguration('node_' . $protocol . '_listen_port'); - // Initialize the listener - $listenerInstance->initListener(); + // Initialize the listener + $listenerInstance->initListener(); - // Add this listener to the pool - $this->listenerPoolInstance->addListener($listenerInstance); - - // Initialize the UDP listener - $listenerInstance = ObjectFactory::createObjectByConfiguredName('udp_listener_class', array($this)); - - // Setup address and port - $listenerInstance->setListenAddressByConfiguration('node_listen_addr'); - $listenerInstance->setListenPortByConfiguration('node_udp_listen_port'); - - // Initialize the listener - $listenerInstance->initListener(); - - // Add this listener to the pool - $this->listenerPoolInstance->addListener($listenerInstance); + // Add this listener to the pool + $this->listenerPoolInstance->addListener($listenerInstance); + } // END - foreach } } -- 2.39.5