From 0534fde4a9d9b37ab13f1218cf6e308acec8e078 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 25 Oct 2014 13:11:40 +0200 Subject: [PATCH] Upcoming rewrite to universal node locator (UNL) instead of "hard-wired" ip:port combination. This change is only a name change of variables and does currently hurt or change nothing. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../container/socket/class_SocketContainer.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php index 1b3c997f..4b5ab63c 100644 --- a/inc/classes/main/container/socket/class_SocketContainer.php +++ b/inc/classes/main/container/socket/class_SocketContainer.php @@ -65,20 +65,20 @@ class SocketContainer extends BaseContainer implements Registerable { } /** - * Checks whether the given address (IP) matches with the one from the socket resource + * Checks whether the given universal node locator matches with the one from package data * - * @param $addressPort The address:port (IP to check - * @return $matches Whether $address matches with the one from socket resource + * @param $unl The an universal node locator + * @return $matches Whether $address matches with the one from package data */ - public final function ifAddressMatches ($addressPort) { + public final function ifAddressMatches ($unl) { // Get current package data $packageData = $this->getPackageData(); // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: addressPort=' . $addressPort . ',packageData=' . print_r($packageData, TRUE)); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: unl=' . $unl . ',packageData=' . print_r($packageData, TRUE)); // So, does both match? - $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $addressPort)); + $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unl)); // Return result return $matches; @@ -87,7 +87,7 @@ class SocketContainer extends BaseContainer implements Registerable { /** * Checks whether the given socket matches with stored * - * @param $addressPort The address:port (IP to check + * @param $unl The an universal node locator * @return $matches Whether given socket matches */ public final function ifSocketResourceMatches ($socketResource) { -- 2.30.2