From 36113efe8a09b00687bd85ba70daea56c0c93872 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 22 May 2010 17:51:18 +0000 Subject: [PATCH] Added constants for easier usage --- .../handler/network/class_BaseNetworkPackageHandler.php | 2 +- .../handler/network/tcp/class_TcpNetworkPackageHandler.php | 2 +- application/hub/main/package/class_NetworkPackage.php | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php b/application/hub/main/handler/network/class_BaseNetworkPackageHandler.php index 723fb7ff1..ef0946f5c 100644 --- 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 e24fbeb55..33b4d2a62 100644 --- 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 52b2c3ec9..838f4bf4c 100644 --- 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 */ -- 2.39.5