New Exception added, registering of session ids added:

[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 ffd88f998f0e1c877034dcb794b6daf2b73ea9a3..f884f53bbc58a57dfb96f245c2c1cadf84609d5b 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, 2010 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -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->ifAddressMatchesBootstrappingNodes($this->getConfigInstance()->detectServerAddress())) {
                        // Get our port from configuration
-                       $ourPort = $this->getConfigInstance()->getConfigEntry('node_tcp_listen_port');
+                       $ourPort = $this->getConfigInstance()->getConfigEntry('boot_node_tcp_listen_port');
 
                        // Extract port
                        $bootPort = substr($this->getBootIpPort(), -strlen($ourPort), strlen($ourPort));
@@ -81,11 +81,11 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
                                }
                        } 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 . '.');
+                               $this->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.');
+                       $this->debugOutput('BOOTSTRAP: WARNING: Our IP ' . $this->getConfigInstance()->detectServerAddress() . ' does not match any known bootstrap-nodes.');
                }
 
                // This might not be all...
@@ -105,15 +105,19 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
        }
 
        /**
-        * Adds some node-specific filters to the filter chains
+        * Add some node-specific filters
         *
-        * @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.');
+       public function addExtraHubFilters () {
+               // 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.');
        }
 }