From: marko <marko>
Date: Tue, 19 Jul 2005 00:38:20 +0000 (+0000)
Subject: Minor nits - hide the Canvas menubar until fully operational, fix spacing
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=bcf812ca36d3d43d5d42e3d210a8139b91c9429c;p=imunes.git

Minor nits - hide the Canvas menubar until fully operational, fix spacing
in xorp cfggen, remove unnecessary curly brackets un cfgparse.tcl

Bug found by:
Submitted by:
Requested by:
Reviewed by:
Approved by:
Obtained from:
---

diff --git a/canvas.tcl b/canvas.tcl
index 694cc4e..0bb61d8 100755
--- a/canvas.tcl
+++ b/canvas.tcl
@@ -32,7 +32,8 @@
 
 
 proc removeCanvas { canvas } {
-    puts "removeCanvas $canvas"
+    #puts "removeCanvas $canvas"
+    return
 }
 
 
diff --git a/cfgparse.tcl b/cfgparse.tcl
index 5bd4eb4..5b06b51 100755
--- a/cfgparse.tcl
+++ b/cfgparse.tcl
@@ -172,10 +172,10 @@ proc loadCfg { cfg } {
 		if {"$class" == "node"} {
 		    switch -exact -- $field {
 			type {
-			    lappend $object "type {$value}"
+			    lappend $object "type $value"
 		        }
 			model {
-			    lappend $object "model {$value}"
+			    lappend $object "model $value"
 		        }
 			cpu {
 			    lappend $object "cpu {$value}"
@@ -194,7 +194,7 @@ proc loadCfg { cfg } {
 			    lappend $object "network-config {$cfg}"
 		        }
 			custom-enabled {
-			    lappend $object "custom-enabled {$value}"
+			    lappend $object "custom-enabled $value"
 		        }
 			custom-command {
 			    lappend $object "custom-command {$value}"
@@ -216,7 +216,7 @@ proc loadCfg { cfg } {
 			    lappend $object "labelcoords {$value}"
 		        }
 			canvas {
-			    lappend $object "canvas {$value}"
+			    lappend $object "canvas $value"
 		        }
 		    }
 		} elseif {"$class" == "link"} {
diff --git a/imunes.tcl b/imunes.tcl
index 0b50a26..034a9ae 100755
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -102,7 +102,6 @@ set grid 24
 set sizex 1024
 set sizey 768
 set curcanvas [lindex $canvass 0]
-puts $curcanvas
 
 # Some default values
 set defLinkColor red
diff --git a/initgui.tcl b/initgui.tcl
index d630f30..e93eb36 100755
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -47,7 +47,7 @@ menu .menubar
 
 .menubar add cascade -label File -underline 0 -menu .menubar.file
 .menubar add cascade -label Edit -underline 0 -menu .menubar.edit
-.menubar add cascade -label Canvas -underline 0 -menu .menubar.canvas
+#.menubar add cascade -label Canvas -underline 0 -menu .menubar.canvas
 .menubar add cascade -label View -underline 0 -menu .menubar.view
 .menubar add cascade -label Experiment -underline 1 -menu .menubar.experiment
 .menubar add cascade -label Help -underline 0 -menu .menubar.help
diff --git a/xorp.tcl b/xorp.tcl
index 2020db1..262dfdf 100755
--- a/xorp.tcl
+++ b/xorp.tcl
@@ -54,18 +54,18 @@ proc $MODULE.cfggen { node } {
 	set ipv6addr "[lindex [split [getIfcIPv6addr $node $ifc] /] 0]"
 	set ipv6mask "[lindex [split [getIfcIPv6addr $node $ifc] /] 1]"
 	lappend cfg "    interface $ifc {"
-	lappend cfg "      vif $ifc {"
+	lappend cfg "	vif $ifc {"
         if { $ipv4addr != "" } {
-	    lappend cfg "          address $ipv4addr {"
-	    lappend cfg "              prefix-length: $ipv4mask"
-	    lappend cfg "          }"
+	    lappend cfg "	    address $ipv4addr {"
+	    lappend cfg "		prefix-length: $ipv4mask"
+	    lappend cfg "	    }"
 	}
         if { $ipv6addr != "" } {
-	    lappend cfg "          address $ipv6addr {"
-	    lappend cfg "              prefix-length: $ipv6mask"
-	    lappend cfg "          }"
+	    lappend cfg "	    address $ipv6addr {"
+	    lappend cfg "		prefix-length: $ipv6mask"
+	    lappend cfg "	    }"
 	}
-	lappend cfg "      }"
+	lappend cfg "	}"
 	lappend cfg "    }"
     }
     lappend cfg "}"
@@ -112,6 +112,10 @@ proc $MODULE.cfggen { node } {
 	lappend cfg "	    metric: 1"
 	lappend cfg "	    tag: 0"
 	lappend cfg "	}"
+	lappend cfg "	export connected {"
+	lappend cfg "	    metric: 1"
+	lappend cfg "	    tag: 0"
+	lappend cfg "	}"
 	lappend cfg ""
 	foreach ifc [ifcList $node] {
 	    set addr "[lindex [split [getIfcIPv4addr $node $ifc] /] 0]"