Rewrites, some more methods:

[hub.git] / application / hub / main / nodes / boot / class_HubBootNode.php

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index b5bd0606902e4dc931c69841af651a9c284a7e7a..166cdb263330794c0727267831961bdbf4bdd36b 100644 (file)
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.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
  *
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class HubBootNode extends BaseHubNode implements NodeHelper {
+class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
        /**
         * Protected constructor
         *
@@ -38,7 +38,7 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
         * @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();
 
@@ -55,12 +55,60 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
         * should communicate with the bootstrap-nodes at this point.
         *
         * @return      void
-        * @todo        Implement this method
+        * @todo        add some more special bootstrap things for this boot node
         */
        public function doBootstrapping () {
-               // Call generic (parent) bootstrapping method
-               parent::doGenericBootstrapping();
-               $this->partialStub("Please implement this method.");
+               // Now check if the IP address matches one of the bootstrap nodes
+               if ($this->ifAddressMatchesBootstrappingNodes($this->getConfigInstance()->detectServerAddress())) {
+                       // Get our port from configuration
+                       $ourPort = $this->getConfigInstance()->getConfigEntry('node_listen_port');
+
+                       // Extract port
+                       $bootPort = substr($this->getBootIpPort(), -strlen($ourPort), strlen($ourPort));
+
+                       // Is the port the same?
+                       if ($bootPort == $ourPort) {
+                               // It is the same!
+                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: IP/port matches bootstrapping node ' . $this->getBootIpPort() . '.');
+
+                               // Now, does the mode match
+                               if ($this->getRequestInstance()->getRequestElement('mode') == self::NODE_TYPE_BOOT) {
+                                       // Output debug message
+                                       self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Our node is a valid bootstrapping node.');
+                               } else {
+                                       // Output warning
+                                       self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=' . BaseHubNode::NODE_TYPE_BOOT . ' detected.');
+                               }
+                       } else {
+                               // IP does match, but no port
+                               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
+                       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.');
+       }
+
+       /**
+        * Add some node-specific filters
+        *
+        * @return      void
+        */
+       public function addExtraNodeFilters () {
+               // Get the application instance from registry
+               $applicationInstance = Registry::getRegistry()->getInstance('app');
+
+               // Get the controller from the application
+               $controllerInstance = $applicationInstance->getControllerInstance();
+
+               // @TODO Add some filters here
+               $this->partialStub('Add some filters here.');
        }
 }