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 e3d294aaaeee3d114968d69e062198dee0502498..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
  *
@@ -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
         *
@@ -45,13 +45,6 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
                // Set the request instance
                $nodeInstance->setRequestInstance($requestInstance);
 
-               // --------------------- Hub-id acquirement phase ---------------------
-               // Acquire a hub-id. This step generates on first launch a new one and
-               // on any later launches it will restore the hub-id from the database.
-               // A passed 'nickname=xxx' argument will be used to add some
-               // 'personality' to the hub.
-               $nodeInstance->acquireHubId();
-
                // Return the instance
                return $nodeInstance;
        }
@@ -65,29 +58,35 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
         * @todo        add some more special bootstrap things for this boot node
         */
        public function doBootstrapping () {
-               // Call generic (parent) bootstrapping method first
-               parent::doGenericBootstrapping();
-
                // Now check if the IP address matches one of the bootstrap nodes
-               if ($this->ifAddressMatchesBootstrappingNodes($_SERVER['REMOTE_ADDR'])) {
+               if ($this->ifAddressMatchesBootstrappingNodes($this->getConfigInstance()->detectServerAddress())) {
                        // Get our port from configuration
-                       $ourPort = $this->getConfigInstance()->readConfig('node_listen_port');
+                       $ourPort = $this->getConfigInstance()->getConfigEntry('boot_node_tcp_listen_port');
+
+                       // Extract port
+                       $bootPort = substr($this->getBootIpPort(), -strlen($ourPort), strlen($ourPort));
 
                        // Is the port the same?
-                       if (substr($this->bootIpPort, -strlen($ourPort), strlen($ourPort)) == $ourPort) {
+                       if ($bootPort == $ourPort) {
                                // It is the same!
-                               $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: IP/port matches bootstrapping node ' . $this->bootIpPort . '.');
+                               $this->debugOutput('BOOTSTRAP: IP/port matches bootstrapping node ' . $this->getBootIpPort() . '.');
 
                                // Now, does the mode match (should be 'boot'!)
                                if ($this->getRequestInstance()->getRequestElement('mode') == 'boot') {
                                        // Output debug message
-                                       $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: Our node is a valid bootstrapping node.');
+                                       $this->debugOutput('BOOTSTRAP: Our node is a valid bootstrapping node.');
                                } else {
                                        // Output warning
-                                       $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: WARNING! Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
+                                       $this->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
                                }
-                       } // END - if
-               } // END - if
+                       } else {
+                               // IP does match, but no port
+                               $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()->detectServerAddress() . ' does not match any known bootstrap-nodes.');
+               }
 
                // This might not be all...
                $this->partialStub('Please implement more bootsrapping steps.');
@@ -104,6 +103,22 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
                parent::initGenericQueues();
                $this->partialStub('Please add some more hub-specific queues.');
        }
+
+       /**
+        * Add some node-specific filters
+        *
+        * @return      void
+        */
+       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.');
+       }
 }
 
 //