Attempt at unbreaking ng_bridge and ng_hub node naming, in face of

recent hashization (reads: randomization) of ngctl list output.

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

diff --git a/hub.tcl b/hub.tcl
index 747909eb7526997e970050e8afbd338852f03c8f..8a133aeb5a2cc8c8d27380dc1f78bf8ca34f2130 100755 (executable)
--- a/hub.tcl
+++ b/hub.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: hub.tcl,v 1.14 2008/01/05 18:06:25 marko Exp $
+# $Id: hub.tcl,v 1.15 2009/03/17 14:35:19 marko Exp $
 
 
 #****h* imunes/hub.tcl
@@ -76,8 +76,8 @@ proc $MODULE.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
 
     catch {exec vimage $eid ngctl mkpeer hub anchor anchor | tail -1} resp
-    catch {exec vimage $eid ngctl l | fgrep "  Name: " | cut -c51-58 | xargs echo } nglist
-    set id [lindex $nglist 1]
+    catch {exec vimage $eid ngctl l | fgrep "  Name: <unnamed>" | cut -c51-58 | xargs echo } nglist
+    set id [lindex $nglist 0]
     catch {exec vimage $eid ngctl name \[$id\]: $node}
     set ngnodemap($eid\.$node) $node
 }

diff --git a/lanswitch.tcl b/lanswitch.tcl
index 426430415f92707989d451fbb477ef35eb0d9ce5..892a173419e23f91721c1f39f311833d63e90d22 100755 (executable)
--- a/lanswitch.tcl
+++ b/lanswitch.tcl
@@ -26,7 +26,7 @@
 # and Technology through the research contract #IP-2003-143.
 #
 
-# $Id: lanswitch.tcl,v 1.14 2008/01/05 18:06:25 marko Exp $
+# $Id: lanswitch.tcl,v 1.15 2009/03/17 14:35:19 marko Exp $
 
 
 #****h* imunes/lanswitch.tcl
@@ -76,8 +76,8 @@ proc $MODULE.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
 
     catch {exec vimage $eid ngctl mkpeer bridge anchor anchor | tail -1} resp
-    catch {exec vimage $eid ngctl l | fgrep "  Name: " | cut -c51-58 | xargs echo } nglist
-    set id [lindex $nglist 1]
+    catch {exec vimage $eid ngctl l | fgrep "  Name: <unnamed>" | cut -c51-58 | xargs echo } nglist
+    set id [lindex $nglist 0]
     catch {exec vimage $eid ngctl name \[$id\]: $node}
     set ngnodemap($eid\.$node) $node
 }