]> git.mxchange.org Git - hub.git/blobdiff - application/hub/main/nodes/class_BaseHubNode.php
Continued with hub:
[hub.git] / application / hub / main / nodes / class_BaseHubNode.php
index 3a2be5ce3366e64acba669cff1d7b0713d62c3f0..7aa54834be2b47c24af8b7dcd4aadcea3cf9b692 100644 (file)
@@ -2,11 +2,11 @@
 /**
  * A general hub node class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseHubNode extends BaseHubSystem implements Updateable {
+class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
        /**
         * Node types
         */
@@ -33,8 +33,11 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
        // Exception constants
        const EXCEPTION_HUB_ALREADY_ANNOUNCED = 0xe00;
 
+       // Other constants
+       const OBJECT_LIST_SEPARATOR = ',';
+
        /**
-        * IP/port number of bootstrapping node
+        * IP/port number of bootstrap node
         */
        private $bootIpPort = '';
 
@@ -49,20 +52,25 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
        private $queueConnectorInstance = NULL;
 
        /**
-        * Whether this node is anncounced (KEEP ON false!)
+        * Whether this node is anncounced (keep on FALSE!)
         * @deprecated
         */
-       private $hubIsAnnounced = false;
+       private $hubIsAnnounced = FALSE;
+
+       /**
+        * Whether this hub is active (default: FALSE)
+        */
+       private $isActive = FALSE;
 
        /**
-        * Whether this hub is active (default: false)
+        * Whether this node accepts announcements (default: FALSE)
         */
-       private $isActive = false;
+       private $acceptAnnouncements = FALSE;
 
        /**
-        * Whether this node accepts announcements (default: false)
+        * Whether this node accepts DHT bootstrap requests (default: FALSE)
         */
-       private $acceptAnnouncements = false;
+       private $acceptDhtBootstrap = FALSE;
 
        /**
         * Protected constructor
@@ -74,6 +82,18 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                // Call parent constructor
                parent::__construct($className);
 
+               // Get a wrapper instance
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('node_info_db_wrapper_class');
+
+               // Set it here
+               $this->setWrapperInstance($wrapperInstance);
+
+               // Get a crypto instance
+               $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
+
+               // Set it here
+               $this->setCryptoInstance($cryptoInstance);
+
                // Init state which sets the state to 'init'
                $this->initState();
        }
@@ -84,13 +104,32 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @return      void
         */
        private function initState() {
-               /*
-                * Get the state factory and create the initial state, we don't need
-                * the state instance here
-                */
+               // Get the state factory and create the initial state.
                NodeStateFactory::createNodeStateInstanceByName('init', $this);
        }
 
+       /**
+        * Generates a random string from various data inluding UUID if PECL
+        * extension uuid is installed.
+        *
+        * @param       $length                 Length of the random part
+        * @return      $randomString   Random string
+        * @todo        Make this code more generic and move it to CryptoHelper or
+        */
+       protected function generateRamdomString ($length) {
+               // Get an RNG instance
+               $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
+
+               // Generate a pseudo-random string
+               $randomString = $rngInstance->randomString($length) . ':' . $this->getBootIpPort() . ':' . $this->getRequestInstance()->getRequestElement('mode');
+
+               // Add UUID for even more entropy for the hasher
+               $randomString .= $this->getCryptoInstance()->createUuid();
+
+               // Return it
+               return $randomString;
+       }
+
        /**
         * Generates a private key and hashes it (for speeding up things)
         *
@@ -98,24 +137,18 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @return void
         */
        private function generatePrivateKeyAndHash (LocalSearchCriteria $searchInstance) {
-               // Get an RNG instance (Random Number Generator)
+               // Get an RNG instance
                $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
 
                // Generate a pseudo-random string
-               $randomString = $rngInstance->randomString(255) . ':' . $this->getBootIpPort()  . ':' . $this->getRequestInstance()->getRequestElement('mode');
-
-               // Get a crypto instance
-               $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
+               $randomString = $rngInstance->randomString(255);
 
                // Hash and encrypt the string so we become a node id (also documented as "hub id")
-               $this->setPrivateKey($cryptoInstance->encryptString($randomString));
-               $this->setPrivateKeyHash($cryptoInstance->hashString($this->getPrivateKey()));
-
-               // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_info_db_wrapper_class');
+               $this->setPrivateKey($this->getCryptoInstance()->encryptString($randomString));
+               $this->setPrivateKeyHash($this->getCryptoInstance()->hashString($this->getPrivateKey()));
 
                // Register the node id with our wrapper
-               $wrapperInstance->registerPrivateKey($this, $this->getRequestInstance(), $searchInstance);
+               $this->getWrapperInstance()->registerPrivateKey($this, $this->getRequestInstance(), $searchInstance);
 
                // Output message
                self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Created new private key with hash: ' . $this->getPrivateKeyHash() . '');
@@ -169,14 +202,14 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
        }
 
        /**
-        * Checks whether the given IP address matches one of the bootstrapping nodes
+        * Checks whether the given IP address matches one of the bootstrap nodes
         *
         * @param       $remoteAddr             IP address to checkout against our bootstrapping list
         * @return      $isFound                Whether the IP is found
         */
-       protected function ifAddressMatchesBootstrappingNodes ($remoteAddr) {
+       protected function ifAddressMatchesBootstrapNodes ($remoteAddr) {
                // By default nothing is found
-               $isFound = false;
+               $isFound = FALSE;
 
                // Run through all configured IPs
                foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $ipPort) {
@@ -186,13 +219,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                        // Does it match?
                        if ($ipPortArray[0] == $remoteAddr) {
                                // Found it!
-                               $isFound = true;
+                               $isFound = TRUE;
 
                                // Remember the port number
                                $this->bootIpPort = $ipPort;
 
                                // Output message
-                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: ' . __FUNCTION__ . '[' . __LINE__ . ']: IP matches remote address ' . $ipPort . '.');
+                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: ' . __FUNCTION__ . '[' . __METHOD__ . ':' . __LINE__ . ']: IP matches remote address ' . $ipPort . '.');
 
                                // Stop further searching
                                break;
@@ -201,13 +234,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                                 * IP matches listen address. At this point we really don't care
                                 * if we can really listen on that address
                                 */
-                               $isFound = true;
+                               $isFound = TRUE;
 
                                // Remember the port number
                                $this->bootIpPort = $ipPort;
 
                                // Output message
-                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: ' . __FUNCTION__ . '[' . __LINE__ . ']: IP matches listen address ' . $ipPort . '.');
+                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: ' . __FUNCTION__ . '[' . __METHOD__ . ':' . __LINE__ . ']: IP matches listen address ' . $ipPort . '.');
 
                                // Stop further searching
                                break;
@@ -231,7 +264,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                // Output all lines
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' mode active');
-               self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 Hub Developer Team');
+               self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2014 Hub Developer Team');
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
                self::createDebugInstance(__CLASS__)->debugOutput('This is free software, and you are welcome to redistribute it under certain');
@@ -249,45 +282,25 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @return      void
         */
        public function bootstrapAcquireNodeId (Requestable $requestInstance, Responseable $responseInstance) {
-               // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_info_db_wrapper_class');
-
-               // Now get a search criteria instance
-               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
-
-               // Search for the node number one which is hard-coded the default
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR, 1);
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_TYPE, $this->getRequestInstance()->getRequestElement('mode'));
-               $searchInstance->setLimit(1);
-
-               // Get a result back
-               $resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
-
-               // Is it valid?
-               if ($resultInstance->next()) {
-                       // Save the result instance in this class
-                       $this->setResultInstance($resultInstance);
-
+               // Is there a node id?
+               if ($this->getWrapperInstance()->ifNodeDataIsFound($this)) {
                        // Get the node id from result and set it
                        $this->setNodeId($this->getField(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_ID));
 
                        // Output message
                        self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Re-using found node-id: ' . $this->getNodeId() . '');
                } else {
-                       // Get an RNG instance (Random Number Generator)
+                       // Get an RNG instance
                        $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
 
                        // Generate a pseudo-random string
-                       $randomString = $rngInstance->randomString(255) . ':' . $this->getBootIpPort()  . ':' . $this->getRequestInstance()->getRequestElement('mode');
-
-                       // Get a crypto instance
-                       $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
+                       $randomString = $rngInstance->randomString(255);
 
                        // Hash and encrypt the string so we become a node id (also documented as "hub id")
-                       $this->setNodeId($cryptoInstance->hashString($cryptoInstance->encryptString($randomString)));
+                       $this->setNodeId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString)));
 
                        // Register the node id with our wrapper
-                       $wrapperInstance->registerNodeId($this, $this->getRequestInstance());
+                       $this->getWrapperInstance()->registerNodeId($this, $this->getRequestInstance());
 
                        // Output message
                        self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Created new node-id: ' . $this->getNodeId() . '');
@@ -304,27 +317,22 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Search for the node number one which is hard-coded the default
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR, 1);
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_TYPE, $this->getRequestInstance()->getRequestElement('mode'));
+               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR  , 1);
+               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, $this->getRequestInstance()->getRequestElement('mode'));
+               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_ID  , $this->getNodeId());
                $searchInstance->setLimit(1);
 
-               // Get an RNG instance
-               $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
-
-               // Generate a pseudo-random string
-               $randomString = $rngInstance->randomString(255) . ':' . $this->getBootIpPort() . ':' . $this->getRequestInstance()->getRequestElement('mode');
+               // Remember it for later usage
+               $this->setSearchInstance($searchInstance);
 
-               // Get a crypto instance
-               $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
+               // Get a random string
+               $randomString = $this->generateRamdomString(255);
 
                // Hash and encrypt the string so we become a "node id" aka Hub-Id
-               $this->setSessionId($cryptoInstance->hashString($cryptoInstance->encryptString($randomString)));
-
-               // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_info_db_wrapper_class');
+               $this->setSessionId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString)));
 
                // Register the node id with our wrapper
-               $wrapperInstance->registerSessionId($this, $this->getRequestInstance(), $searchInstance);
+               $this->getWrapperInstance()->registerSessionId($this, $this->getRequestInstance(), $searchInstance);
 
                // Output message
                self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Created new session-id: ' . $this->getSessionId() . '');
@@ -339,25 +347,8 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @return      void
         */
        public function bootstrapGeneratePrivateKey () {
-               // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_info_db_wrapper_class');
-
-               // Now get a search criteria instance
-               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
-
-               // Search for the node number one which is hard-coded the default
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR, 1);
-               $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_TYPE, $this->getRequestInstance()->getRequestElement('mode'));
-               $searchInstance->setLimit(1);
-
-               // Get a result back
-               $resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
-
                // Is it valid?
-               if ($resultInstance->next()) {
-                       // Save the result instance in this class
-                       $this->setResultInstance($resultInstance);
-
+               if ($this->getWrapperInstance()->ifNodeDataIsFound($this)) {
                        // Is the element set?
                        if (is_null($this->getField(NodeInformationDatabaseWrapper::DB_COLUMN_PRIVATE_KEY))) {
                                /*
@@ -365,7 +356,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                                 * "tables". This allows a smooth update for the underlaying
                                 * database table.
                                 */
-                               $this->generatePrivateKeyAndHash($searchInstance);
+                               $this->generatePrivateKeyAndHash($this->getSearchInstance());
                        } else {
                                // Get the node id from result and set it
                                $this->setPrivateKey(base64_decode($this->getField(NodeInformationDatabaseWrapper::DB_COLUMN_PRIVATE_KEY)));
@@ -379,35 +370,10 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                         * Generate it in a private method (no confusion with 'private
                         * method access' and 'private key' here! ;-)).
                         */
-                       $this->generatePrivateKeyAndHash($searchInstance);
+                       $this->generatePrivateKeyAndHash($this->getSearchInstance());
                }
        }
 
-       /**
-        * Initializes queues which every node needs
-        *
-        * @return      void
-        */
-       protected function initGenericQueues () {
-               // Debug message
-               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Initialize queues: START');
-
-               // Set the query connector instance
-               $this->setQueryConnectorInstance(ObjectFactory::createObjectByConfiguredName('query_connector_class', array($this)));
-
-               // Run a test query
-               $this->getQueryConnectorInstance()->doTestQuery();
-
-               // Set the queue connector instance
-               $this->setQueueConnectorInstance(ObjectFactory::createObjectByConfiguredName('queue_connector_class', array($this)));
-
-               // Run a test queue
-               $this->getQueueConnectorInstance()->doTestQueue();
-
-               // Debug message
-               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Initialize queues: FINISHED');
-       }
-
        /**
         * Adds hub data elements to a given dataset instance
         *
@@ -415,10 +381,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @param       $requestInstance        An instance of a Requestable class
         * @return      void
         */
-       public function addElementsToDataSet (StoreableCriteria $criteriaInstance, Requestable $requestInstance) {
+       public function addElementsToDataSet (StoreableCriteria $criteriaInstance, Requestable $requestInstance = NULL) {
+               // Make sure request instance is set as it is not optional
+               assert($requestInstance instanceof Requestable);
+
                // Add node number and type
-               $criteriaInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR, 1);
-               $criteriaInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_TYPE, $requestInstance->getRequestElement('mode'));
+               $criteriaInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR  , 1);
+               $criteriaInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, $requestInstance->getRequestElement('mode'));
 
                // Add the node id
                $criteriaInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_ID, $this->getNodeId());
@@ -481,24 +450,24 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         *
         * @param       $taskInstance   The task instance running this announcement
         * @return      void
-        * @throws      HubAlreadyAnnouncedException    If this hub is already announced
+        * @throws      NodeAlreadyAnnouncedException   If this hub is already announced
         * @todo        Change the first if() block to check for a specific state
         */
-       public function announceSelfToUpperNodes (Taskable $taskInstance) {
+       public function announceToUpperNodes (Taskable $taskInstance) {
                // Is this hub node announced?
-               if ($this->hubIsAnnounced === true) {
+               if ($this->hubIsAnnounced === TRUE) {
                        // Already announced!
-                       throw new HubAlreadyAnnouncedException($this, self::EXCEPTION_HUB_ALREADY_ANNOUNCED);
+                       throw new NodeAlreadyAnnouncedException($this, self::EXCEPTION_HUB_ALREADY_ANNOUNCED);
                } // END - if
 
                // Debug output
                self::createDebugInstance(__CLASS__)->debugOutput('HUB-Announcement: START (taskInstance=' . $taskInstance->__toString(). ')');
 
                // Get a helper instance
-               $helperInstance = ObjectFactory::createObjectByConfiguredName('hub_announcement_helper_class');
+               $helperInstance = ObjectFactory::createObjectByConfiguredName('node_announcement_helper_class');
 
                // Load the announcement descriptor
-               $helperInstance->loadDescriptorXml();
+               $helperInstance->loadDescriptorXml($this);
 
                // Compile all variables
                $helperInstance->getTemplateInstance()->compileConfigInVariables();
@@ -507,7 +476,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                $helperInstance->sendPackage($this);
 
                // Change the state, this should be the last line except debug output
-               $this->getStateInstance()->nodeAnnouncedToUpperHubs();
+               $this->getStateInstance()->nodeAnnouncingToUpperHubs();
 
                // Debug output
                self::createDebugInstance(__CLASS__)->debugOutput('HUB-Announcement: FINISHED');
@@ -523,13 +492,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         */
        public function doSelfConnection (Taskable $taskInstance) {
                // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Self Connection: START (taskInstance=' . $taskInstance->__toString(). ')');
+               self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: Self Connection: START (taskInstance=' . $taskInstance->__toString(). ')');
 
                // Get a helper instance
-               $helperInstance = ObjectFactory::createObjectByConfiguredName('hub_self_connect_helper_class', array($this));
+               $helperInstance = ObjectFactory::createObjectByConfiguredName('node_self_connect_helper_class', array($this));
 
                // Load the descriptor (XML) file
-               $helperInstance->loadDescriptorXml();
+               $helperInstance->loadDescriptorXml($this);
 
                // Compile all variables
                $helperInstance->getTemplateInstance()->compileConfigInVariables();
@@ -538,12 +507,12 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                $helperInstance->sendPackage($this);
 
                // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Self Connection: FINISHED');
+               self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: Self Connection: FINISHED');
        }
 
        /**
         * Activates the hub by doing some final preparation and setting
-        * $hubIsActive to true
+        * $hubIsActive to TRUE.
         *
         * @param       $requestInstance        A Requestable class
         * @param       $responseInstance       A Responseable class
@@ -576,7 +545,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         */
        public function initializeListenerPool () {
                // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Initialize listener: START');
+               self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: Initialize listener: START');
 
                // Get a new pool instance
                $this->setListenerPoolInstance(ObjectFactory::createObjectByConfiguredName('listener_pool_class', array($this)));
@@ -591,13 +560,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                 * All nodes can now use the same configuration entry because it can be
                 * customized in config-local.php.
                 */
-               $listenerInstance->setListenPortByConfiguration('node_tcp_listen_port');
+               $listenerInstance->setListenPortByConfiguration('node_listen_port');
 
                // Initialize the listener
                $listenerInstance->initListener();
 
                // Get a decorator class
-               $decoratorInstance = ObjectFactory::createObjectByConfiguredName('hub_tcp_listener_class', array($listenerInstance));
+               $decoratorInstance = ObjectFactory::createObjectByConfiguredName('node_tcp_listener_class', array($listenerInstance));
 
                // Add this listener to the pool
                $this->getListenerPoolInstance()->addListener($decoratorInstance);
@@ -618,13 +587,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                 * All nodes can now use the same configuration entry because it can be
                 * customized in config-local.php.
                 */
-               $listenerInstance->setListenPortByConfiguration('node_udp_listen_port');
+               $listenerInstance->setListenPortByConfiguration('node_listen_port');
 
                // Initialize the listener
                $listenerInstance->initListener();
 
                // Get a decorator class
-               $decoratorInstance = ObjectFactory::createObjectByConfiguredName('hub_udp_listener_class', array($listenerInstance));
+               $decoratorInstance = ObjectFactory::createObjectByConfiguredName('node_udp_listener_class', array($listenerInstance));
 
                // Add this listener to the pool
                $this->getListenerPoolInstance()->addListener($decoratorInstance);
@@ -636,45 +605,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                $this->getListenerPoolInstance()->addListener($decoratorInstance);
 
                // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Initialize listener: FINISHED.');
-       }
-
-       /**
-        * Restores a previously stored node list from database
-        *
-        * @return      void
-        */
-       public function bootstrapRestoreNodeList () {
-               // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Restore node list: START');
-
-               // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_list_db_wrapper_class');
-
-               // Now get a search criteria instance
-               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
-
-               // Search for the node number zero which is hard-coded the default
-               // @TODO Add some criteria, e.g. if the node is active or so
-               //$searchInstance->addCriteria(NodeListDatabaseWrapper::DB_COLUMN_NODE_NR, 1);
-               //$searchInstance->addCriteria(NodeListDatabaseWrapper::DB_COLUMN_NODE_TYPE, $this->getRequestInstance()->getRequestElement('mode'));
-               //$searchInstance->setLimit(1);
-
-               // Get a result back
-               $resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
-
-               // Is it valid?
-               if ($resultInstance->next()) {
-                       $this->partialStub('Do something for restoring the list.');
-                       // Output message
-                       //self::createDebugInstance(__CLASS__)->debugOutput('HUB: ');
-               } else {
-                       // No previously saved node list found!
-                       self::createDebugInstance(__CLASS__)->debugOutput('HUB: No previously saved node list found. This is fine.');
-               }
-
-               // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Restore node list: FINISHED.');
+               self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: Initialize listener: FINISHED.');
        }
 
        /**
@@ -692,7 +623,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @param       $isActive       Whether the hub is active
         * @return      void
         */
-       public final function enableIsActive ($isActive = true) {
+       public final function enableIsActive ($isActive = TRUE) {
                $this->isActive = (bool) $isActive;
        }
 
@@ -703,54 +634,129 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         */
        public final function isAcceptingAnnouncements () {
                // Check it (this node must be active and not shutdown!)
-               $acceptAnnouncements = (($this->acceptAnnouncements === true) && ($this->isNodeActive()));
+               $acceptAnnouncements = (($this->acceptAnnouncements === TRUE) && ($this->isNodeActive()));
 
                // Return it
                return $acceptAnnouncements;
        }
 
+       /**
+        * Checks whether this node accepts DHT bootstrap requests
+        *
+        * @return      $acceptDhtBootstrap     Whether this node accepts DHT bootstrap requests
+        */
+       public final function isAcceptingDhtBootstrap () {
+               // Check it (this node must be active and not shutdown!)
+               $acceptDhtBootstrap = (($this->acceptDhtBootstrap === TRUE) && ($this->isNodeActive()));
+
+               // Return it
+               return $acceptDhtBootstrap;
+       }
+
        /**
         * Checks whether this node has attempted to announce itself
         *
         * @return      $hasAnnounced   Whether this node has attempted to announce itself
         * @todo        Add checking if this node has been announced to the sender node
         */
-       public function ifNodeHasAnnounced () {
+       public function ifNodeIsAnnouncing () {
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: ifNodeIsAnnouncing(): state=' . $this->getStateInstance()->getStateName());
+
                // Simply check the state of this node
-               $hasAnnounced = ($this->getStateInstance() instanceof NodeAnnouncedState);
+               $hasAnnounced = ($this->getStateInstance() instanceof NodeAnnouncingState);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: ifNodeIsAnnouncing(): hasAnnounced=' . intval($hasAnnounced));
 
                // Return it
                return $hasAnnounced;
        }
 
+       /**
+        * Checks whether this node has attempted to announce itself and completed it
+        *
+        * @return      $hasAnnouncementCompleted       Whether this node has attempted to announce itself and completed it
+        * @todo        Add checking if this node has been announced to the sender node
+        */
+       public function ifNodeHasAnnouncementCompleted () {
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: ifNodeHasAnnouncementCompleted(): state=' . $this->getStateInstance()->getStateName());
+
+               // Simply check the state of this node
+               $hasAnnouncementCompleted = ($this->getStateInstance() instanceof NodeAnnouncementCompletedState);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: ifNodeHasAnnouncementCompleted(): hasAnnouncementCompleted=' . intval($hasAnnouncementCompleted));
+
+               // Return it
+               return $hasAnnouncementCompleted;
+       }
+
        /**
         * Enables whether this node accepts announcements
         *
-        * @param       $acceptAnnouncements    Whether this node accepts announcements (default: true)
+        * @param       $acceptAnnouncements    Whether this node accepts announcements (default: TRUE)
         * @return      void
         */
-       protected final function enableAcceptingAnnouncements ($acceptAnnouncements = true) {
+       protected final function enableAcceptingAnnouncements ($acceptAnnouncements = TRUE) {
                $this->acceptAnnouncements = $acceptAnnouncements;
        }
-       
-       
+
        /**
-        * "Getter" for address:port combination
+        * Enables whether this node accepts DHT bootstrap requests
+        *
+        * @param       $acceptDhtBootstrap     Whether this node accepts DHT bootstrap requests (default: TRUE)
+        * @return      void
+        */
+       public final function enableAcceptDhtBootstrap ($acceptDhtBootstrap = TRUE) {
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: Enabling DHT bootstrap requests ...');
+               $this->acceptDhtBootstrap = $acceptDhtBootstrap;
+       }
+
+       /**
+        * Checks wether this node is accepting node-list requests
         *
-        * @param       $handlerInstance        An instance of a Networkable class
-        * @return      $addressPort            A address:port combination for this node
+        * @return      $acceptsRequest         Wether this node accepts node-list requests
         */
-       public final function getAddressPort (Networkable $handlerInstance) {
-               // Construct config entry
-               $configEntry = 'node_' . $handlerInstance->getHandlerName() . '_listen_port';
+       public function isAcceptingNodeListRequests () {
+               /*
+                * Only 'regular' nodes does not accept such requests, checking
+                * HubRegularNode is faster, but if e.g. HubRegularI2PNode will be
+                * added then the next check will be TRUE.
+                */
+               $acceptsRequest = ((!$this instanceof HubRegularNode) && ($this->getRequestInstance()->getRequestElement('mode') != self::NODE_TYPE_REGULAR));
+
+               // Return it
+               return $acceptsRequest;
+       }
 
+       /**
+        * "Getter" for address:port combination
+        *
+        * @return      $addressPort    A address:port combination for this node
+        */
+       public final function getAddressPort () {
                // Get IP and port
-               $addressPort = $this->getConfigInstance()->detectServerAddress() . ':' . $this->getConfigInstance()->getConfigEntry($configEntry);
+               $addressPort = $this->getConfigInstance()->detectServerAddress() . ':' . $this->getConfigInstance()->getConfigEntry('node_listen_port');
 
                // Return it
                return $addressPort;
        }
 
+       /**
+        * "Getter" for address:port array
+        *
+        * @return      $addressPortArray       An array of a address:port combination for this node
+        */
+       public final function getAddressPortArray () {
+               // Get IP and port
+               $addressPortArray = explode(':', $this->getAddressPort());
+
+               // Return it
+               return $addressPortArray;
+       }
+
        /**
         * Updates/refreshes node data (e.g. status).
         *
@@ -765,19 +771,60 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
        /**
         * Handles message answer by given data array
         *
-        * @param       $messageData    A valid answer message data array
+        * @param       $messageData            A valid answer message data array
+        * @param       $packageInstance        An instance of a Receivable class
         * @return      void
         * @todo        Handle thrown exception
         */
-       public function handleAnswerStatusByMessageData (array $messageData) {
+       public function handleAnswerStatusByMessageData (array $messageData, Receivable $packageInstance) {
+               // Is it not empty?
+               assert(!empty($messageData[BaseXmlAnswerTemplateEngine::ANSWER_STATUS]));
+
                // Construct configuration entry for handling class' name
-               $classConfigEntry = strtolower($messageData[NetworkPackage::MESSAGE_ARRAY_TYPE] . '_status_' . $messageData[XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_ANSWER_STATUS]) . '_handler_class';
+               $classConfigEntry = strtolower($messageData[NetworkPackage::MESSAGE_ARRAY_TYPE] . '_status_' . $messageData[BaseXmlAnswerTemplateEngine::ANSWER_STATUS]) . '_handler_class';
 
                // Try to get a class
                $handlerInstance = ObjectFactory::createObjectByConfiguredName($classConfigEntry);
 
                // Handle it there
-               $handlerInstance->handleAnswerMessageData($messageData);
+               $handlerInstance->handleAnswerMessageData($messageData, $packageInstance);
+       }
+
+       /**
+        * "Getter" for an array of all accepted object types
+        *
+        * @return      $objectList             Array of all accepted object types
+        */
+       public function getListFromAcceptedObjectTypes () {
+               // Get registry instance
+               $objectRegistryInstance = ObjectTypeRegistryFactory::createObjectTypeRegistryInstance();
+
+               // Get all entries
+               $objectList = $objectRegistryInstance->getEntries(XmlObjectRegistryTemplateEngine::OBJECT_TYPE_DATA_NAME);
+
+               // ... and return it
+               return $objectList;
+       }
+
+       /**
+        * Adds all required elements from given array into data set instance
+        *
+        * @param       $dataSetInstance        An instance of a StoreableCriteria class
+        * @param       $nodeData                       An array with valid node data
+        * @return      void
+        */
+       public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $nodeData) {
+               // Add all data the array provides
+               foreach (NodeDistributedHashTableDatabaseWrapper::getAllElements() as $element) {
+                       // Is the element there?
+                       if (isset($nodeData[$element])) {
+                               // Add it
+                               $dataSetInstance->addCriteria($element, $nodeData[$element]);
+                       } else {
+                               // Output warning message
+                               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE[' . __METHOD__ . ':' . __LINE__ . ']: addArrayToDataSet(): Element ' . $element . ' not found in nodeData array.');
+                       }
+               } // END - foreac
        }
 }