Rewrites, some more methods:

[hub.git] / application / hub / config.php

diff --git a/application/hub/config.php b/application/hub/config.php
index 1a0fa1cec72bb88a0ad8d899e5213c3ca782d86b..4063d372b44d945deedec469a569444a6ee1987f 100644 (file)
--- 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,6 +45,9 @@ $cfg->setConfigEntry('debug_class', 'DebugConsoleOutput');
 // CFG: NODE-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('node_info_db_wrapper_class', 'NodeInformationDatabaseWrapper');
 
+// CFG: NODE-DHT-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('node_dht_db_wrapper_class', 'NodeDistributedHashTableDatabaseWrapper');
+
 // CFG: PEER-LOOKUP-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('peer_state_lookup_db_wrapper_class', 'PeerStateLookupDatabaseWrapper');
 
@@ -156,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');
@@ -441,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);
@@ -498,8 +498,11 @@ $cfg->setConfigEntry('node_chunk_assembler_task_class', 'NodeChunkAssemblerTask'
 // CFG: NODE-PACKAGE-DECODER-TASK-CLASS
 $cfg->setConfigEntry('node_package_decoder_task_class', 'NodePackageDecoderTask');
 
+// CFG: NODE-DHT-INIT-TASK-CLASS
+$cfg->setConfigEntry('node_dht_init_task_class', 'NodeDhtInitializationTask');
+
 // CFG: NODE-DHT-BOOTSTRAP-TASK-CLASS
-$cfg->setConfigEntry('node_dht_bootstrap_task_class', 'NodeDhtBootsrapTask');
+$cfg->setConfigEntry('node_dht_bootstrap_task_class', 'NodeDhtBootstrapTask');
 
 // CFG: NODE-DHT-QUERY-TASK-CLASS
 $cfg->setConfigEntry('node_dht_query_task_class', 'NodeDhtQueryTask');
@@ -549,11 +552,20 @@ $cfg->setConfigEntry('task_chunk_assembler_interval_delay', 50);
 // CFG: TASK-CHUNK-ASSEMBLER-MAX-RUNS
 $cfg->setConfigEntry('task_chunk_assembler_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
+$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);