Back out a bug I previously introduced by removing an "eval" in front

of exec in proc nexec.

XORP can now be selected as a router model even if xorp is not installed
locally.  Usefull for a) editing a topology on one machine, executing it
on another and b) marketing XORP.  The default router model remains quagga.

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

diff --git a/exec.tcl b/exec.tcl
index 7174bb06edd10d4ac91dd1b0455cdd464d0a1253..8d085bee5d6ac5db6e5698d1c673c01e86ef76d3 100755 (executable)
--- a/exec.tcl
+++ b/exec.tcl
@@ -35,7 +35,7 @@
 
 
 proc nexec { args } {
-    exec $args
+    eval exec $args
 }
 
 

diff --git a/imunes.tcl b/imunes.tcl
index b2f76b220f3c944b5b498fb0603a43d8d5eaffc8..e6d3dab7cd53a2e0628c21e63093bc693cb9220f 100755 (executable)
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -79,7 +79,6 @@ set nodes {}
 set links {}
 set prefs {}
 
-set def_router_model quagga
 set newlink ""
 set selectbox ""
 set selected ""
@@ -107,10 +106,8 @@ set showIfIPaddrs 1
 set showNodeLabels 1
 set showLinkLabels 1
 
-set supp_router_models "quagga static"
-if { [file exists /usr/local/xorp/bin/xorp_rtrmgr] } {
-    set supp_router_models "xorp $supp_router_models"
-}
+set supp_router_models "xorp quagga static"
+set def_router_model quagga
 
 
 #