X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fconfig.php;h=8c9e480604c14449d6eaaea01f375f2c94423175;hb=3c455ba2c2d9e9e613aaf5ec659909057d5ad74a;hp=a49c07018139a2d9df57db583805f6adc891cc57;hpb=9370547a2033515642a408be7eaf459c7e85ece5;p=hub.git

diff --git a/application/hub/config.php b/application/hub/config.php
index a49c07018..8c9e48060 100644
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -27,11 +27,8 @@ $cfg = FrameworkConfiguration::getSelfInstance();
 // CFG: NODE-LISTEN-ADDR
 $cfg->setConfigEntry('node_listen_addr', '0.0.0.0');
 
-// CFG: NODE-TCP-LISTEN-PORT
-$cfg->setConfigEntry('node_tcp_listen_port', 9060);
-
-// CFG: NODE-UDP-LISTEN-PORT
-$cfg->setConfigEntry('node_udp_listen_port', 9060);
+// CFG: NODE-LISTEN-PORT
+$cfg->setConfigEntry('node_listen_port', 9060);
 
 // CFG: NODE-DEFAULT-MODE (can be 'regular', 'list', 'master' or 'boot', default is 'regular')
 $cfg->setConfigEntry('node_default_mode', 'regular');
@@ -48,8 +45,11 @@ $cfg->setConfigEntry('debug_class', 'DebugConsoleOutput');
 // CFG: NODE-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('node_info_db_wrapper_class', 'NodeInformationDatabaseWrapper');
 
-// CFG: NODE-LIST-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('node_list_db_wrapper_class', 'NodeListDatabaseWrapper');
+// CFG: NODE-DHT-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('node_dht_db_wrapper_class', 'NodeDistributedHashTableDatabaseWrapper');
+
+// CFG: NODE-DHT-LIST-LIMIT
+$cfg->setConfigEntry('node_dht_list_limit', 20);
 
 // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper');
@@ -57,12 +57,6 @@ $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatab
 // CFG: WEB-CONTENT-TYPE
 $cfg->setConfigEntry('web_content_type', '');
 
-// CFG: QUERY-CONNECTOR-CLASS
-$cfg->setConfigEntry('query_connector_class', 'LocalQueryConnector');
-
-// CFG: QUEUE-CONNECTOR-CLASS
-$cfg->setConfigEntry('queue_connector_class', 'LocalQueueConnector');
-
 // CFG: LISTENER-POOL-CLAS
 $cfg->setConfigEntry('listener_pool_class', 'DefaultListenerPool');
 
@@ -72,11 +66,11 @@ $cfg->setConfigEntry('tcp_listener_class', 'TcpListener');
 // CFG: UDP-LISTENER-CLASS
 $cfg->setConfigEntry('udp_listener_class', 'UdpListener');
 
-// CFG: HUB-TCP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_tcp_listener_class', 'HubTcpListenerDecorator');
+// CFG: NODE-TCP-LISTENER-CLASS
+$cfg->setConfigEntry('node_tcp_listener_class', 'HubTcpListenerDecorator');
 
-// CFG: HUB-UDP-LISTENER-CLASS
-$cfg->setConfigEntry('hub_udp_listener_class', 'HubUdpListenerDecorator');
+// CFG: NODE-UDP-LISTENER-CLASS
+$cfg->setConfigEntry('node_udp_listener_class', 'HubUdpListenerDecorator');
 
 // CFG: CLIENT-TCP-LISTENER-CLASS
 $cfg->setConfigEntry('client_tcp_listener_class', 'ClientTcpListenerDecorator');
@@ -126,11 +120,14 @@ $cfg->setConfigEntry('node_raw_data_monitor_visitor_class', 'RawDataPoolMonitorV
 // CFG: LIST-GROUP-CLASS
 $cfg->setConfigEntry('list_group_class', 'ListGroupList');
 
-// CFG: HUB-ANNOUNCEMENT-HELPER-CLASS
-$cfg->setConfigEntry('hub_announcement_helper_class', 'HubAnnouncementHelper');
+// CFG: NODE-ANNOUNCEMENT-HELPER-CLASS
+$cfg->setConfigEntry('node_announcement_helper_class', 'NodeAnnouncementHelper');
 
-// CFG: HUB-SELF-CONNECT-HELPER-CLASS
-$cfg->setConfigEntry('hub_self_connect_helper_class', 'HubSelfConnectHelper');
+// CFG: NODE-SELF-CONNECT-HELPER-CLASS
+$cfg->setConfigEntry('node_self_connect_helper_class', 'NodeSelfConnectHelper');
+
+// CFG: DHT-BOOTSTRAP-HELPER-CLASS
+$cfg->setConfigEntry('dht_bootstrap_helper_class', 'DhtBootstrapHelper');
 
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'main');
@@ -159,8 +156,8 @@ $cfg->setConfigEntry('node_initializer_filter', 'NodeInitializationFilter');
 // CFG: NODE-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
 $cfg->setConfigEntry('node_activation_task_handler_initializer_filter', 'NodeTaskHandlerInitializerFilter');
 
-// CFG: NODE-ACTIVATION-SELF-ANNOUNCEMENT-TASK-FILTER
-$cfg->setConfigEntry('node_activation_self_announcement_task_filter', 'NodeActivationSelfAnnouncementFilter');
+// CFG: NODE-ACTIVATION-ANNOUNCEMENT-TASK-FILTER
+$cfg->setConfigEntry('node_activation_announcement_task_filter', 'NodeActivationAnnouncementFilter');
 
 // CFG: NODE-WELCOME-TEASER-FILTER
 $cfg->setConfigEntry('node_welcome_teaser_filter', 'NodeWelcomeTeaserFilter');
@@ -174,12 +171,6 @@ $cfg->setConfigEntry('node_bootstrap_generate_sessionid_filter', 'NodeBootstrapG
 // CFG: NODE-BOOTSTRAP-GENERATE-PRIVATE-KEY-FILTER
 $cfg->setConfigEntry('node_bootstrap_generate_private_key_filter', 'NodeBootstrapGeneratePrivateKeyFilter');
 
-// CFG: NODE-BOOTSTRAP-RESTORE-NODELIST-FILTER
-$cfg->setConfigEntry('node_bootstrap_restore_nodelist_filter', 'NodeBootstrapRestoreNodeListFilter');
-
-// CFG: NODE-BOOTSTRAP-INIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_bootstrap_init_queues_filter', 'NodeBootstrapInitQueuesFilter');
-
 // CFG: NODE-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
 $cfg->setConfigEntry('node_bootstrap_extra_bootstrapping_filter', 'NodeBootstrapExtraBootstrappingFilter');
 
@@ -189,9 +180,6 @@ $cfg->setConfigEntry('node_bootstrap_listener_pool_filter', 'NodeBootstrapListen
 // CFG: NODE-SHUTDOWN-FLUSH-NODE-LIST-FILTER
 $cfg->setConfigEntry('node_shutdown_flush_node_list_filter', 'NodeShutdownFlushNodeListFilter');
 
-// CFG: NODE-SHUTDOWN-DEINIT-QUEUES-FILTER
-$cfg->setConfigEntry('node_shutdown_deinit_queues_filter', 'NodeShutdownDeinitQueuesFilter');
-
 // CFG: NODE-SHUTDOWN-TASK-HANDLER-FILTER
 $cfg->setConfigEntry('node_shutdown_task_handler_filter', 'NodeShutdownTaskHandlerFilter');
 
@@ -258,9 +246,15 @@ $cfg->setConfigEntry('node_request_node_list_answer_template_class', 'XmlRequest
 // CFG: NODE-REQUEST-NODE-LIST-ENTRIES-TEMPLATE-CLASS
 $cfg->setConfigEntry('node_request_node_list_entries_template_class', 'XmlRequestNodeListEntryTemplateEngine');
 
+// CFG: DHT-BOOTSTRAP-TEMPLATE-CLASS
+$cfg->setConfigEntry('dht_bootstrap_template_class', 'XmlDhtBootstrapTemplateEngine');
+
 // CFG: NODE-MESSAGE-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('node_message_template_extension', '.xml');
 
+// CFG: DHT-MESSAGE-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('dht_message_template_extension', '.xml');
+
 // CFG: NODE-ANNOUNCEMENT-ANSWER-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('node_announcement_answer_template_extension', '.xml');
 
@@ -279,6 +273,9 @@ $cfg->setConfigEntry('node_request_node_list_answer_stacker_class', 'FiLoStacker
 // CFG: NODE-REQUEST-NODE-LIST-ENTRY-STACKER-CLASS
 $cfg->setConfigEntry('node_request_node_list_entry_stacker_class', 'FiLoStacker');
 
+// CFG: DHT-STACKER-CLASS
+$cfg->setConfigEntry('dht_stacker_class', 'FiLoStacker');
+
 // CFG: NODE-ANNOUNCEMENT-ANSWER-TEMPLATE-TYPE
 $cfg->setConfigEntry('node_announcement_answer_template_type', 'xml/answer/announcement');
 
@@ -315,9 +312,15 @@ $cfg->setConfigEntry('node_object_registry_stacker_class', 'FiLoStacker');
 // CFG: NODE-OBJECT-TYPE-REGISTRY-CLASS
 $cfg->setConfigEntry('node_object_type_registry_class', 'ObjectTypeRegistry');
 
+// CFG: DHT-BOOTSTRAP-TEMPLATE-TYPE
+$cfg->setConfigEntry('dht_bootstrap_template_type', 'xml/dht_bootstrap');
+
 // CFG: CODE-TEMPLATE-TYPE
 $cfg->setConfigEntry('code_template_type', 'xml');
 
+// CFG: RAW-TEMPLATE-EXTENSION (to speed-up things)
+$cfg->setConfigEntry('raw_template_extension', '.xml');
+
 // CFG: PACKAGE-STACKER-CLASS
 $cfg->setConfigEntry('network_package_stacker_class', 'FiFoStacker');
 
@@ -327,6 +330,9 @@ $cfg->setConfigEntry('node_raw_data_stacker_class', 'FiFoStacker');
 // CFG: CHUNK-HANDLER-STACKER-CLASS
 $cfg->setConfigEntry('chunk_handler_stacker_class', 'FiFoStacker');
 
+// CFG: DHT-BOOTSTRAP-STACKER-CLASS
+$cfg->setConfigEntry('dht_bootstrap_stacker_class', 'FiFoStacker');
+
 // CFG: PRODUCER-OUTGOING-QUEUE
 $cfg->setConfigEntry('producer_outgoing_queue', 'FiFoStacker');
 
@@ -378,21 +384,9 @@ $cfg->setConfigEntry('stacker_package_processed_message_max_size', 400);
 // 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);
-
-// CFG: STACKER-OUT-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_out_queue_max_size', 10000);
-
 // CFG: STACKER-NODE-OBJECT-REGISTRY-MAX-SIZE
 $cfg->setConfigEntry('stacker_node_object_registry_max_size', 100);
 
-// CFG: STACKER-OUTGOING-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_outgoing_queue_max_size', 100000);
-
-// CFG: STACKER-INCOMING-QUEUE-MAX-SIZE
-$cfg->setConfigEntry('stacker_incoming_queue_max_size', 100000);
-
 // CFG: STACKER-RAW-DATA-MAX-SIZE
 $cfg->setConfigEntry('stacker_raw_data_max_size', 100);
 
@@ -408,29 +402,26 @@ $cfg->setConfigEntry('stacker_chunk_raw_data_max_size', 100);
 // CFG: STACKER-DECODED-PACKAGE-MAX-SIZE
 $cfg->setConfigEntry('stacker_decoded_package_max_size', 100);
 
+// CFG: STACKER-DHT-BOOTSTRAP-MAX-SIZE
+$cfg->setConfigEntry('stacker_dht_bootstrap_max_size', 10);
+
+// CFG: STACKER-DHT-INSERT-NODE-MAX-SIZE
+$cfg->setConfigEntry('stacker_dht_insert_node_max_size', 100);
+
 // CFG: NEWS-MAIN-LIMIT
 $cfg->setConfigEntry('news_main_limit', 5);
 
 // CFG: TASK-HANDLER-CLASS
 $cfg->setConfigEntry('task_handler_class', 'TaskHandler');
 
-// CFG: TASK-QUERY-HANDLER-STARTUP-DELAY
-$cfg->setConfigEntry('task_query_handler_startup_delay', 1000);
-
-// CFG: TASK-QUERY-HANDLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_query_handler_interval_delay', 10);
+// CFG: TASK-PACKAGE-TAGS-INIT-STARTUP-DELAY
+$cfg->setConfigEntry('task_package_tags_init_startup_delay', 50);
 
-// CFG: TASK-QUERY-HANDLER-MAX-RUNS
-$cfg->setConfigEntry('task_query_handler_max_runs', 0);
+// CFG: TASK-PACKAGE-TAGS-INIT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_package_tags_init_interval_delay', 1000*60*60*24*7);
 
-// CFG: TASK-QUEUE-HANDLER-STARTUP-DELAY
-$cfg->setConfigEntry('task_queue_handler_startup_delay', 1000);
-
-// CFG: TASK-QUEUE-HANDLER-INTERVAL-DELAY
-$cfg->setConfigEntry('task_queue_handler_interval_delay', 10);
-
-// CFG: TASK-QUEUE-HANDLER-MAX-RUNS
-$cfg->setConfigEntry('task_queue_handler_max_runs', 0);
+// CFG: TASK-PACKAGE-TAGS-INIT-MAX-RUNS
+$cfg->setConfigEntry('task_package_tags_init_max_runs', 1);
 
 // CFG: TASK-IDLE-LOOP-STARTUP-DELAY
 $cfg->setConfigEntry('task_idle_loop_startup_delay', 0);
@@ -450,14 +441,14 @@ $cfg->setConfigEntry('task_self_connect_interval_delay', 1000*60*30);
 // CFG: TASK-SELF-CONNECT-MAX-RUNS
 $cfg->setConfigEntry('task_self_connect_max_runs', 0);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-STARTUP-DELAY
-$cfg->setConfigEntry('task_self_announcement_startup_delay', 10000);
+// CFG: TASK-ANNOUNCEMENT-STARTUP-DELAY
+$cfg->setConfigEntry('task_announcement_startup_delay', 10000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-INTERVAL-DELAY
-$cfg->setConfigEntry('task_self_announcement_interval_delay', 1000);
+// CFG: TASK-ANNOUNCEMENT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_announcement_interval_delay', 1000);
 
-// CFG: TASK-SELF-ANNOUNCEMENT-MAX-RUNS
-$cfg->setConfigEntry('task_self_announcement_max_runs', 1);
+// CFG: TASK-ANNOUNCEMENT-MAX-RUNS
+$cfg->setConfigEntry('task_announcement_max_runs', 1);
 
 // CFG: TASK-UPDATE-CHECK-STARTUP-DELAY
 $cfg->setConfigEntry('task_update_check_startup_delay', 1000*60*60*6);
@@ -480,32 +471,44 @@ $cfg->setConfigEntry('task_ping_max_runs', 0);
 // CFG: IDLE-TASK-CLASS
 $cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
 
-// CFG: HUB-SELFCONNECT-TASK-CLASS
-$cfg->setConfigEntry('hub_selfconnect_task_class', 'HubSelfConnectTask');
+// CFG: NODE-PACKAGE-TAGS-INIT-TASK-CLASS
+$cfg->setConfigEntry('node_package_tags_init_task_class', 'NodePackageTagsInitTask');
+
+// CFG: NODE-SELFCONNECT-TASK-CLASS
+$cfg->setConfigEntry('node_selfconnect_task_class', 'NodeSelfConnectTask');
+
+// CFG: NODE-UPDATE-CHECK-TASK-CLASS
+$cfg->setConfigEntry('node_update_check_task_class', 'NodeUpdateCheckTask');
+
+// CFG: NODE-PING-TASK-CLASS
+$cfg->setConfigEntry('node_ping_task_class', 'NodePingTask');
+
+// CFG: NODE-ANNOUNCEMENT-TASK-CLASS
+$cfg->setConfigEntry('node_announcement_task_class', 'NodeAnnouncementTask');
 
-// CFG: HUB-UPDATE-CHECK-TASK-CLASS
-$cfg->setConfigEntry('hub_update_check_task_class', 'HubUpdateCheckTask');
+// CFG: NODE-PACKAGE-WRITER-TASK-CLASS
+$cfg->setConfigEntry('node_package_writer_task_class', 'NetworkPackageWriterTask');
 
-// CFG: HUB-PING-TASK-CLASS
-$cfg->setConfigEntry('hub_ping_task_class', 'HubPingTask');
+// CFG: NODE-PACKAGE-READER-TASK-CLASS
+$cfg->setConfigEntry('node_package_reader_task_class', 'NetworkPackageReaderTask');
 
-// CFG: HUB-SELF-ANNOUNCEMENT-TASK-CLASS
-$cfg->setConfigEntry('hub_self_announcement_task_class', 'HubSelfAnnouncementTask');
+// CFG: NODE-SOCKET-LISTENER-TASK-CLASS
+$cfg->setConfigEntry('node_socket_listener_task_class', 'NodeSocketListenerTask');
 
-// CFG: HUB-PACKAGE-WRITER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_writer_task_class', 'NetworkPackageWriterTask');
+// CFG: NODE-CHUNK-ASSEMBLER-TASK-CLASS
+$cfg->setConfigEntry('node_chunk_assembler_task_class', 'NodeChunkAssemblerTask');
 
-// CFG: HUB-PACKAGE-READER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_reader_task_class', 'NetworkPackageReaderTask');
+// CFG: NODE-PACKAGE-DECODER-TASK-CLASS
+$cfg->setConfigEntry('node_package_decoder_task_class', 'NodePackageDecoderTask');
 
-// CFG: HUB-SOCKET-LISTENER-TASK-CLASS
-$cfg->setConfigEntry('hub_socket_listener_task_class', 'HubSocketListenerTask');
+// CFG: NODE-DHT-INIT-TASK-CLASS
+$cfg->setConfigEntry('node_dht_init_task_class', 'NodeDhtInitializationTask');
 
-// CFG: HUB-CHUNK-ASSEMBLER-TASK-CLASS
-$cfg->setConfigEntry('hub_chunk_assembler_task_class', 'HubChunkAssemblerTask');
+// CFG: NODE-DHT-BOOTSTRAP-TASK-CLASS
+$cfg->setConfigEntry('node_dht_bootstrap_task_class', 'NodeDhtBootstrapTask');
 
-// CFG: HUB-PACKAGE-DECODER-TASK-CLASS
-$cfg->setConfigEntry('hub_package_decoder_task_class', 'HubPackageDecoderTask');
+// CFG: NODE-DHT-QUERY-TASK-CLASS
+$cfg->setConfigEntry('node_dht_query_task_class', 'NodeDhtQueryTask');
 
 // CFG: TASK-NETWORK-PACKAGE-WRITER-STARTUP-DELAY
 $cfg->setConfigEntry('task_network_package_writer_startup_delay', 2500);
@@ -534,23 +537,50 @@ $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->setConfigEntry('task_package_decoder_interval_delay', 50);
+
+// CFG: TASK-PACKAGE-DECODER-MAX-RUNS
+$cfg->setConfigEntry('task_package_decoder_max_runs', 0);
+
+// CFG: TASK-CHUNK-ASSEMBLER-STATUP-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_startup_delay', 1500);
+
+// CFG: TASK-CHUNK-ASSEMBLER-INTERVAL-DELAY
+$cfg->setConfigEntry('task_chunk_assembler_interval_delay', 50);
 
 // 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-DHT-INIT-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_init_startup_delay', 100);
+
+// CFG: TASK-DHT-INIT-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_init_interval_delay', 86400000); // = 1 day (won't matter anyway)
+
+// CFG: TASK-DHT-INIT-MAX-RUNS
+$cfg->setConfigEntry('task_dht_init_max_runs', 1);
+
+// CFG: TASK-DHT-BOOTSTRAP-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_startup_delay', 100);
+
+// CFG: TASK-DHT-BOOTSTRAP-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_bootstrap_interval_delay', 3600000); // = 1 hour (won't matter anyway)
+
+// CFG: TASK-DHT-BOOTSTRAP-MAX-RUNS
+$cfg->setConfigEntry('task_dht_bootstrap_max_runs', 1);
+
+// CFG: TASK-DHT-QUERY-STATUP-DELAY
+$cfg->setConfigEntry('task_dht_query_startup_delay', 1400);
+
+// CFG: TASK-DHT-QUERY-INTERVAL-DELAY
+$cfg->setConfigEntry('task_dht_query_interval_delay', 50);
+
+// CFG: TASK-DHT-QUERY-MAX-RUNS
+$cfg->setConfigEntry('task_dht_query_max_runs', 0);
 
 // CFG: TASK-LIST-CLASS
 $cfg->setConfigEntry('task_list_class', 'TaskList');
@@ -567,36 +597,12 @@ $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
 // CFG: QUERY-ITERATOR-CLASS
 $cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
 
-// CFG: HUB-PING-ITERATOR-CLASS
-$cfg->setConfigEntry('hub_ping_iterator_class', 'HubPingIterator');
-
-// CFG: LOCAL-QUERY-LIST-CLASS
-$cfg->setConfigEntry('local_query_list_class', 'LocalQueryList');
-
-// CFG: LOCAL-QUERY-CLASS
-$cfg->setConfigEntry('local_query_class', 'LocalQuery');
+// CFG: NODE-PING-ITERATOR-CLASS
+$cfg->setConfigEntry('node_ping_iterator_class', 'HubPingIterator');
 
 // CFG: WEB-TEMPLATE-CLASS @OVERRIDE
 $cfg->setConfigEntry('web_template_class', 'ConsoleTemplateEngine');
 
-// CFG: NODE-INIT-STATE-CLASS
-$cfg->setConfigEntry('node_init_state_class', 'NodeInitState');
-
-// CFG: NODE-VIRGIN-STATE-CLASS
-$cfg->setConfigEntry('node_virgin_state_class', 'NodeVirginState');
-
-// CFG: NODE-ACTIVE-STATE-CLASS
-$cfg->setConfigEntry('node_active_state_class', 'NodeActiveState');
-
-// CFG: NODE-ANNOUNCED-STATE-CLASS
-$cfg->setConfigEntry('node_announced_state_class', 'NodeAnnouncedState');
-
-// CFG: NODE-REACHABLE-STATE-CLASS
-$cfg->setConfigEntry('node_reachable_state_class', 'NodeReachableState');
-
-// CFG: NODE-ANNOUNCEMENT-COMPLETED-STATE-CLASS
-$cfg->setConfigEntry('node_announcement_completed_state_class', 'NodeAnnouncementCompletedState');
-
 // CFG: NETWORK-PACKAGE-CLASS
 $cfg->setConfigEntry('network_package_class', 'NetworkPackage');
 
@@ -713,6 +719,28 @@ $cfg->setConfigEntry('package_recipient_max_count', 3);
 // CFG: NODE-DHT-CLASS
 $cfg->setConfigEntry('node_dht_class', 'NodeDhtFacade');
 
+///////////////////////////////////////////////////////////////////////////////
+//                              Node states
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: NODE-INIT-STATE-CLASS
+$cfg->setConfigEntry('node_init_state_class', 'NodeInitState');
+
+// CFG: NODE-VIRGIN-STATE-CLASS
+$cfg->setConfigEntry('node_virgin_state_class', 'NodeVirginState');
+
+// CFG: NODE-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('node_active_state_class', 'NodeActiveState');
+
+// CFG: NODE-ANNOUNCED-STATE-CLASS
+$cfg->setConfigEntry('node_announced_state_class', 'NodeAnnouncedState');
+
+// CFG: NODE-REACHABLE-STATE-CLASS
+$cfg->setConfigEntry('node_reachable_state_class', 'NodeReachableState');
+
+// CFG: NODE-ANNOUNCEMENT-COMPLETED-STATE-CLASS
+$cfg->setConfigEntry('node_announcement_completed_state_class', 'NodeAnnouncementCompletedState');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                              Peer states
 ///////////////////////////////////////////////////////////////////////////////
@@ -741,6 +769,22 @@ $cfg->setConfigEntry('peer_operation_already_progress_state_class', 'OperationAl
 // CFG: PEER-NO-ROUTE-TO-HOST-STATE-CLASS
 $cfg->setConfigEntry('peer_no_route_to_host_state_class', 'NoRouteToHostPeerState');
 
+///////////////////////////////////////////////////////////////////////////////
+//                               DHT states
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: DHT-INIT-STATE-CLASS
+$cfg->setConfigEntry('dht_init_state_class', 'DhtInitState');
+
+// CFG: DHT-VIRGIN-STATE-CLASS
+$cfg->setConfigEntry('dht_virgin_state_class', 'DhtVirginState');
+
+// CFG: DHT-BOOTING-STATE-CLASS
+$cfg->setConfigEntry('dht_booting_state_class', 'DhtBootingState');
+
+// CFG: DHT-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('dht_active_state_class', 'DhtActiveState');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                       Message answer-status handler
 ///////////////////////////////////////////////////////////////////////////////
@@ -751,6 +795,22 @@ $cfg->setConfigEntry('announcement_answer_status_okay_handler_class', 'Announcem
 // CFG: REQUEST-NODE-LIST-ANSWER-STATUS-OKAY-HANDLER-CLASS
 $cfg->setConfigEntry('request_node_list_answer_status_okay_handler_class', 'RequestNodeListAnswerOkayHandler');
 
+///////////////////////////////////////////////////////////////////////////////
+//                          Recipient resolver
+///////////////////////////////////////////////////////////////////////////////
+
+// CFG: DIRECT-RECIPIENT-CLASS
+$cfg->setConfigEntry('direct_recipient_class', 'DirectRecipient');
+
+// CFG: DHT-RECIPIENT-CLASS
+$cfg->setConfigEntry('dht_recipient_class', 'DhtRecipient');
+
+// CFG: SELF-RECIPIENT-CLASS
+$cfg->setConfigEntry('self_recipient_class', 'SelfRecipient');
+
+// CFG: UPPER-RECIPIENT-CLASS
+$cfg->setConfigEntry('upper_recipient_class', 'UpperRecipient');
+
 ///////////////////////////////////////////////////////////////////////////////
 //                        Cruncher configuration
 ///////////////////////////////////////////////////////////////////////////////