From def2a95907c40b71343061188f49ccbe1b8c7f20 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 11 Nov 2014 22:38:22 +0100 Subject: [PATCH] The UNL (Universal Node Locator) is now handled in a class. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../main/container/socket/class_SocketContainer.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php index 700f35fb..0cefd859 100644 --- a/inc/classes/main/container/socket/class_SocketContainer.php +++ b/inc/classes/main/container/socket/class_SocketContainer.php @@ -67,18 +67,19 @@ class SocketContainer extends BaseContainer implements Registerable { /** * Checks whether the given Universal Node Locator matches with the one from package data * - * @param $unl The an Universal Node Locator + * @param $unlInstance An instance of a LocateableNode class * @return $matches Whether $address matches with the one from package data */ - public final function ifAddressMatches ($unl) { + public final function ifAddressMatches (LocateableNode $unlInstance) { // Get current package data $packageData = $this->getPackageData(); // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: unl=' . $unl . ',packageData=' . print_r($packageData, TRUE)); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: unlInstance=' . print_r($unlInstance, TRUE) . ',packageData=' . print_r($packageData, TRUE)); // So, does both match? - $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unl)); + die(__METHOD__ . ': Unfinished.' . PHP_EOL); + $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unlInstance)); // Return result return $matches; @@ -87,7 +88,7 @@ class SocketContainer extends BaseContainer implements Registerable { /** * Checks whether the given socket matches with stored * - * @param $unl The an Universal Node Locator + * @param $unlInstance An instance of a LocateableNode class * @return $matches Whether given socket matches */ public final function ifSocketResourceMatches ($socketResource) { -- 2.39.5