Node-id is now deemed 'classified' because it will be used to create signatures,...

diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
index 52e3664322e5d657a7a9d23919d601839353ec71..85ed3b4113835d084daf6074343ec654392b8ff4 100644 (file)
--- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
+++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
@@ -38,7 +38,6 @@ class XmlAnnouncementTemplateEngine extends BaseTemplateEngine implements Compil
                'listener',
                'hub-listener',
                'client-listener',
-               'node-id',
                'node-status',
                'tcp-port',
                'udp-port',
@@ -313,16 +312,6 @@ class XmlAnnouncementTemplateEngine extends BaseTemplateEngine implements Compil
                $this->getStackerInstance()->pushNamed('announcement', 'announcement-data');
        }
 
-       /**
-        * Starts the node id
-        *
-        * @return      void
-        */
-       private function startNodeId () {
-               // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'node-id');
-       }
-
        /**
         * Starts the node status
         *
@@ -503,16 +492,6 @@ class XmlAnnouncementTemplateEngine extends BaseTemplateEngine implements Compil
                $this->getStackerInstance()->popNamed('announcement');
        }
 
-       /**
-        * Finishes the node id
-        *
-        * @return      void
-        */
-       private function finishNodeId () {
-               // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
-       }
-
        /**
         * Finishes the announcement data
         *

diff --git a/application/hub/templates/xml/announcement/self_announcement.xml b/application/hub/templates/xml/announcement/self_announcement.xml
index dabd764c0af9ad79f842e8f69fc0212464308662..be4da786d4f216892e3d360367e5b3bac11834d9 100644 (file)
--- a/application/hub/templates/xml/announcement/self_announcement.xml
+++ b/application/hub/templates/xml/announcement/self_announcement.xml
@@ -25,10 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <announcement>
        <!-- Announcement data like, node id, session id and object types. //-->
        <announcement-data>
-               <!-- Our node id. This should be announced only to upper hubs. //-->
-               <node-id>{?node_id?}</node-id>
                <!-- Status of this node, see node_status.xml for details. //-->
                <node-status>{?node_status?}</node-status>
+               <!-- The session id. This should be announced to all other hubs. //-->
+               <session-id>{?session_id?}</session-id>
                <!-- Data from our listeners (e.g. which port) //-->
                <listener>
                        <!-- Listener ports for hub connections //-->
@@ -42,7 +42,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                <udp-port>{?node_udp_listen_port?}</udp-port>
                        </client-listener>
                </listener>
-               <!-- The session id. This should be announced to all other hubs. //-->
-               <session-id>{?session_id?}</session-id>
        </announcement-data>
 </announcement>

diff --git a/application/hub/templates/xml/self_connect/self_connect.xml b/application/hub/templates/xml/self_connect/self_connect.xml
index 45e11956af6042a4825e535c37c37d8275e5e252..9053363529444b0bad34e82418b6dc5022d9e795 100644 (file)
--- a/application/hub/templates/xml/self_connect/self_connect.xml
+++ b/application/hub/templates/xml/self_connect/self_connect.xml
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <self-connect>
        <!-- Self-connect data, e.g. session/hub id for verification //-->
        <self-connect-data>
-               <!-- Our node id. This should be announced only to upper hubs. //-->
+               <!-- Our node id. This should be kept private now. //-->
                <node-id>{?node_id?}</node-id>
                <!-- The session id. This should be announced to all other hubs. //-->
                <session-id>{?session_id?}</session-id>