Updated 'core'.

[hub.git] / application / hub / main / dht / node / class_NodeDhtFacade.php

diff --git a/application/hub/main/dht/node/class_NodeDhtFacade.php b/application/hub/main/dht/node/class_NodeDhtFacade.php
index a4b291f6d752b04916805e63bfc1a6d5029fc4e7..18d9addbd19bc3ff8ffb6923a430cd0fe35f6a6f 100644 (file)
--- a/application/hub/main/dht/node/class_NodeDhtFacade.php
+++ b/application/hub/main/dht/node/class_NodeDhtFacade.php
@@ -4,7 +4,7 @@
  *
  * @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 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -139,7 +139,6 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable {
 
                // Make sure the result instance is valid
                assert($resultInstance instanceof SearchableResult);
-               assert($resultInstance->valid());
 
                // Is the next entry valid?
                if (($resultInstance->valid()) && ($resultInstance->next())) {
@@ -159,23 +158,23 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable {
         * following data must always be present:
         *
         * - session-id  (for finding the node's record together with below data)
-        * - external-ip (hostname or IP number)
+        * - external-address (hostname or IP number)
         * - listen-port (TCP/UDP listen port for inbound connections)
         *
         * @param       $messageArray           An array with all minimum message data
-        * @param       $handlerInstance        An instance of a Handleable class
+        * @param       $handlerInstance        An instance of a HandleableDataSet class
         * @param       $forceUpdate            Optionally force update, don't register (default: register if not found)
         * @return      void
         * @throws      NodeSessionIdVerficationException       If the node was not found and update is forced
         */
-       public function registerNodeByMessageData (array $messageData, Handleable $handlerInstance, $forceUpdate = FALSE) {
+       public function registerNodeByMessageData (array $messageData, HandleableDataSet $handlerInstance, $forceUpdate = FALSE) {
                // Get a search criteria class
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DHT-FACADE[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getPrintableState() . ',messageData=' . print_r($messageData, TRUE) . ',handlerInstance=' . $handlerInstance->__toString() . ',forceUpdate=' . intval($forceUpdate) . ',count(getSearchData())=' . count($handlerInstance->getSearchData()));
 
-               // Search for the node's session id and external IP/hostname + TCP/UDP listen port
+               // Search for the node's session id and external address/hostname + TCP/UDP listen port
                foreach ($handlerInstance->getSearchData() as $key) {
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DHT-FACADE[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getPrintableState() . ',key=' . $key);
@@ -209,8 +208,7 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable {
                } else {
                        /*
                         * Do not register non-existent nodes here. This is maybe fatal,
-                        * caused by "stolen" session id and/or not matching IP
-                        * number/port combination.
+                        * caused by "stolen" session id and/or not matching address.
                         */
                        throw new NodeSessionIdVerficationException(array($this, $messageData), BaseHubSystem::EXCEPTION_NODE_SESSION_ID_NOT_VERIFYING);
                }
@@ -224,13 +222,13 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable {
         * object types except the node by given session id.
         *
         * @param       $messageData            An array with message data from a node_list request
-        * @param       $handlerInstance        An instance of a Handleable class
+        * @param       $handlerInstance        An instance of a HandleableDataSet class
         * @param       $excludeKey                     Array key which should be excluded
         * @param       $andKey                         Array of $separator-separated list of elements which all must match
         * @param       $separator                      Sepator char (1st parameter for explode() call)
         * @return      $nodeList                       An array with all found nodes
         */
-       public function queryLocalNodeListExceptByMessageData (array $messageData, Handleable $handlerInstance, $excludeKey, $andKey, $separator) {
+       public function queryLocalNodeListExceptByMessageData (array $messageData, HandleableDataSet $handlerInstance, $excludeKey, $andKey, $separator) {
                // Make sure both keys are there
                assert((isset($messageData[$excludeKey])) && (isset($messageData[$andKey])));