From 32641f9750def4b13bae16d3e01a71310bec6a08 Mon Sep 17 00:00:00 2001 From: Roland 'Quix0r' Haeder Date: Sat, 15 Mar 2014 00:37:06 +0100 Subject: [PATCH] Renamed path + fixed stacker names + added some missing entries. Signed-off-by: Roland 'Quix0r' Haeder --- application/hub/config.php | 6 ++++++ .../template/{bootstrap => dht}/.htaccess | 0 .../class_XmlBootstrapTemplateEngine.php | 0 .../class_XmlDhtBootstrapTemplateEngine.php | 20 +++++++++---------- ...class_XmlDhtPublishEntryTemplateEngine.php | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) rename application/hub/main/template/{bootstrap => dht}/.htaccess (100%) rename application/hub/main/template/{bootstrap => dht}/class_XmlBootstrapTemplateEngine.php (100%) rename application/hub/main/template/{bootstrap => dht}/class_XmlDhtBootstrapTemplateEngine.php (99%) diff --git a/application/hub/config.php b/application/hub/config.php index 2b2a1d922..e37f348a0 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -288,6 +288,9 @@ $cfg->setConfigEntry('node_announcement_stacker_class', 'FiLoStacker'); // CFG: NODE-ANNOUNCEMENT-ANSWER-STACKER-CLASS $cfg->setConfigEntry('node_announcement_answer_stacker_class', 'FiLoStacker'); +// CFG: NODE-DHT-BOOTSTRAP-STACKER-CLASS +$cfg->setConfigEntry('node_dht_publish_stacker_class', 'FiLoStacker'); + // CFG: NODE-DHT-BOOTSTRAP-ANSWER-STACKER-CLASS $cfg->setConfigEntry('node_dht_bootstrap_answer_stacker_class', 'FiLoStacker'); @@ -384,6 +387,9 @@ $cfg->setConfigEntry('stacker_node_announcement_max_size', 20); // CFG: STACKER-NODE-ANNOUNCEMENT-ANSWER-MAX-SIZE $cfg->setConfigEntry('stacker_node_announcement_answer_max_size', 20); +// CFG: STACKER-NODE-DHT-BOOTSTRAP-MAX-SIZE +$cfg->setConfigEntry('stacker_node_dht_bootstrap_max_size', 10); + // CFG: STACKER-NODE-DHT-BOOTSTRAP-ANSWER-MAX-SIZE $cfg->setConfigEntry('stacker_node_dht_bootstrap_answer_max_size', 20); diff --git a/application/hub/main/template/bootstrap/.htaccess b/application/hub/main/template/dht/.htaccess similarity index 100% rename from application/hub/main/template/bootstrap/.htaccess rename to application/hub/main/template/dht/.htaccess diff --git a/application/hub/main/template/bootstrap/class_XmlBootstrapTemplateEngine.php b/application/hub/main/template/dht/class_XmlBootstrapTemplateEngine.php similarity index 100% rename from application/hub/main/template/bootstrap/class_XmlBootstrapTemplateEngine.php rename to application/hub/main/template/dht/class_XmlBootstrapTemplateEngine.php diff --git a/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php b/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php similarity index 99% rename from application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php rename to application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php index 39d2302fa..efb5f8878 100644 --- a/application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php +++ b/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php @@ -72,7 +72,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com $templateInstance = new XmlDhtBootstrapTemplateEngine(); // Init template instance - $templateInstance->initXmlTemplateEngine('dht', 'bootstrap'); + $templateInstance->initXmlTemplateEngine('node', 'dht_bootstrap'); // Return the prepared instance return $templateInstance; @@ -172,33 +172,33 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com } /** - * Starts the session id + * Starts the public ip * * @return void */ - protected function startSessionId () { + protected function startExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_SESSION_ID); + $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); } /** - * Starts the public ip + * Starts the private ip * * @return void */ - protected function startExternalIp () { + protected function startInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); + $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); } /** - * Starts the private ip + * Starts the session id * * @return void */ - protected function startInternalIp () { + protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); + $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_SESSION_ID); } /** diff --git a/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php b/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php index 2f5621197..fc3ff943e 100644 --- a/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php +++ b/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php @@ -76,7 +76,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements $templateInstance = new XmlDhtPublishEntryTemplateEngine(); // Init template instance - $templateInstance->initXmlTemplateEngine('dht', 'publish'); + $templateInstance->initXmlTemplateEngine('node', 'dht_publish'); // Return the prepared instance return $templateInstance; -- 2.39.5