]> git.mxchange.org Git - hub.git/commitdiff
Next wave:
authorRoland Häder <roland@mxchange.org>
Fri, 19 May 2017 16:05:37 +0000 (18:05 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2020 16:50:02 +0000 (18:50 +0200)
- imported BaseVisitor
- imported BaseRegistry, RegisterableSocket, SocketRegistryFactory
- imported ConnectionInfoFactory, ShareableInfo
- imported ConnectionHelper
- added namespaces to configuration entries
- removed now generic classes/interfaces (see core framework)

Signed-off-by: Roland Häder <roland@mxchange.org>
35 files changed:
application/hub/classes/class_BaseHubSystem.php
application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php
application/hub/classes/factories/info/.htaccess [deleted file]
application/hub/classes/factories/info/class_ConnectionInfoFactory.php [deleted file]
application/hub/classes/factories/states/peer/class_PeerStateFactory.php
application/hub/classes/helper/connection/class_
application/hub/classes/helper/connection/ipv4/tcp/class_TcpConnectionHelper.php
application/hub/classes/helper/connection/ipv4/udp/class_UdpConnectionHelper.php
application/hub/classes/info/.htaccess [deleted file]
application/hub/classes/info/class_ [deleted file]
application/hub/classes/info/class_BaseInfo.php [deleted file]
application/hub/classes/info/connection/.htaccess [deleted file]
application/hub/classes/info/connection/class_ConnectionInfo.php [deleted file]
application/hub/classes/package/class_NetworkPackage.php
application/hub/classes/package/fragmenter/class_PackageFragmenter.php
application/hub/classes/registry/objects/class_ObjectTypeRegistry.php
application/hub/classes/registry/socket/.htaccess [deleted file]
application/hub/classes/registry/socket/class_SocketRegistry.php [deleted file]
application/hub/classes/resolver/state/peer/class_PeerStateResolver.php
application/hub/classes/statistics/connection/class_ConnectionStatisticsHelper.php
application/hub/classes/visitor/pool/class_
application/hub/classes/visitor/pool/handler/class_Handler
application/hub/classes/visitor/pool/monitor/class_RawDataPoolMonitorVisitor.php
application/hub/classes/visitor/pool/shutdown/class_Shutdown
application/hub/classes/visitor/pool/shutdown/class_ShutdownListenerPoolVisitor.php
application/hub/classes/visitor/socket/class_HalfShutdownSocketVisitor.php
application/hub/classes/visitor/socket/class_ShutdownSocketVisitor.php
application/hub/config.php
application/hub/interfaces/helper/connections/class_ConnectionHelper.php
application/hub/interfaces/lookup/peer_states/class_LookupablePeerState.php
application/hub/interfaces/package/fragmenter/class_Fragmentable.php
application/hub/interfaces/shareable/.htaccess [deleted file]
application/hub/interfaces/shareable/info/.htaccess [deleted file]
application/hub/interfaces/shareable/info/class_ShareableInfo.php [deleted file]
core

index f56f81007b096cb203bf659f771db0bc6315ddc4..3e62ebed0382c0537fb11bf5a0408e68e8858c19 100644 (file)
@@ -6,6 +6,7 @@ namespace Hub\Generic;
 use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
+use CoreFramework\Information\ShareableInfo;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Pool\Poolable;
 
index 6894edf69ff4fee82043ed026da1c5b519429814..929d02cb6f1b23d19fbc418f06f2302251ba0c5d 100644 (file)
@@ -3,6 +3,7 @@
 namespace Hub\Database\Frontend\Node\PeerState;
 
 // Import application-specific sutff
+use Hub\Helper\Connection\ConnectionHelper;
 use Hub\Tools\HubTools;
 
 // Import framework stuff
diff --git a/application/hub/classes/factories/info/.htaccess b/application/hub/classes/factories/info/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
deleted file mode 100644 (file)
index 14454ec..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Factory\Connection;
-
-// Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Registry;
-
-/**
- * A factory class for ShareableInfo
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ConnectionInfoFactory extends ObjectFactory {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Returns a singleton (registry-based) ShareableInfo instance
-        *
-        * @param       $protocolName   Name of protocol (e.g. 'tcp')
-        * @param       $type                   Connection type ('listener' or 'helper')
-        * @return      $infoInstance   An instance of a ShareableInfo class
-        */
-       public static final function createConnectionInfoInstance ($protocolName, $type) {
-               // Generate key
-               $key = 'connection_info_' . $protocolName . '_' . $type;
-
-               // If there is no info?
-               if (Registry::getRegistry()->instanceExists($key)) {
-                       // Get info from registry
-                       $infoInstance = Registry::getRegistry()->getInstance($key);
-               } else {
-                       // Get the info instance
-                       $infoInstance = self::createObjectByConfiguredName('connection_info_class');
-
-                       // Add it to the registry
-                       Registry::getRegistry()->addInstance($key, $infoInstance);
-               }
-
-               // Return the instance
-               return $infoInstance;
-       }
-}
-
-// [EOF]
-?>
index fdfb7fdf855041f45bdea3c98069325151f99666..8d7151be372cec0c4563e01572b9e123b939cfb8 100644 (file)
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\Factory\State\Peer;
 
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 
index 48a5febd7755ac31e8682f0fd807969d8592afab..eabd3cd80ea06c559f6d95a743f7b6efed043141 100644 (file)
@@ -4,6 +4,7 @@ namespace Hub\Helper\Connection\;
 
 // Import application-specific stuff
 use Hub\Helper\Connection\BaseConnectionHelper;
+use Hub\Helper\Connection\ConnectionHelper;
 
 /**
  * A ??? connection helper class
index fe8ac3f1126487ea020cd6cf8474dc0a7b2c7006..acccfcfb82167c27e3f1e2393f6ff1dda248028f 100644 (file)
@@ -2,7 +2,8 @@
 // Own namespace
 namespace Hub\Helper\Connection\Tcp;
 
-// Import hub-specific sutff
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
 use Hub\Tools\HubTools;
 
 /**
index 4ab6f3b263f1af167efa7c0c4f90624f42c8ecac..22b8711faa0902f883a2ea91607bcdc14a7aa6eb 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Helper\Connection\Udp;
+
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 /**
  * A UDP connection helper class
  *
diff --git a/application/hub/classes/info/.htaccess b/application/hub/classes/info/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/classes/info/class_ b/application/hub/classes/info/class_
deleted file mode 100644 (file)
index 58c9aa1..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * A ??? information class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ???Info extends BaseInfo implements ShareableInfo {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class
-        *
-        * @return      $infoInstance   An instance of a ShareableInfo class
-        */
-       public final static function create???Info () {
-               // Get new instance
-               $infoInstance = new ???Info();
-
-               // Return the prepared instance
-               return $infoInstance;
-       }
-}
-
-// [EOF]
-?>
diff --git a/application/hub/classes/info/class_BaseInfo.php b/application/hub/classes/info/class_BaseInfo.php
deleted file mode 100644 (file)
index 210ef07..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Information;
-
-// Import hub-specific stuff
-use Hub\Generic\BaseHubSystem;
-
-/**
- * A general Info class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 BaseInfo extends BaseHubSystem {
-       /**
-        * Protected constructor
-        *
-        * @param       $className      Name of the class
-        * @return      void
-        */
-       protected function __construct ($className) {
-               // Call parent constructor
-               parent::__construct($className);
-       }
-}
-
-// [EOF]
-?>
diff --git a/application/hub/classes/info/connection/.htaccess b/application/hub/classes/info/connection/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/classes/info/connection/class_ConnectionInfo.php b/application/hub/classes/info/connection/class_ConnectionInfo.php
deleted file mode 100644 (file)
index 9ea6636..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Information\Connection;
-
-// Import framework stuff
-use CoreFramework\Listener\Listenable;
-use CoreFramework\Registry\Registerable;
-
-/**
- * A Connection information class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class
-        *
-        * @return      $infoInstance   An instance of a ShareableInfo class
-        */
-       public final static function createConnectionInfo () {
-               // Get new instance
-               $infoInstance = new ConnectionInfo();
-
-               // Return the prepared instance
-               return $infoInstance;
-       }
-
-       /**
-        * Fills the information class with data from a Listenable instance
-        *
-        * @param       $listenerInstance       An instance of a Listenable class
-        * @return      void
-        */
-       public function fillWithListenerInformation (Listenable $listenerInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: protocolName=' . $listenerInstance->getProtocolName() . ',listenerInstance=' . $listenerInstance->__toString() . ' - CALLED!');
-
-               // Fill the generic array with several data from the listener:
-               $this->setProtocolName($listenerInstance->getProtocolName());
-               $this->setGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_ADDRESS , $listenerInstance->getListenAddress());
-               $this->setGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_PORT    , $listenerInstance->getListenPort());
-
-               // Set listener here
-               $this->setListenerInstance($listenerInstance);
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: EXIT!');
-       }
-
-       /**
-        * Fills the information class with data from a ConnectionHelper instance
-        *
-        * @param       $helperInstance         An instance of a ConnectionHelper class
-        * @return      void
-        */
-       public function fillWithConnectionHelperInformation (ConnectionHelper $helperInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: protocolName=' . $helperInstance->getProtocolName() . ',helperInstance=' . $helperInstance->__toString() . ',socketResource=' . $helperInstance->getSocketResource() . ' - CALLED!');
-
-               // Fill the generic array with several data from the listener:
-               $this->setProtocolName($helperInstance->getProtocolName());
-               $this->setGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_ADDRESS , $helperInstance->getAddress());
-               $this->setGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_PORT    , $helperInstance->getConnectionPort());
-
-               // Set helper here
-               $this->setHelperInstance($helperInstance);
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: EXIT!');
-       }
-
-       /**
-        * Getter for address
-        *
-        * @return      $address        Address from shared information
-        */
-       public final function getAddress () {
-               // Return it from generic array
-               return $this->getGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_ADDRESS);
-       }
-
-       /**
-        * Getter for port
-        *
-        * @return      $port   Port from shared information
-        */
-       public final function getPort () {
-               // Return it from generic array
-               return $this->getGenericArrayElement('connection', 'dummy', 'dummy', UniversalNodeLocator::UNL_PART_PORT);
-       }
-}
-
-// [EOF]
-?>
index 6966afa01de4ba4d60f0a6bdc4136c774bea8b49..b245f7b887c8d06f54fd86a726eea6b44f55a608 100644 (file)
@@ -8,11 +8,15 @@ use Hub\Factory\Dht\DhtObjectFactory;
 use Hub\Factory\Node\NodeObjectFactory;
 use Hub\Generic\BaseHubSystem;
 use Hub\Helper\Connection\BaseConnectionHelper;
+use Hub\Helper\Connection\ConnectionHelper;
 use Hub\Network\Receive\Receivable;
 use Hub\Tools\HubTools;
 
 // Import framework stuff
+use CoreFramework\Factory\Connection\ConnectionInfoFactory;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Factory\Registry\Socket\SocketRegistryFactory;
+use CoreFramework\Information\ShareableInfo;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Visitor\Visitable;
index 362e31594e80317632fca1922cef61aa904e5363..e48e923744ed535c7837d688b6968ce40e12205a 100644 (file)
@@ -2,8 +2,9 @@
 // Own namespace
 namespace Hub\Network\Package\Fragment;
 
-// Import hub-specific stuff
+// Import application-specific stuff
 use Hub\Generic\BaseHubSystem;
+use Hub\Helper\Connection\ConnectionHelper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
index d1d0c13ff2067d510ff1f8e37e867a125c0d9c51..2ddce85852e588d38b823b3fcc793e280cf5bf20 100644 (file)
@@ -2,6 +2,10 @@
 // Own namespace
 namespace Hub\Registry\ObjectType;
 
+// Imported framework stuff
+use CoreFramework\Registry\BaseRegistry;
+use CoreFramework\Registry\Register;
+
 /**
  * A ObjectType registry
  *
diff --git a/application/hub/classes/registry/socket/.htaccess b/application/hub/classes/registry/socket/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/classes/registry/socket/class_SocketRegistry.php b/application/hub/classes/registry/socket/class_SocketRegistry.php
deleted file mode 100644 (file)
index bf89d25..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Registry\Socket;
-
-// Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Listener\Listenable;
-use CoreFramework\Registry\Registerable;
-
-/**
- * A Socket registry
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 SocketRegistry extends BaseRegistry implements Register, RegisterableSocket {
-       // Exception constants
-       const SOCKET_NOT_REGISTERED = 0xd200;
-
-       /**
-        * Instance of this class
-        */
-       private static $registryInstance = NULL;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates a singleton instance of this registry class
-        *
-        * @return      $registryInstance       An instance of this class
-        */
-       public static final function createSocketRegistry () {
-               // Is an instance there?
-               if (is_null(self::$registryInstance)) {
-                       // Not yet, so create one
-                       self::$registryInstance = new SocketRegistry();
-               } // END - if
-
-               // Return the instance
-               return self::$registryInstance;
-       }
-
-       /**
-        * "Getter" to get a string respresentation for a key for the sub-registry
-        * in this format: class:type:port
-        *
-        * @param       $infoInstance   An instance of a ShareableInfo class
-        * @return      $key                    A string representation of the socket for the registry
-        */
-       private function getSubRegistryKey (ShareableInfo $infoInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: infoInstance=' . $infoInstance->__toString() . ' - CALLED!');
-
-               // Get address and port
-               $address = $infoInstance->getAddress();
-               $port    = $infoInstance->getPort();
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: address=' . $address . ',port=' . $port);
-
-               // Get connection type and port number and add both together
-               $key = sprintf('%s:%s:%s:%s',
-                       $infoInstance->__toString(),
-                       $infoInstance->getProtocolName(),
-                       $address,
-                       $port
-               );
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' .  $key . ' - EXIT!');
-
-               // Return resulting key
-               return $key;
-       }
-
-       /**
-        * "Getter" to get a string respresentation of the listener
-        *
-        * @param       $infoInstance   An instance of a ShareableInfo class
-        * @return      $key                    A string representation of the listener for the registry
-        */
-       private function getRegistryKeyFromInfo (ShareableInfo $infoInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: this=' . $this->__toString() . ',infoInstance=' . $infoInstance->__toString() . ' - CALLED!');
-
-               // Get the key
-               $key = $infoInstance->getProtocolName();
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' .  $key . ' - EXIT!');
-
-               // Return resulting key
-               return $key;
-       }
-
-       /**
-        * Checks whether the shared connection info is registered
-        *
-        * @param       $infoInstance   An instance of a ShareableInfo class
-        * @return      $isRegistered   Whether the listener is registered
-        */
-       private function isInfoRegistered (ShareableInfo $infoInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:info=' . $infoInstance->getProtocolName() . ' - CALLED!');
-
-               // Get the key
-               $key = $this->getRegistryKeyFromInfo($infoInstance);
-
-               // Determine it
-               $isRegistered = $this->instanceExists($key);
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:info=' . $infoInstance->getProtocolName() . ',isRegistered=' . intval($isRegistered) . ' - EXIT!');
-
-               // Return result
-               return $isRegistered;
-       }
-
-       /**
-        * Checks whether given socket resource is registered. If $socketResource is
-        * FALSE only the instance will be checked.
-        *
-        * @param       $infoInstance           An instance of a ShareableInfo class
-        * @param       $socketResource         A valid socket resource
-        * @return      $isRegistered           Whether the given socket resource is registered
-        */
-       public function isSocketRegistered (ShareableInfo $infoInstance, $socketResource) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:info=' . $infoInstance->getProtocolName() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ' - CALLED!');
-
-               // Default is not registered
-               $isRegistered = FALSE;
-
-               // First, check for the instance, there can be only once
-               if ($this->isInfoRegistered($infoInstance)) {
-                       // That one is found so "get" a registry key from it
-                       $key = $this->getRegistryKeyFromInfo($infoInstance);
-
-                       // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: this=' . $this->__toString() . ',info=' . $infoInstance->getProtocolName() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ',key=' . $key . ' - Trying to get instance ...');
-
-                       // Get the registry
-                       $registryInstance = $this->getInstance($key);
-
-                       // "Get" a key for the socket
-                       $socketKey = $this->getSubRegistryKey($infoInstance);
-
-                       // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: this=' . $this->__toString() . ',info=' . $infoInstance->getProtocolName() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ',key=' . $key . ',socketKey=' . $socketKey . ' - Checking existence ...');
-
-                       // Is it there?
-                       if ($registryInstance->instanceExists($socketKey)) {
-                               // Debug message
-                               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Found instance for socketKey=' . $socketKey . ':' . $registryInstance->getInstance($socketKey));
-
-                               // Get the instance
-                               $registeredInstance = $registryInstance->getInstance($socketKey);
-
-                               // Is it SocketContainer and same socket?
-                               $isRegistered = (($registeredInstance instanceof SocketContainer) && ($registeredInstance->ifSocketResourceMatches($socketResource)));
-
-                               // Debug message
-                               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Final result: isRegistered(' . $socketResource . ')=' . intval($isRegistered));
-                       } // END - if
-               } // END - if
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:info=' . $infoInstance->getProtocolName() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ',isRegistered=' . intval($isRegistered) . ' - EXIT!');
-
-               // Return the result
-               return $isRegistered;
-       }
-
-       /**
-        * Registeres given socket for listener or throws an exception if it is already registered
-        *
-        * @param       $infoInstance           An instance of a ShareableInfo class
-        * @param       $socketResource         A valid socket resource
-        * @param       $packageData            Optional raw package data
-        * @throws      SocketAlreadyRegisteredException        If the given socket is already registered
-        * @return      void
-        */
-       public function registerSocket (ShareableInfo $infoInstance, $socketResource, array $packageData = array()) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:info=' . $infoInstance->getProtocolName() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ' - CALLED!');
-
-               // Is the socket already registered?
-               if ($this->isSocketRegistered($infoInstance, $socketResource)) {
-                       // Throw the exception
-                       throw new SocketAlreadyRegisteredException(array($infoInstance, $socketResource), BaseListener::EXCEPTION_SOCKET_ALREADY_REGISTERED);
-               } // END - if
-
-               // Does the instance exist?
-               if (!$this->isInfoRegistered($infoInstance)) {
-                       // No, not found so we create a sub registry (not needed to configure!)
-                       $registryInstance = SubRegistry::createSubRegistry();
-
-                       // Now we can create the sub-registry for this info
-                       $this->addInstance($this->getRegistryKeyFromInfo($infoInstance), $registryInstance);
-               } else {
-                       // Get the sub-registry back
-                       $registryInstance = $this->getInstance($this->getRegistryKeyFromInfo($infoInstance));
-               }
-
-               // Get a key for sub-registries
-               $socketKey = $this->getSubRegistryKey($infoInstance);
-
-               // Get a socket container
-               $socketInstance = ObjectFactory::CreateObjectByConfiguredName('socket_container_class', array($socketResource, $infoInstance, $packageData));
-
-               // We have a sub-registry, the socket key and the socket, now we need to put all together
-               //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: socketKey=' . $socketKey . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ' - adding socket container instance ...');
-               $registryInstance->addInstance($socketKey, $socketInstance);
-       }
-
-       /**
-        * Getter for given listener's socket resource
-        *
-        * @param       $listenerInstance       An instance of a Listenable class
-        * @return      $socketResource         A valid socket resource
-        * @throws      NoSocketRegisteredException             If the requested socket is not registered
-        */
-       public function getRegisteredSocketResource (Listenable $listenerInstance) {
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:listener=' . $listenerInstance->getConnectionType() . ' - CALLED!');
-
-               // The socket must be registered before we can return it
-               if (!$this->isInfoRegistered($listenerInstance)) {
-                       // Throw the exception
-                       throw new NoSocketRegisteredException ($listenerInstance, self::SOCKET_NOT_REGISTERED);
-               } // END - if
-
-               // Now get the key from the listener
-               $key = $this->getRegistryKeyFromInfo($listenerInstance);
-
-               // And get the registry
-               $registryInstance = $this->getInstance($key);
-
-               // Get a socket key
-               $socketKey = $this->getSubRegistryKey($listenerInstance);
-
-               // And the final socket resource
-               $socketResource = $registryInstance->getInstance($socketKey)->getSocketResource();
-
-               // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']:listener=' . $listenerInstance->getConnectionType() . ',socketResource[' . gettype($socketResource) . ']=' . $socketResource . ' - EXIT!');
-
-               // Return the resource
-               return $socketResource;
-       }
-
-       /**
-        * "Getter" for info instance from given package data
-        *
-        * @param       $packageData    Raw package data
-        * @return      $infoInstance   An instance of a ShareableInfo class
-        */
-       public function getInfoInstanceFromPackageData (array $packageData) {
-               // Init info instance
-               $infoInstance = NULL;
-               //* DEBUG-DIE: */ die(__METHOD__ . ':packageData=' . print_r($packageData, TRUE));
-
-               // Get all keys and check them
-               foreach ($this->getInstanceRegistry() as $key => $registryInstance) {
-                       // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' . $key . ',registryInstance=' . $registryInstance->__toString());
-
-                       // This is always a SubRegistry instance
-                       foreach ($registryInstance->getInstanceRegistry() as $subKey => $containerInstance) {
-                               // Debug message
-                               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' . $key . ',subKey=' . $subKey . ',containerInstance=' . $containerInstance->__toString());
-
-                               // Is this a SocketContainer instance and is the address the same?
-                               if (($containerInstance instanceof SocketContainer) && ($containerInstance->ifAddressMatches($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]))) {
-                                       // Debug die
-                                       //* DEBUG-DIE: */ die(__METHOD__ . ': containerInstance=' . print_r($containerInstance, TRUE));
-
-                                       // Get listener and helper instances
-                                       $listenerInstance = $containerInstance->getListenerInstance();
-                                       $helperInstance = $containerInstance->getHelperInstance();
-
-                                       // Debug message
-                                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' . $key . ',subKey=' . $subKey . ',listenerInstance[]=' . gettype($listenerInstance) . ',helperInstance[]=' . gettype($helperInstance));
-
-                                       // Is a listener or helper set?
-                                       if ($listenerInstance instanceof Listenable) {
-                                               // Found a listener, so get the info instance first
-                                               $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($listenerInstance->getProtocolName(), 'helper');
-
-                                               // Fill info instance with listener data
-                                               $infoInstance->fillWithListenerInformation($listenerInstance);
-                                       } elseif ($helperInstance instanceof ConnectionHelper) {
-                                               // Found a helper, so get the info instance first
-                                               $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($helperInstance->getProtocolName(), 'helper');
-
-                                               // Helper is found
-                                               $infoInstance->fillWithConnectionHelperInformation($helperInstance);
-                                       } else {
-                                               // Not supported state!
-                                               $this->debugInstance('[' . __METHOD__ . ':' . __LINE__ . ']: Invalid state found, please report this to the developers with full debug infos.' . PHP_EOL);
-                                       }
-
-                                       // Debug message
-                                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: key=' . $key . ',subKey=' . $subKey . ',infoInstance[' . gettype($infoInstance) . ']=' . $infoInstance->__toString() . ' with protocol ' . $infoInstance->getProtocolName() . ' - FOUND!');
-                                       break;
-                               } // END - if
-                       } // END - foreach
-
-                       // Is no longer NULL set?
-                       if (!is_null($infoInstance)) {
-                               // Then skip here, too
-                               break;
-                       } // END - if
-               } // END - foreach
-
-               // Return the info instance
-               return $infoInstance;
-       }
-}
-
-// [EOF]
-?>
index 082be9f325d6de81a1a4a9a716691cb4d6dc58e3..4287b3363512b9af79b0a22dc7a6a33d0bb6e11d 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\State\Peer;
+
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 /**
  * A resolver for resolving peer states locally
  *
index 14b17a3920207ede12f7697cec8a2f20d9bf3561..a518ec250d9ce0099ed75bf906e5eaf33df6987d 100644 (file)
@@ -4,6 +4,7 @@ namespace Hub\Helper\Connection;
 
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
+use Hub\Helper\Connection\ConnectionHelper;
 
 /**
  * A helper class for maintaining connection statistics, no instance is
index 6a26f2ab641b9f61697d9757402536ef981b2918..ef8fafeb43d0106fe0f8b66c9828657904f7b3b0 100644 (file)
@@ -4,6 +4,7 @@ namespace Hub\Visitor\;
 
 // Import framework stuff
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\BaseVisitor;
 use CoreFramework\Visitor\Visitor;
 
 /**
index 128b776eccf7e00fcc97df5572566311d80b1b06..2d90b1b6b376800345bd78b764c45e037f6f43bb 100644 (file)
@@ -4,6 +4,7 @@ namespace Hub\Visitor\Handler\;
 
 // Import framework stuff
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\BaseVisitor;
 
 /**
  * A ??? handler visitor
index 8b2e803e7bb0f7b6c631c9d4ceecba6cdbebb769..0847c642b82e39b2b2cc4fe3cfa1d28b684e6026 100644 (file)
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 // Import framework stuff
 use CoreFramework\Listener\Listenable;
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\BaseVisitor;
 
 /**
  * A RawDataMonitor visitor
index 282d6896bd73a903ff4b5cd24282e81e689b6554..fdacbb1b056f75a640fb86dac3d91dbd2d1ab8af 100644 (file)
@@ -4,6 +4,7 @@ namespace Hub\Visitor\;
 
 // Import framework stuff
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\BaseVisitor;
 
 /**
  * A ??? shutdown visitor
index 402b051405d2f3415a7e6d4568286a7644284b69..3e856a474514581c9a0ae56bf64d41d7390cc9ef 100644 (file)
@@ -5,6 +5,7 @@ namespace Hub\Visitor\Pool\Listener;
 // Import framework stuff
 use CoreFramework\Listener\Listenable;
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\BaseVisitor;
 
 /**
  * A ListenerPool shutdown visitor
index c180ac051d9610177ac58670dbfa5f35b2eed9f3..1bd535e5eea530a91ee299a297636e7dbede592d 100644 (file)
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Hub\Visitor\Shutdown\Socket;
 
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 // Import framework stuff
+use CoreFramework\Visitor\BaseVisitor;
 use CoreFramework\Visitor\Visitor;
 
 /**
index c0d4a8f4ed9477cbd5961ba555ab4eded6b5cb77..103cb9d184cb08d74134ee4023b5237bf2fd13d7 100644 (file)
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Hub\Visitor\Shutdown\Socket;
 
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 // Import framework stuff
+use CoreFramework\Visitor\BaseVisitor;
 use CoreFramework\Visitor\Visitor;
 
 /**
index e095029f03d98fe42d817873e5d5aa28d9a64d53..f538fd9c3fbdc52bc72be4859e45049009f0c625 100644 (file)
@@ -127,10 +127,10 @@ $cfg->setConfigEntry('socket_raw_data_handler_class', 'SocketRawDataHandler');
 $cfg->setConfigEntry('shutdown_listener_pool_visitor_class', 'ShutdownListenerPoolVisitor');
 
 // CFG: SHUTDOWN-SOCKET-VISITOR-CLASS
-$cfg->setConfigEntry('shutdown_socket_visitor_class', 'ShutdownSocketVisitor');
+$cfg->setConfigEntry('shutdown_socket_visitor_class', 'Hub\Visitor\Shutdown\Socket\ShutdownSocketVisitor');
 
 // CFG: HALF-SHUTDOWN-SOCKET-VISITOR-CLASS
-$cfg->setConfigEntry('half_shutdown_socket_visitor_class', 'HalfShutdownSocketVisitor');
+$cfg->setConfigEntry('half_shutdown_socket_visitor_class', 'Hub\Visitor\Shutdown\Socket\HalfShutdownSocketVisitor');
 
 // CFG: NODE-RAW-DATA-MONITOR-VISITOR-CLASS
 $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorVisitor');
@@ -706,7 +706,7 @@ $cfg->setConfigEntry('deco_package_compressor_class', 'NetworkPackageCompressorD
 $cfg->setConfigEntry('raw_package_compressor_class', 'ZlibCompressor');
 
 // CFG: SOCKET-REGISTRY-CLASS
-$cfg->setConfigEntry('socket_registry_class', 'SocketRegistry');
+$cfg->setConfigEntry('socket_registry_class', 'CoreFramework\Registry\Socket\SocketRegistry');
 
 // CFG: SOCKET-CONTAINER-CLASS
 $cfg->setConfigEntry('socket_container_class', 'SocketContainer');
@@ -834,7 +834,7 @@ $cfg->setConfigEntry('node_dht_class', 'NodeDhtFacade');
 $cfg->setConfigEntry('max_dht_recipients', 10);
 
 // CFG: CONNECTION-INFO-CLASS
-$cfg->setConfigEntry('connection_info_class', 'ConnectionInfo');
+$cfg->setConfigEntry('connection_info_class', 'CoreFramework\Information\Connection\ConnectionInfo');
 
 // CFG: DEFAULT-HUB-CONSOLE-CONTROLLER
 $cfg->setConfigEntry('default_hub_console_controller', 'main');
index 1535feefa044ed2eb787c1d3c0339147e993fde1..efde02fa3270530210a647141add4f85c889cbac 100644 (file)
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace Hub\Helper\Connection;
+
 /**
  * An interface for connection helper classes
  *
index f04ad797f377eb8dc5f568d94142a47e1e594e65..3184887b4ac6c8e37da85ca3e7f8ea4340884216 100644 (file)
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\State\Peer\Lookup;
 
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 // Import framework stuff
 use CoreFramework\State\Stateable;
 
index 907abc26c0fbcebec20de34d66cfaa6a341708c0..d948096a381b71ec477555dbb070aa26faa363a0 100644 (file)
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\Fragmenter;
 
+// Import application-specific stuff
+use Hub\Helper\Connection\ConnectionHelper;
+
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
diff --git a/application/hub/interfaces/shareable/.htaccess b/application/hub/interfaces/shareable/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/interfaces/shareable/info/.htaccess b/application/hub/interfaces/shareable/info/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/interfaces/shareable/info/class_ShareableInfo.php b/application/hub/interfaces/shareable/info/class_ShareableInfo.php
deleted file mode 100644 (file)
index a376522..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Information;
-
-// Import framework stuff
-use CoreFramework\Generic\FrameworkInterface;
-use CoreFramework\Listener\Listenable;
-
-/**
- * An interface for shareable informations
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-interface ShareableInfo extends FrameworkInterface {
-       /**
-        * Fills the information class with data from a Listenable instance
-        *
-        * @param       $listenerInstance       An instance of a Listenable class
-        * @return      void
-        */
-       function fillWithListenerInformation (Listenable $listenerInstance);
-
-       /**
-        * Fills the information class with data from a ConnectionHelper instance
-        *
-        * @param       $helperInstance         An instance of a ConnectionHelper class
-        * @return      void
-        */
-       function fillWithConnectionHelperInformation (ConnectionHelper $helperInstance);
-}
-
-// [EOF]
-?>
diff --git a/core b/core
index 6cf40d9bfbe6159ce08cbec4c87d504f5829429d..8e72c59c6c3536da832917acf4f2a3903339ad19 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6cf40d9bfbe6159ce08cbec4c87d504f5829429d
+Subproject commit 8e72c59c6c3536da832917acf4f2a3903339ad19