Suppress verbose output of "route add" when instantiating vimage nodes.

Fix a bug which prevented static IPv4 routes to be configured via the GUI.

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

diff --git a/editor.tcl b/editor.tcl
index e7bda3383efd158a0992859a8ba6a71f4c8b3258..5c8803e8ea5177de6f8a73acdb954a03b8ae1ef5 100755 (executable)
--- a/editor.tcl
+++ b/editor.tcl
@@ -1105,6 +1105,9 @@ proc checkIntRange { str low high } {
        return 1
     }
     set str [string trimleft $str 0]
+    if { $str == "" } {
+       set str 0
+    }
     if { ![string is integer $str] } {
        return 0
     }

diff --git a/host.tcl b/host.tcl
index d808d98808a2383e11dffb3d9e855405899083c4..b043b3b5a1bf876304dc37ec20d458c730bfe920 100755 (executable)
--- a/host.tcl
+++ b/host.tcl
@@ -60,10 +60,10 @@ proc $MODULE.cfggen { node } {
     lappend cfg ""
 
     foreach statrte [getStatIPv4routes $node] {
-       lappend cfg "route add -inet $statrte"
+       lappend cfg "route -q add -inet $statrte"
     }
     foreach statrte [getStatIPv6routes $node] {
-       lappend cfg "route add -inet6 $statrte"
+       lappend cfg "route -q add -inet6 $statrte"
     }
 
     lappend cfg "portmap"

diff --git a/ipv6.tcl b/ipv6.tcl
index a352dfd4a8ad75a7ee67a5b43956761bd9067eb2..02517f9b591b47653cdbd5e6617f20775972765b 100755 (executable)
--- a/ipv6.tcl
+++ b/ipv6.tcl
@@ -110,7 +110,7 @@ proc checkIPv6Addr { str } {
     set doublec false
     set wordlist [split $str :]
     set wordcnt [expr [llength $wordlist] - 1]
-    if { $wordcnt > 7 } {
+    if { $wordcnt < 2 || $wordcnt > 7 } {
         return 0
     }
     if { [lindex $wordlist 0] == "" } {

diff --git a/pc.tcl b/pc.tcl
index 1ffe76b7d7cb2098de9be147b91e436c9aadb54f..6a01f7f4386e0b7e295f7a23cbf34fd3d1f10dc9 100755 (executable)
--- a/pc.tcl
+++ b/pc.tcl
@@ -60,10 +60,10 @@ proc $MODULE.cfggen { node } {
     lappend cfg ""
 
     foreach statrte [getStatIPv4routes $node] {
-       lappend cfg "route add -inet $statrte"
+       lappend cfg "route -q add -inet $statrte"
     }
     foreach statrte [getStatIPv6routes $node] {
-       lappend cfg "route add -inet6 $statrte"
+       lappend cfg "route -q add -inet6 $statrte"
     }
 
     return $cfg

diff --git a/static.tcl b/static.tcl
index 1e1311a113a24c20fb84f1e8c199c7ee400b2719..7ccdf0685c27fa600e09056d080ad0ea8b54c456 100755 (executable)
--- a/static.tcl
+++ b/static.tcl
@@ -60,10 +60,10 @@ proc $MODULE.cfggen { node } {
     lappend cfg ""
 
     foreach statrte [getStatIPv4routes $node] {
-       lappend cfg "route add -inet $statrte"
+       lappend cfg "route -q add -inet $statrte"
     }
     foreach statrte [getStatIPv6routes $node] {
-       lappend cfg "route add -inet6 $statrte"
+       lappend cfg "route -q add -inet6 $statrte"
     }
 
     return $cfg