X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fnodes%2Fboot%2Fclass_HubBootNode.php;h=29f84ac7a54e55b89ec97cf31fc85b430ce60cae;hb=ce431b2aa2a797d132a19715f01d899fb7bb2c36;hp=ffd88f998f0e1c877034dcb794b6daf2b73ea9a3;hpb=fcdf2b3bc00500faa2aad3320fa511ef13cac667;p=hub.git

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index ffd88f998..29f84ac7a 100644
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -2,11 +2,11 @@
 /**
  * A hub-node class for the 'Boot' mode
  *
- * @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 Hub Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub 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
@@ -38,7 +38,7 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @return	$nodeInstance		An instance of this hub-node class
 	 */
-	public final static function createHubBootNode (Requestable $requestInstance) {
+	public static final function createHubBootNode (Requestable $requestInstance) {
 		// Get a new instance
 		$nodeInstance = new HubBootNode();
 
@@ -59,9 +59,9 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
 	 */
 	public function doBootstrapping () {
 		// Now check if the IP address matches one of the bootstrap nodes
-		if ($this->ifAddressMatchesBootstrappingNodes($this->getConfigInstance()->getServerAddress())) {
+		if ($this->ifAddressMatchesBootstrapNodes($this->getConfigInstance()->detectServerAddress())) {
 			// Get our port from configuration
-			$ourPort = $this->getConfigInstance()->getConfigEntry('node_tcp_listen_port');
+			$ourPort = $this->getConfigInstance()->getConfigEntry('node_listen_port');
 
 			// Extract port
 			$bootPort = substr($this->getBootIpPort(), -strlen($ourPort), strlen($ourPort));
@@ -69,53 +69,48 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
 			// Is the port the same?
 			if ($bootPort == $ourPort) {
 				// It is the same!
-				$this->debugOutput('BOOTSTRAP: IP/port matches bootstrapping node ' . $this->getBootIpPort() . '.');
+				self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: IP/port matches bootstrap node ' . $this->getBootIpPort() . '.');
 
-				// Now, does the mode match (should be 'boot'!)
-				if ($this->getRequestInstance()->getRequestElement('mode') == 'boot') {
+				// Now, does the mode match
+				if ($this->getRequestInstance()->getRequestElement('mode') == self::NODE_TYPE_BOOT) {
 					// Output debug message
-					$this->debugOutput('BOOTSTRAP: Our node is a valid bootstrapping node.');
+					self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Our node is a valid bootstrap node.');
 				} else {
 					// Output warning
-					$this->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
+					self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=' . BaseHubNode::NODE_TYPE_BOOT . ' detected.');
 				}
 			} else {
 				// IP does match, but no port
-				$this->debugOutput('BOOTSTRAP: WARNING: Our IP ' . $this->getConfigInstance()->getServerAddress() . ' does match a known bootstrap-node but not the port ' . $ourPort . '/' . $bootPort . '.');
+				self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: WARNING: Our IP ' . $this->getConfigInstance()->detectServerAddress() . ' does match a known bootstrap-node but not the port ' . $ourPort . '/' . $bootPort . '.');
 			}
 		} else {
 			// Node does not match any know bootstrap-node
-			$this->debugOutput('BOOTSTRAP: WARNING: Our IP ' . $this->getConfigInstance()->getServerAddress() . ' does not match any known bootstrap-nodes.');
+			self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: WARNING: Our IP ' . $this->getConfigInstance()->detectServerAddress() . ' does not match any known bootstrap-nodes.');
 		}
 
+		// Enable acceptance of announcements
+		$this->enableAcceptingAnnouncements();
+
 		// This might not be all...
 		$this->partialStub('Please implement more bootsrapping steps.');
 	}
 
 	/**
-	 * Initializes hub-specific queues
+	 * Add some node-specific filters
 	 *
 	 * @return	void
-	 * @todo	Unfinished method
 	 */
-	public function initQueues () {
-		// Call generic queues every hub may have, like the core queue
-		parent::initGenericQueues();
-		$this->partialStub('Please add some more hub-specific queues.');
-	}
+	public function addExtraNodeFilters () {
+		// Get the application instance from registry
+		$applicationInstance = Registry::getRegistry()->getInstance('app');
 
-	/**
-	 * Adds some node-specific filters to the filter chains
-	 *
-	 * @param	$requestInstance	A Requestable class
-	 * @param	$responseInstance	A Responseable class
-	 * @return	void
-	 * @todo	0%
-	 */
-	public function addExtraFilters (Requestable $requestInstance, Responseable $responseInstance) {
-		$this->partialStub('Please implement this method.');
+		// Get the controller from the application
+		$controllerInstance = $applicationInstance->getControllerInstance();
+
+		// @TODO Add some filters here
+		$this->partialStub('Add some filters here.');
 	}
 }
 
-//
+// [EOF]
 ?>