X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fcontainer%2Fsocket%2Fclass_SocketContainer.php;h=07058d582a6fc4cfd8860f8ffd40140c806f8901;hb=5203f9bd014ad46fbc7ee54e7223dcd46e14e3b4;hp=cfa66f0d535373c3822671b5920db4708bb1b04b;hpb=18fd6edc11a36a3e52870f1946499e448a863ea7;p=core.git

diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php
index cfa66f0d..07058d58 100644
--- 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, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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,20 +36,49 @@ 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	$infoInstance		An instance of a  ShareableInfo class
 	 * @param	$packageData		Raw package data
 	 * @return	$containerInstance	An instance of this Container class
 	 */
-	public final static function createSocketContainer ($socketResource, ProtocolHandler $protocolInstance, array $packageData) {
+	public static final function createSocketContainer ($socketResource, ShareableInfo $infoInstance = 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_HASH]);
+
+		// Debug message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']:socketResource=' . $socketResource . ',packageData='.print_r($packageData, TRUE));
+
+		// Is the info instance set?
+		if ($infoInstance instanceof ShareableInfo) {
+			// Get listener/helper from info class
+			$listenerInstance = $infoInstance->getListenerInstance();
+			$helperInstance = $infoInstance->getHelperInstance();
+
+			// Debug message
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: listenerInstance[]=' . gettype($listenerInstance));
+
+			// Is there a listener instance set?
+			if ($listenerInstance instanceof Listenable) {
+				// Debug message
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting listenerInstance=' . $listenerInstance->__toString() . ' ...');
+
+				// Set it here for later usage
+				$containerInstance->setListenerInstance($listenerInstance);
+			} elseif ($helperInstance instanceof ConnectionHelper) {
+				// Debug message
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting helperInstance=' . $helperInstance->__toString() . ' ...');
+
+				// Set it here for later usage
+				$containerInstance->setHelperInstance($helperInstance);
+			}
+		} // END - if
+
 		// Set the resource ...
 		$containerInstance->setSocketResource($socketResource);
 
-		// ..., protocol instance ...
-		$containerInstance->setProtocolInstance($protocolInstance);
-
 		// ... and package data
 		$containerInstance->setPackageData($packageData);
 
@@ -58,17 +87,37 @@ 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	$unl		A 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
-		$data = $this->getPackageData();
+		$packageData = $this->getPackageData();
+
+		// Debug message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: unl=' . $unl . ',packageData=' . print_r($packageData, TRUE));
+
+		// So, does both match?
+		$matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unl));
+
+		// Return result
+		return $matches;
+	}
+
+	/**
+	 * Checks whether the given socket matches with stored
+	 *
+	 * @param	$socketResource		A valid socket resource
+	 * @return	$matches			Whether given socket matches
+	 */
+	public final function ifSocketResourceMatches ($socketResource) {
+		// Debug message
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: 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;