The UNL (Universal Node Locator) is now handled in a class.

[core.git] / inc / classes / main / container / socket / class_SocketContainer.php

diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php
index 700f35fbf5b076e575725497b8b45e3e1b65af5e..0cefd859fc1a337ddfec1a16a0ebe38e3d2102b9 100644 (file)
--- 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
         *
        /**
         * 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
         */
         * @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
                // 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?
 
                // 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;
 
                // Return result
                return $matches;


@@ -87,7 +88,7 @@ class SocketContainer extends BaseContainer implements Registerable {
        /**
         * Checks whether the given socket matches with stored
         *
        /**
         * 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) {
         * @return      $matches                Whether given socket matches
         */
        public final function ifSocketResourceMatches ($socketResource) {