From: Roland Häder <roland@mxchange.org>
Date: Sat, 28 Apr 2012 09:04:21 +0000 (+0000)
Subject: Node-id is now deemed 'classified' because it will be used to create signatures,... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a4bbd7c86ba63f4a3dcc474294ea6619259696b9;p=hub.git

Node-id is now deemed 'classified' because it will be used to create signatures, so don't give it out. If you do so, someone else can sign his traffic with your digital signature
---

diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
index 52e366432..85ed3b411 100644
--- 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 dabd764c0..be4da786d 100644
--- 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 45e11956a..905336352 100644
--- 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>