Added template class for entries in a request-node-list

[hub.git] / application / hub / main / discovery / package / class_PackageRecipientDiscovery.php

diff --git a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
index 3b12418dd1a7d68e756f88f2bfbc32b4e46498b7..896f5b4c6bcc50b5ab1b8ac3b5edcce440ac100f 100644 (file)
--- a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
+++ b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
@@ -62,9 +62,9 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
                // We do some rudimentary checks but this might be a bit ugly
                switch ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]) {
                        // All upper hubs, these are currently the bootstrap nodes and later on prepended list-nodes
-                       case NetworkPackage::NETWORK_TARGET_UPPER_HUBS:
+                       case NetworkPackage::NETWORK_TARGET_UPPER_NODES:
                                // Get all bootstrap nodes
-                               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $node) {
+                               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $ipPort) {
                                        // Is maximum reached?
                                        if ($this->getListInstance()->count() == $this->getConfigInstance()->getConfigEntry('package_recipient_max_count')) {
                                                // Debug message
@@ -75,10 +75,10 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
                                        } // END - if
 
                                        // Debug message
-                                       /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DISCOVERY: Adding node ' . $node . ' as recipient.');
+                                       /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DISCOVERY: Adding node ' . $ipPort . ' as recipient.');
 
                                        // Add the entry
-                                       $this->getListInstance()->addEntry('ip_port', $node);
+                                       $this->getListInstance()->addEntry('ip_port', $ipPort);
                                } // END - foreach
                                break;
 
@@ -129,12 +129,12 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
        /**
         * Tries to discover all recipients by given decoded package data.
         *
-        * @param       $decodedData    Decoded raw package data array
+        * @param       $decodedData    Raw raw package data array
         * @return      void
         * @todo        Add some validation of recipient field, e.g. ip:port is found
         * @todo        The if() does only check for TCP, not UDP, e.g. try to get a $handlerInstance here
         */
-       public function discoverDecodedRecipients (array $decodedData) {
+       public function discoverRawRecipients (array $decodedData) {
                // First clear all recipients
                $this->clearRecipients();