Fix for InvalidXmlNodeException (my-session-id)

diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
index e84eca40822995c8dc3b0aedb073346f7042315b..36db7c1c715afd76f55e1b974bfb296e0578e752 100644 (file)
--- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
@@ -72,7 +72,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements
                        self::ANNOUNCEMENT_DATA_TCP_PORT,
                        self::ANNOUNCEMENT_DATA_UDP_PORT,
                        self::ANNOUNCEMENT_DATA_NODE_STATUS,
-                       self::ANNOUNCEMENT_DATA_NODE_STATUS,
+                       self::ANNOUNCEMENT_DATA_SESSION_ID,
                        // Data from other node
                        'your-external-ip',
                        'your-internal-ip',

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 2e771837f6f4f41615003ddd29b8b17b60a309d8..cfcc1db3bbecefa7a965c616c0c1e54320398d06 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -8,7 +8,7 @@
 ./application/hub/interfaces/helper/connections/class_ConnectionHelper.php:38:  * @todo        We may want to implement a filter for ease notification of other objects like our pool
 ./application/hub/interfaces/helper/messages/class_MessageHelper.php:10: * @todo               Please find another name for this interface
 ./application/hub/interfaces/nodes/class_NodeHelper.php:10: * @todo            We need to find a better name for this interface
-./application/hub/main/class_BaseHubSystem.php:489:                            // @TODO On some systems it is 134, on some 107?
+./application/hub/main/class_BaseHubSystem.php:490:                            // @TODO On some systems it is 134, on some 107?
 ./application/hub/main/commands/console/class_HubConsoleChatCommand.php:107:    * @todo        Should we add some more filters?
 ./application/hub/main/commands/console/class_HubConsoleChatCommand.php:58:     * @todo        Try to create a ChatActivationTask or so
 ./application/hub/main/commands/console/class_HubConsoleCruncherCommand.php:107:        * @todo        Should we add some more filters?
@@ -51,7 +51,7 @@
 ./application/hub/main/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php:55:  * @todo        5% done
 ./application/hub/main/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php:55:  * @todo        5% done
 ./application/hub/main/filter/task/node/class_NodeTaskHandlerInitializerFilter.php:55:  * @todo        Maybe some more tasks needs to be added?
-./application/hub/main/handler/message-types/class_BaseMessageHandler.php:108:  * @todo        Add something more, e.g. spreading information over DHT
+./application/hub/main/handler/message-types/class_BaseMessageHandler.php:101:  * @todo        Add something more, e.g. spreading information over DHT
 ./application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php:71:                  // @TODO Throw an exception here instead of dying
 ./application/hub/main/handler/network/class_BaseRawDataHandler.php:148:        * @todo        This method will be moved to a better place
 ./application/hub/main/handler/network/udp/class_UdpRawDataHandler.php:58:      * @todo        0%
@@ -88,7 +88,8 @@
 ./application/hub/main/nodes/class_BaseHubNode.php:443:         * @todo        Try to make this method more generic so we can move it in BaseFrameworkSystem
 ./application/hub/main/nodes/class_BaseHubNode.php:483:         * @todo        Change the first if() block to check for a specific state
 ./application/hub/main/nodes/class_BaseHubNode.php:656:                // @TODO Add some criteria, e.g. if the node is active or so
-./application/hub/main/nodes/class_BaseHubNode.php:742:         * @todo        Find more to do here
+./application/hub/main/nodes/class_BaseHubNode.php:714:         * @todo        Add checking if this node has been announced to the sender node
+./application/hub/main/nodes/class_BaseHubNode.php:756:         * @todo        Find more to do here
 ./application/hub/main/nodes/list/class_HubListNode.php:58:     * @todo        Implement more bootstrap steps
 ./application/hub/main/nodes/list/class_HubListNode.php:68:     * @todo        Unfinished method
 ./application/hub/main/nodes/list/class_HubListNode.php:91:            // @TODO Add some filters here
@@ -141,7 +142,7 @@
 ./application/hub/main/tasks/network/class_NetworkPackageWriterTask.php:59:     * @todo        Also visit some sub-objects?
 ./application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php:10: * @todo               This template engine does not make use of setTemplateType()
 ./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:10: * @todo          This template engine does not make use of setTemplateType()
-./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:258:  * @todo        Find something useful with this!
+./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:262:  * @todo        Find something useful with this!
 ./application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php:10: * @todo             This template engine does not make use of setTemplateType()
 ./application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php:249:     * @todo        Find something useful with this!
 ./application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php:10: * @todo          This template engine does not make use of setTemplateType()