X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fdiscovery%2Fpackage%2Fclass_PackageRecipientDiscovery.php;h=040c3083b65cf7e66da50295438ff3cfd85df532;hb=193e418fd76d06a69d5031b9702fa0c093c95cad;hp=7ed996ca300864f6f20e68db2b1dc2d22a245941;hpb=b52519b557d5c0b68eeb988a72770044c2737560;p=hub.git

diff --git a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
index 7ed996ca3..040c3083b 100644
--- a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
+++ b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.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 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -46,7 +46,7 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
 		$discoveryInstance->setListInstance($listInstance);
 
 		// Output debug message
-		$discoveryInstance->debugOutput('RECIPIENT-DISCOVERY: Initialized.');
+		self::createDebugInstance(__CLASS__)->debugOutput('RECIPIENT-DISCOVERY: Initialized.');
 
 		// Return the prepared instance
 		return $discoveryInstance;
@@ -59,48 +59,43 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
 	 * @return	void
 	 */
 	public function discoverRecipients (array $packageData) {
-		// We do some rudimentary checks but this might be a bit ugly
-		switch ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]) {
-			// All upper hubs, these are currently the bootstrap nodes and later on prepended list-nodes
-			case NetworkPackage::NETWORK_TARGET_UPPER_HUBS:
-				// Get all bootstrap nodes
-				foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $node) {
-					// Debug message
-					/* DEBUG: */ $this->debugOutput('DISCOVERY: Adding node ' . $node . ' as recipient.');
-
-					// Add the entry
-					$this->getListInstance()->addEntry('ip_port', $node);
-				} // END - foreach
-				break;
-
-			// The target 'self' is always the external IP address!
-			case NetworkPackage::NETWORK_TARGET_SELF:
-				// Determine IP or 'external_ip' if set
-				$ip = HubTools::determineOwnExternalIp();
-
-				// Get port and add it
-				$ipPort = $ip . ':' . $this->getConfigInstance()->getConfigEntry('node_' . $this->determineProtocolByPackageData($packageData) . '_listen_port');
-
-				// Add it to the list
-				$this->getListInstance()->addEntry('ip_port', $ipPort);
-				break;
-
-			// This may be a direct recipient (node's session id)
-			default:
-				$this->partialStub('Please add code handling recipients ' . $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
-				break;
-		} // END - switch
+		// This must be available
+		assert($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
+
+		// First try out the direct recipient (session id)
+		try {
+			// Get instance (should not break)
+			$recipientInstance = ObjectFactory::createObjectByConfiguredName('direct_recipient_class');
+
+			// Try to solve it
+			$recipientInstance->resolveRecipient($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT], $this->getListInstance());
+		} catch (FrameworkException $e) {
+			// Didn't work, so try the non-generic, depending recipient field itself (this may fail)
+			try {
+				// Try to find the right class
+				$recipientInstance = ObjectFactory::createObjectByConfiguredName(strtolower($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]) . '_recipient_class');
+
+				// And try to solve again
+				$recipientInstance->resolveRecipient('', $this->getListInstance());
+			} catch (FrameworkException $e) {
+				// Could not find class, what ever failed
+				$this->debugInstance($e->getMessage());
+			}
+		}
 	}
 
 	/**
 	 * Tries to discover all recipients by given decoded package data.
 	 *
-	 * @param	$decodedData	Decoded raw package data array
+	 * @param	$decodedData	Raw raw package data array
 	 * @return	void
 	 * @todo	Add some validation of recipient field, e.g. ip:port is found
 	 * @todo	The if() does only check for TCP, not UDP, e.g. try to get a $handlerInstance here
 	 */
-	public function discoverDecodedRecipients (array $decodedData) {
+	public function discoverRawRecipients (array $decodedData) {
+		// This must be available
+		assert($decodedData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
+
 		// First clear all recipients
 		$this->clearRecipients();
 
@@ -108,18 +103,18 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
 		$recipient = explode(':', $decodedData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
 
 		// Is the 'recipient' field same as this peer's IP?
-		if ((($recipient[0] == HubTools::determineOwnExternalIp()) && ($recipient[1] == $this->getConfigInstance()->getConfigEntry('node_tcp_listen_port'))) || ($recipient[0] == ConsoleTools::acquireSelfIPAddress())) {
+		if ((($recipient[0] == HubTools::determineOwnExternalIp()) && ($recipient[1] == $this->getConfigInstance()->getConfigEntry('node_listen_port'))) || ($recipient[0] == $this->getConfigInstance()->getServerAddress())) {
 			/*
-			 * Is same as own external IP+TCP port or internal IP, don't do anything here so other
+			 * Is same as own external IP + TCP/UDP listen port or internal IP, don't do anything here so other
 			 * classes found an empty recipient list for internal (own) handling
 			 * of the original content.
 			 */
 
 			// Debug output (may flood)
-			/* NOISY-DEBUG: */ $this->debugOutput('RECIPIENT-DISCOVERY: Recipient ' . $recipient[0] . ' matches own ip (' .  HubTools::determineOwnExternalIp() . ' or ' . ConsoleTools::acquireSelfIPAddress() . ')');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('RECIPIENT-DISCOVERY: Recipient ' . $recipient[0] . ' matches own ip (' .  HubTools::determineOwnExternalIp() . ' or ' . $this->getConfigInstance()->getServerAddress() . ')');
 		} else {
 			// Debug output (may flood)
-			/* NOISY-DEBUG: */ $this->debugOutput('RECIPIENT-DISCOVERY: Recipient ' . $recipient[0] . ' is different than own external ip (' .  HubTools::determineOwnExternalIp() . ') nor internal ip (' . ConsoleTools::acquireSelfIPAddress() . '), need to forward (not yet implemented)!');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('RECIPIENT-DISCOVERY: Recipient ' . $recipient[0] . ' is different than own external ip (' .  HubTools::determineOwnExternalIp() . ') nor internal ip (' . $this->getConfigInstance()->getServerAddress() . '), need to forward (not yet implemented)!');
 
 			// This package is to be delivered to someone else, so add it
 			$this->getListInstance()->addEntry('ip_port', $decodedData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);