Added constants for easier usage

diff --git a/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php b/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php
index 723fb7ff156d4c3868a7f5eba8949d7f46f11bd5..ef0946f5cb95adeed9bc9887a0e71ed7fc4ad786 100644 (file)
--- a/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php
+++ b/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php
@@ -61,7 +61,7 @@ class BaseNetworkPackageHandler extends BaseHandler {
                $ownAddress = Registry::getRegistry()->getInstance('node')->getAddressPort($this);
 
                // Does it match?
-               $matches = ($ownAddress === $packageData[1]);
+               $matches = ($ownAddress === $packageData[NetworkPackage::INDEX_PACKAGE_RECIPIENT]);
 
                // Return result
                return $matches;

diff --git a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
index e24fbeb5541165d43fc1b8f49dbd896cda7dbcab..33b4d2a62a85ccbe1cffcf8aac1504173f93b884 100644 (file)
--- a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
+++ b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
@@ -71,7 +71,7 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
                if (count($packageData) < 3) {
                        // Not enougth fields in $packageData!
                        $this->setErrorCode(self::PACKAGE_ERROR_INCOMPLETE_DATA);
-               } elseif (count(explode(NetworkPackage::PACKAGE_MASK_SEPERATOR, $packageData[2])) < 2) {
+               } elseif (count(explode(NetworkPackage::PACKAGE_MASK_SEPERATOR, $packageData[NetworkPackage::INDEX_PACKAGE_CONTENT])) < 2) {
                        // Not entougth fields in content
                        $this->setErrorCode(self::PACKAGE_ERROR_INVALID_CONTENT);
                } elseif (!$this->ifRecipientMatchesOwnAddress($packageData)) {

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index 52b2c3ec985abefd9fe447f17a78967c509399d6..838f4bf4c9ef9b5d9863f0c5e18275dcb8b8f449 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -57,6 +57,13 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Registe
        const INDEX_TAGS                 = 2;
        const INDEX_CHECKSUM             = 3;
 
+       /**
+        * Array indexes for raw package array
+        */
+       const INDEX_PACKAGE_SENDER    = 0;
+       const INDEX_PACKAGE_RECIPIENT = 1;
+       const INDEX_PACKAGE_CONTENT   = 2;
+
        /**
         * Tags seperator
         */