Development of 'hub' project continued:

[hub.git] / application / hub / main / package / class_NetworkPackage.php

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index a116d7cecf2f246c509f37f7fa219976a72162d9..e060c32f9238c09f7145a067fb9d75f5e0c4ed19 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -132,9 +132,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
        const PACKAGE_RECIPIENT_SEPARATOR = ':';
 
        /**
-        * Network target (alias): 'upper hubs'
+        * Network target (alias): 'upper nodes'
         */
-       const NETWORK_TARGET_UPPER_HUBS = 'upper';
+       const NETWORK_TARGET_UPPER_NODES = 'upper';
 
        /**
         * Network target (alias): 'self'
@@ -249,17 +249,15 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                // Init all stacker
                $packageInstance->initStackers();
 
-               // Get a visitor instance for speeding up things
+               // Get a visitor instance for speeding up things and set it
                $visitorInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_monitor_visitor_class', array($packageInstance));
-
-               // Set it in this package
                $packageInstance->setVisitorInstance($visitorInstance);
 
-               // Get crypto instance and set it in this package
+               // Get crypto instance and set it, too
                $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
                $packageInstance->setCryptoInstance($cryptoInstance);
 
-               // Get a singleton package assembler instance from factory and set it here
+               // Get a singleton package assembler instance from factory and set it here, too
                $assemblerInstance = PackageAssemblerFactory::createAssemblerInstance($packageInstance);
                $packageInstance->setAssemblerInstance($assemblerInstance);
 
@@ -577,7 +575,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 
                // Is it the same?
                //$isSignatureValid = 
-               die(__METHOD__.': signature='.$signature.chr(10).',decodedArray='.print_r($decodedArray,true));
+               exit(__METHOD__.': signature='.$signature.chr(10).',decodedArray='.print_r($decodedArray,true));
        }
 
        /**
@@ -804,7 +802,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function handleIncomingRawData () {
+       public function handleIncomingDecodedData () {
                /*
                 * This method should only be called if decoded raw data is pending,
                 * so check it again.
@@ -909,11 +907,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function assembleRawDataToPackage () {
+       public function assembleDecodedDataToPackage () {
                // Make sure the raw decoded package data is handled
                assert($this->isIncomingRawDataHandled());
 
-               // Get current package content (an array with two elements; see handleIncomingRawData() for details)
+               // Get current package content (an array with two elements; see handleIncomingDecodedData() for details)
                $packageContent = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED);
 
                // Start assembling the raw package data array by chunking it
@@ -996,7 +994,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                 * @todo Unsupported feature of "signed" messages commented out
                if (!$this->isPackageSignatureValid($decodedArray)) {
                        // Is not valid, so throw an exception here
-                       die(__METHOD__ . ':INVALID SIG! UNDER CONSTRUCTION!' . chr(10));
+                       exit(__METHOD__ . ':INVALID SIG! UNDER CONSTRUCTION!' . chr(10));
                } // END - if
                */
 
@@ -1123,6 +1121,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                // Create a handler instance from given message type
                $handlerInstance = MessageTypeHandlerFactory::createMessageTypeHandlerInstance($messageArray[self::MESSAGE_ARRAY_TYPE]);
 
+               // Add type for later easier handling
+               $messageArray[self::MESSAGE_ARRAY_DATA][self::MESSAGE_ARRAY_TYPE] = $messageArray[self::MESSAGE_ARRAY_TYPE];
+
                // Handle message data
                $handlerInstance->handleMessageData($messageArray[self::MESSAGE_ARRAY_DATA], $this);
        }