The protocol handler was mostly not correct as a listener was really used here.

[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 8b70b95421ac708e1e77dfa0ce6710056e3fac44..c78a56f232dc8c6dfa1681dcc1da30e4083078e4 100644 (file)
--- a/inc/classes/main/container/socket/class_SocketContainer.php
+++ b/inc/classes/main/container/socket/class_SocketContainer.php
@@ -2,11 +2,11 @@
 /**
  * A Socket Container class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,19 +36,26 @@ class SocketContainer extends BaseContainer implements Registerable {
         * Creates an instance of this Container class and prepares it for usage
         *
         * @param       $socketResource         A valid socket resource
-        * @param       $protocolInstance       A ProtocolHandler instance
+        * @param       $listenerInstance       A Listenable instance
         * @param       $packageData            Raw package data
         * @return      $containerInstance      An instance of this Container class
         */
-       public static final function createSocketContainer ($socketResource, ProtocolHandler $protocolInstance = NULL, array $packageData) {
+       public static final function createSocketContainer ($socketResource, Listenable $listenerInstance = NULL, array $packageData = array()) {
                // Get a new instance
                $containerInstance = new SocketContainer();
 
+               // Remove unneeded entries
+               unset($packageData[NetworkPackage::PACKAGE_DATA_CONTENT]);
+               unset($packageData[NetworkPackage::PACKAGE_DATA_SIGNATURE]);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']:socketResource=' . $socketResource . ',packageData='.print_r($packageData, TRUE));
+
                // Set the resource ...
                $containerInstance->setSocketResource($socketResource);
 
                // ..., protocol instance ...
-               $containerInstance->setProtocolInstance($protocolInstance);
+               $containerInstance->setListenerInstance($listenerInstance);
 
                // ... and package data
                $containerInstance->setPackageData($packageData);
@@ -58,17 +65,38 @@ class SocketContainer extends BaseContainer implements Registerable {
        }
 
        /**
-        * Checks wether 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                Wether $address matches with the one from socket resource
+        * @param       $unlInstance    An instance of a LocateableNode class
+        * @return      $matches                Whether $address matches with the one from package data
         */
-       public final function ifAddressMatches ($addressPort) {
+       public final function ifAddressMatches (LocateableNode $unlInstance) {
                // Get current package data
-               $data = $this->getPackageData();
+               $packageData = $this->getPackageData();
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: unlInstance=' . print_r($unlInstance, TRUE) . ',packageData=' . print_r($packageData, TRUE));
+
+               // So, does both match?
+               die(__METHOD__ . ': Unfinished.' . PHP_EOL);
+               $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unlInstance));
+
+               // Return result
+               return $matches;
+       }
+
+       /**
+        * Checks whether the given socket matches with stored
+        *
+        * @param       $unlInstance    An instance of a LocateableNode class
+        * @return      $matches                Whether given socket matches
+        */
+       public final function ifSocketResourceMatches ($socketResource) {
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER: socketResource[' . gettype($socketResource) . ']=' .$socketResource . ',storedResource[' . gettype($this->getSocketResource()) . ']=' . $this->getSocketResource());
 
                // So, does both match?
-               $matches = ((isset($data['recipient'])) && ($data['recipient'] === $addressPort));
+               $matches = ((is_resource($socketResource)) && ($socketResource === $this->getSocketResource()));
 
                // Return result
                return $matches;