Rewrites, some more methods:

[hub.git] / application / hub / main / handler / message-types / class_BaseMessageHandler.php

diff --git a/application/hub/main/handler/message-types/class_BaseMessageHandler.php b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
index 5518e2e2cce5a283c0d98b527e15bc6e00378a7a..8c347b407567c4fa9fffe54c45d7fa3a847eabcc 100644 (file)
--- a/application/hub/main/handler/message-types/class_BaseMessageHandler.php
+++ b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
@@ -59,16 +59,15 @@ abstract class BaseMessageHandler extends BaseDataHandler {
         *
         * - session-id  (for finding the node's record together with below data)
         * - external-ip (hostname or IP number)
-        * - tcp-port    (TCP port for inbound connections)
+        * - listen-port (TCP/UDP listen port for inbound connections)
         *
         * @param       $messageArray   An array with all minimum message data
         * @return      void
-        * @todo        Add something more, e.g. spreading information over DHT
+        * @todo        Rewrite this to use DHT
         */
        protected function registerNodeByMessageData (array $messageData) {
                // Check if searchData has entries
                assert(count($this->searchData) > 0);
-               $this->debugOutput('messageData=' . print_r($messageData, true));
 
                // Get a wrapper instance
                $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_list_db_wrapper_class');
@@ -76,10 +75,16 @@ abstract class BaseMessageHandler extends BaseDataHandler {
                // Get a search criteria class
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
-               // Search for the node's session id and external IP/hostname + TCP port
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER: messageData=' . print_r($messageData, true));
+
+               // Search for the node's session id and external IP/hostname + TCP/UDP listen port
                foreach ($this->searchData as $key) {
                        // Debug message
-                       //* DEBUG: */ $this->debugOutput('MESSAGE-HANDLER: messageData=' . print_r($messageData,true));
+                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER: messageData[' . $key . ']=' . $messageData[$key]);
+
+                       // Is it there?
+                       assert(isset($messageData[$key]));
 
                        // Add criteria
                        $searchInstance->addCriteria('node_' . str_replace('my-', '', $key), $messageData[$key]);