From: marko <marko>
Date: Wed, 2 Nov 2005 10:36:21 +0000 (+0000)
Subject: Suppress verbose output of "route add" when instantiating vimage nodes.
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=2c0cb6e377fe26f3e10264b45e2c9f4d18062f31;p=imunes.git

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 e7bda33..5c8803e 100755
--- 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 d808d98..b043b3b 100755
--- 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 a352dfd..02517f9 100755
--- 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 1ffe76b..6a01f7f 100755
--- 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 1e1311a..7ccdf06 100755
--- 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