X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fconfig.php;h=d1394fb6cdc31bdbd3007f1d2f26bfcf9557c06c;hb=a350963ce5cca9cce90c958a34287cec1743ac55;hp=d650da5b68e30173bfc6f9aabb6f103ad2d51920;hpb=a44489127edbf6dcbf0b1da401872c74aecf9c1a;p=hub.git

diff --git a/application/hub/config.php b/application/hub/config.php
index d650da5b6..d1394fb6c 100644
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Configuration entries for the hub only
+ * Configuration entries for this application only
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0
@@ -22,7 +22,7 @@
  */
 
 // Some hub-specific configuration like port hostname where we will listen, etc.
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: NODE-LISTEN-ADDR
 $cfg->setConfigEntry('node_listen_addr', '0.0.0.0');
@@ -33,12 +33,6 @@ $cfg->setConfigEntry('node_tcp_listen_port', 9060);
 // CFG: NODE-UDP-LISTEN-PORT
 $cfg->setConfigEntry('node_udp_listen_port', 9060);
 
-// CFG: BOOT-NODE-TCP-LISTEN-PORT
-$cfg->setConfigEntry('boot_node_tcp_listen_port', 9061);
-
-// CFG: BOOT-NODE-UDP-LISTEN-PORT
-$cfg->setConfigEntry('boot_node_udp_listen_port', 9061);
-
 // CFG: NODE-DEFAULT-MODE (can be 'regular', 'list', 'master' or 'boot', default is 'regular')
 $cfg->setConfigEntry('node_default_mode', 'regular');
 
@@ -85,13 +79,13 @@ $cfg->setConfigEntry('hub_tcp_listener_class', 'HubTcpListenerDecorator');
 $cfg->setConfigEntry('hub_udp_listener_class', 'HubUdpListenerDecorator');
 
 // CFG: CLIENT-TCP-LISTENER-CLASS
-$cfg->setConfigEntry('peer_tcp_listener_class', 'PeerTcpListenerDecorator');
+$cfg->setConfigEntry('client_tcp_listener_class', 'ClientTcpListenerDecorator');
 
 // CFG: CLIENT-UDP-LISTENER-CLASS
-$cfg->setConfigEntry('peer_udp_listener_class', 'PeerUdpListenerDecorator');
+$cfg->setConfigEntry('client_udp_listener_class', 'ClientUdpListenerDecorator');
 
-// CFG: CLIENT-POOL-CLASS
-$cfg->setConfigEntry('peer_pool_class', 'DefaultPeerPool');
+// CFG: NODE-POOL-CLASS
+$cfg->setConfigEntry('node_pool_class', 'DefaultPeerPool');
 
 // CFG: POOL-ENTRIES-LIST-CLASS
 $cfg->setConfigEntry('pool_entries_list_class', 'PoolEntriesList');
@@ -105,8 +99,11 @@ $cfg->setConfigEntry('handler_pool_iterator_class', 'HandlerPoolIterator');
 // CFG: NETWORK-LISTEN-ITERATOR-CLASS
 $cfg->setConfigEntry('network_listen_iterator_class', 'NetworkListenIterator');
 
-// CFG: NETWORK-PACKAGE-HANDLER-CLASS
-$cfg->setConfigEntry('tcp_network_package_handler_class', 'TcpNetworkPackageHandler');
+// CFG: TCP-RAW-DATA-HANDLER-CLASS
+$cfg->setConfigEntry('tcp_raw_data_handler_class', 'TcpRawDataHandler');
+
+// CFG: UDP-RAW-DATA-HANDLER-CLASS
+$cfg->setConfigEntry('udp_raw_data_handler_class', 'UdpRawDataHandler');
 
 // CFG: SHUTDOWN-LISTENER-POOL-VISITOR-CLASS
 $cfg->setConfigEntry('shutdown_listener_pool_visitor_class', 'ShutdownListenerPoolVisitor');
@@ -117,9 +114,15 @@ $cfg->setConfigEntry('shutdown_task_visitor_class', 'ShutdownTaskVisitor');
 // CFG: SHUTDOWN-SOCKET-VISITOR-CLASS
 $cfg->setConfigEntry('shutdown_socket_visitor_class', 'ShutdownSocketVisitor');
 
+// CFG: HALF-SHUTDOWN-SOCKET-VISITOR-CLASS
+$cfg->setConfigEntry('half_shutdown_socket_visitor_class', 'HalfShutdownSocketVisitor');
+
 // CFG: ACTIVE-TASK-VISITOR-CLASS
 $cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor');
 
+// CFG: NODE-RAW-DATA-MONITOR-VISITOR-CLASS
+$cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorVisitor');
+
 // CFG: LIST-GROUP-CLASS
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');
 
@@ -243,6 +246,9 @@ $cfg->setConfigEntry('network_package_stacker_class', 'FiFoStacker');
 // CFG: NODE-RAW-DATA-STACKER-CLASS
 $cfg->setConfigEntry('node_raw_data_stacker_class', 'FiFoStacker');
 
+// CFG: CHUNK-HANDLER-STACKER-CLASS
+$cfg->setConfigEntry('chunk_handler_stacker_class', 'FiFoStacker');
+
 // CFG: PRODUCER-OUTGOING-QUEUE
 $cfg->setConfigEntry('producer_outgoing_queue', 'FiFoStacker');
 
@@ -256,13 +262,25 @@ $cfg->setConfigEntry('stacker_announcement_max_size', 20);
 $cfg->setConfigEntry('stacker_self_connect_max_size', 10);
 
 // CFG: STACKER-UNDECLARED-MAX-SIZE
-$cfg->setConfigEntry('stacker_undeclared_max_size', 10000);
+$cfg->setConfigEntry('stacker_package_undeclared_max_size', 10000);
+
+// CFG: STACKER-PACKAGE-DECLARED-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_declared_max_size', 1000);
+
+// CFG: STACKER-PACKAGE-OUTGOING-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_outgoing_max_size', 100);
+
+// CFG: STACKER-PACKAGE-DECODED-DATA-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_decoded_data_max_size', 200);
+
+// CFG: STACKER-PACKAGE-HANDLED-DECODED-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_handled_decoded_max_size', 200);
 
-// CFG: STACKER-DECLARED-MAX-SIZE
-$cfg->setConfigEntry('stacker_declared_max_size', 1000);
+// CFG: STACKER-PACKAGE-CHUNKED-DECODED-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_chunked_decoded_max_size', 800);
 
-// CFG: STACKER-OUTGOING-MAX-SIZE
-$cfg->setConfigEntry('stacker_outgoing_max_size', 100);
+// CFG: STACKER-PACKAGE-BACKBUFFER-MAX-SIZE
+$cfg->setConfigEntry('stacker_package_backbuffer_max_size', 1000);
 
 // CFG: STACKER-IN-QUEUE-MAX-SIZE
 $cfg->setConfigEntry('stacker_in_queue_max_size', 10000);
@@ -279,6 +297,18 @@ $cfg->setConfigEntry('stacker_outgoing_queue_max_size', 100000);
 // CFG: STACKER-INCOMING-QUEUE-MAX-SIZE
 $cfg->setConfigEntry('stacker_incoming_queue_max_size', 100000);
 
+// CFG: STACKER-DECODED-DATA-MAX-SIZE
+$cfg->setConfigEntry('stacker_decoded_data_max_size', 100);
+
+// CFG: STACKER-FINAL-CHUNKS-MAX-SIZE
+$cfg->setConfigEntry('stacker_final_chunks_max_size', 100);
+
+// CFG: STACKER-CHUNK-RAW-DATA-MAX-SIZE
+$cfg->setConfigEntry('stacker_chunk_raw_data_max_size', 100);
+
+// CFG: STACKER-DECODED-PACKAGE-MAX-SIZE
+$cfg->setConfigEntry('stacker_decoded_package_max_size', 100);
+
 // CFG: NEWS-MAIN-LIMIT
 $cfg->setConfigEntry('news_main_limit', 5);
 
@@ -372,6 +402,12 @@ $cfg->setConfigEntry('hub_package_reader_task_class', 'NetworkPackageReaderTask'
 // CFG: HUB-SOCKET-LISTENER-TASK-CLASS
 $cfg->setConfigEntry('hub_socket_listener_task_class', 'HubSocketListenerTask');
 
+// CFG: HUB-CHUNK-ASSEMBLER-TASK-CLASS
+$cfg->setConfigEntry('hub_chunk_assembler_task_class', 'HubChunkAssemblerTask');
+
+// CFG: HUB-PACKAGE-DECODER-TASK-CLASS
+$cfg->setConfigEntry('hub_package_decoder_task_class', 'HubPackageDecoderTask');
+
 // CFG: TASK-NETWORK-PACKAGE-WRITER-STARTUP-DELAY
 $cfg->setConfigEntry('task_network_package_writer_startup_delay', 2500);
 
@@ -399,12 +435,33 @@ $cfg->setConfigEntry('task_socket_listener_interval_delay', 10);
 // CFG: TASK-SOCKET-LISTENER-MAX-RUNS
 $cfg->setConfigEntry('task_socket_listener_max_runs', 0);
 
+// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
+
+// CFG: TASK-PACKAGE-DECODER-STATUP-DELAY
+$cfg->setConfigEntry('task_package_decoder_startup_delay', 1300);
+
+// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 10);
+
+// CFG: TASK-PACKAGE-DECODER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_package_decoder_interval_delay', 10);
+
+// CFG: TASK-CHUNK-ASSEMBLER-MAX-RUNS
+$cfg->setConfigEntry('task_chunk_assembler_max_runs', 0);
+
+// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
+$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+
 // CFG: TASK-LIST-CLASS
 $cfg->setConfigEntry('task_list_class', 'TaskList');
 
 // CFG: TASK-POOL-ITERATOR-CLASS
 $cfg->setConfigEntry('task_pool_iterator_class', 'TaskPoolIterator');
 
+// CFG: MONITOR-POOL-ITERATOR-CLASS
+$cfg->setConfigEntry('monitor_pool_iterator_class', 'MonitorPoolIterator');
+
 // CFG: DEFAULT-ITERATOR-CLASS
 $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
 
@@ -414,12 +471,6 @@ $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 // CFG: HUB-PING-ITERATOR-CLASS
 $cfg->setConfigEntry('hub_ping_iterator_class', 'HubPingIterator');
 
-// CFG: TEST-UNIT-PRODUCER-KEY-ITERATOR-CLASS
-$cfg->setConfigEntry('test_unit_producer_key_iterator_class', 'TestUnitKeyProducerIterator');
-
-// CFG: WORK-UNIT-PRODUCER-KEY-ITERATOR-CLASS
-$cfg->setConfigEntry('work_unit_producer_key_iterator_class', 'WorkUnitKeyProducerIterator');
-
 // CFG: LOCAL-QUERY-LIST-CLASS
 $cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
 
@@ -448,7 +499,7 @@ $cfg->setConfigEntry('network_package_class', 'NetworkPackage');
 $cfg->setConfigEntry('deco_package_compressor_class', 'NetworkPackageCompressorDecorator');
 
 // CFG: RAW-PACKAGE-COMPRESSOR-CLASS
-$cfg->setConfigEntry('raw_package_compressor_class', 'GzipCompressor');
+$cfg->setConfigEntry('raw_package_compressor_class', 'ZlibCompressor');
 
 // CFG: SOCKET-REGISTRY-CLASS
 $cfg->setConfigEntry('socket_registry_class', 'SocketRegistry');
@@ -468,11 +519,11 @@ $cfg->setConfigEntry('recipient_list_class', 'RecipientList');
 // CFG: PACKAGE-TAGS-CLASS
 $cfg->setConfigEntry('package_tags_class', 'PackageTags');
 
-// CFG: TCP-CONNECTION-CLASS
-$cfg->setConfigEntry('tcp_connection_class', 'TcpConnectionHelper');
+// CFG: TCP-CONNECTION-HELPER-CLASS
+$cfg->setConfigEntry('tcp_connection_helper_class', 'TcpConnectionHelper');
 
-// CFG: UDP-CONNECTION-CLASS
-$cfg->setConfigEntry('udp_connection_class', 'UdpConnectionHelper');
+// CFG: UDP-CONNECTION-HELPER-CLASS
+$cfg->setConfigEntry('udp_connection_helper_class', 'UdpConnectionHelper');
 
 // CFG: TCP-BUFFER-LENGTH
 $cfg->setConfigEntry('tcp_buffer_length', 1024);
@@ -481,16 +532,13 @@ $cfg->setConfigEntry('tcp_buffer_length', 1024);
 $cfg->setConfigEntry('udp_buffer_length', 1024);
 
 // CFG: TCP-CONNECT-RETRY-MAX
-$cfg->setConfigEntry('tcp_connect_retry_max', 10);
+$cfg->setConfigEntry('tcp_connect_retry_max', 5);
 
 // CFG: UDP-CONNECT-RETRY-MAX
-$cfg->setConfigEntry('udp_connect_retry_max', 10);
-
-// CFG: PEER-STATE-LOOKUP-TABLE-CLASS
-$cfg->setConfigEntry('peer_state_lookup_table_class', 'PeerStateLookupTable');
+$cfg->setConfigEntry('udp_connect_retry_max', 5);
 
-// CFG: PEER-STATE-CHECKED-PACKAGE-CLASS
-$cfg->setConfigEntry('peer_state_checked_package_class', 'NewConnectionPeerState');
+// CFG: NODE-STATE-CHECKED-PACKAGE-CLASS
+$cfg->setConfigEntry('node_state_checked_package_class', 'NewConnectionNodeState');
 
 // CFG: SESSION-ID
 $cfg->setConfigEntry('session_id', '');
@@ -501,6 +549,9 @@ $cfg->setConfigEntry('external_ip', '');
 // CFG: PACKAGE-FRAGMENTER-CLASS
 $cfg->setConfigEntry('package_fragmenter_class', 'PackageFragmenter');
 
+// CFG: PACKAGE-ASSEMBLER-CLASS
+$cfg->setConfigEntry('package_assembler_class', 'PackageAssembler');
+
 // CFG: PACKAGE-CHUNK-SIZE
 $cfg->setConfigEntry('package_chunk_size', 256*8);
 
@@ -510,8 +561,48 @@ $cfg->setConfigEntry('node_raw_data_output_stream_class', 'RawDataOutputStream')
 // CFG: NODE-RAW-DATA-INPUT-STREAM-CLASS
 $cfg->setConfigEntry('node_raw_data_input_stream_class', 'RawDataInputStream');
 
+// CFG: DEBUG-OUTPUT-TIMINGS
+$cfg->setConfigEntry('debug_output_timings', 'Y');
+
+// CFG: SOCKET-TIMEOUT-SECONDS
+$cfg->setConfigEntry('socket_timeout_seconds', 3);
+
+// CFG: SOCKET-TIMEOUT-MICROSECONDS
+$cfg->setConfigEntry('socket_timeout_microseconds', 0);
+
+// CFG: CHUNK-HANDLER-CLASS
+$cfg->setConfigEntry('chunk_handler_class', 'ChunkHandler');
+
+// CFG: PACKAGE-DECODER-CLASS
+$cfg->setConfigEntry('package_decoder_class', 'PackageDecoder');
+
+///////////////////////////////////////////////////////////////////////////////
+//                              Peer states
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: PEER-INIT-STATE-CLASS
+$cfg->setConfigEntry('peer_init_state_class', 'InitPeerState');
+
+// CFG: PEER-CONNECTED-STATE-CLASS
+$cfg->setConfigEntry('peer_connected_state_class', 'ConnectedPeerState');
+
+// CFG: PEER-CONNECTION-REFUSED-STATE-CLASS
+$cfg->setConfigEntry('peer_connection_refused_state_class', 'ConnectionRefusedPeerState');
+
+// CFG: PEER-CONNECTION-TIMED-OUT-STATE-CLASS
+$cfg->setConfigEntry('peer_connection_timed_out_state_class', 'ConnectionTimedOutPeerState');
+
+// CFG: PEER-TRANSPORT-ENDPOINT-STATE-CLASS
+$cfg->setConfigEntry('peer_transport_endpoint_state_class', 'TransportEndpointGonePeerState');
+
+// CFG: PEER-OPERATION-ALREADY-PROGRESS-STATE-CLASS
+$cfg->setConfigEntry('peer_operation_already_progress_state_class', 'OperationAlreadyProgressPeerState');
+
+// CFG: PEER-NO-ROUTE-TO-HOST-STATE-CLASS
+$cfg->setConfigEntry('peer_no_route_to_host_state_class', 'NoRouteToHostPeerState');
+
 ///////////////////////////////////////////////////////////////////////////////
-//                        Cruncher Configuration
+//                        Cruncher configuration
 ///////////////////////////////////////////////////////////////////////////////
 
 // CFG: CRUNCHER-DEFAULT-MODE (can be only 'mcrypt' at the moment)
@@ -544,8 +635,8 @@ $cfg->setConfigEntry('cruncher_bootstrap_generic_activation_filter', 'CruncherBo
 // CFG: CRUNCHER-WELCOME-TEASER-FILTER
 $cfg->setConfigEntry('cruncher_welcome_teaser_filter', 'CruncherWelcomeTeaserFilter');
 
-// CFG: CRUNCHER-SHUTDOWN-CRUNCHER-FILTER
-$cfg->setConfigEntry('cruncher_shutdown_cruncher_filter', 'CruncherShutdownCruncherFilter');
+// CFG: CRUNCHER-SHUTDOWN-FILTER
+$cfg->setConfigEntry('cruncher_shutdown_filter', 'CruncherShutdownFilter');
 
 // CFG: CRUNCHER-WORK-UNIT-FETCHER-TASK-CLASS
 $cfg->setConfigEntry('cruncher_work_unit_fetcher_task_class', 'CruncherWorkUnitFetcherTask');
@@ -625,6 +716,12 @@ $cfg->setConfigEntry('cruncher_unit_db_wrapper_class', 'CruncherUnitDatabaseWrap
 // CFG: CRUNCHER-RANDOM-SECRET-MESSAGE-LENGTH
 $cfg->setConfigEntry('random_secret_message_length', 100);
 
+// CFG: TEST-UNIT-PRODUCER-KEY-ITERATOR-CLASS
+$cfg->setConfigEntry('test_unit_producer_key_iterator_class', 'TestUnitKeyProducerIterator');
+
+// CFG: WORK-UNIT-PRODUCER-KEY-ITERATOR-CLASS
+$cfg->setConfigEntry('work_unit_producer_key_iterator_class', 'WorkUnitKeyProducerIterator');
+
 // CFG: TEST-UNIT-RANDOM-SECRET-KEY-LENGTH
 $cfg->setConfigEntry('test_unit_random_secret_key_length', 8*4);
 
@@ -643,5 +740,61 @@ $cfg->setConfigEntry('cruncher_virgin_state_class', 'CruncherVirginState');
 // CFG: CRUNCHER-PER-UNIT-KEY-LIMIT
 $cfg->setConfigEntry('cruncher_per_unit_key_limit', 10000);
 
+///////////////////////////////////////////////////////////////////////////////
+//                            Chat Configuration
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: HUBCONSOLE-CMD-CHAT-RESOLVER-CLASS
+$cfg->setConfigEntry('hubconsole_cmd_chat_resolver_class', 'HubConsoleCommandResolver');
+
+// CFG: CHAT-PHP-REQUIREMENTS-FILTER
+$cfg->setConfigEntry('chat_php_requirements_filter', 'ChatPhpRequirementsFilter');
+
+// CFG: CHAT-INITIALIZER-FILTER
+$cfg->setConfigEntry('chat_initializer_filter', 'ChatInitializationFilter');
+
+// CFG: NODE-CONSOLE-CHAT
+$cfg->setConfigEntry('node_console_chat_class', 'NodeConsoleChat');
+
+// CFG: CHAT-WELCOME-TEASER-FILTER
+$cfg->setConfigEntry('chat_welcome_teaser_filter', 'ChatWelcomeTeaserFilter');
+
+// CFG: CHAT-BOOTSTRAP-TASK-HANDLER-INITIALIZER-FILTER
+$cfg->setConfigEntry('chat_bootstrap_task_handler_initializer_filter', 'ChatTaskHandlerInitializerFilter');
+
+// CFG: CHAT-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
+$cfg->setConfigEntry('chat_bootstrap_extra_bootstrapping_filter', 'ChatBootstrapExtraBootstrappingFilter');
+
+// CFG: CHAT-BOOTSTRAP-GENERIC-ACTIVATION-FILTER
+$cfg->setConfigEntry('chat_bootstrap_generic_activation_filter', 'ChatBootstrapGenericActivationFilter');
+
+// CFG: CHAT-SHUTDOWN-FILTER
+$cfg->setConfigEntry('chat_shutdown_filter', 'ChatShutdownFilter');
+
+// CFG: CHAT-TELNET-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('chat_telnet_listener_task_class', 'ChatTelnetListenerTask');
+
+// CFG: TASK-CHAT-TELNET-LISTENER-STARTUP-DELAY
+$cfg->setConfigEntry('task_chat_telnet_listener_startup_delay', 2500);
+
+// CFG: TASK-CHAT-TELNET-LISTENER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chat_telnet_listener_interval_delay', 10);
+
+// CFG: TASK-CHAT-TELNET-LISTENER-MAX-RUNS
+$cfg->setConfigEntry('task_chat_telnet_listener_max_runs', 0);
+
+///////////////////////////////////////////////////////////////////////////////
+//                            HTTP Configuration
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: DEFAULT-WEB-COMMAND
+$cfg->setConfigEntry('default_web_command', 'home');
+
+// CFG: WEB-CMD-HOME-RESOLVER-CLASS
+$cfg->setConfigEntry('web_cmd_home_resolver_class', 'WebCommandResolver');
+
+// CFG: NEWS-HOME-LIMIT
+$cfg->setConfigEntry('news_home_limit', 10);
+
 // [EOF]
 ?>