Refactor node instatiation procedures for hub and lanswitch nodes

to reflect recent changes in exec.tcl, as well as kernel-level
differences between 4.11 and 7.0 netgraph virtualization model.

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

diff --git a/hub.tcl b/hub.tcl
index e58ab37b4ff56376d7118624a6cabc43816146b3..584c802834e75c82e72cb58fce3c2b9f70ba7ce5 100755 (executable)
--- a/hub.tcl
+++ b/hub.tcl
@@ -1,4 +1,4 @@
-# $Id: hub.tcl,v 1.10 2007/05/07 08:43:20 ana Exp $ 
+# $Id: hub.tcl,v 1.11 2007/05/07 23:09:07 marko Exp $ 
 #
 # Copyright 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -78,13 +78,13 @@ proc $MODULE.layer {} {
 #****
 
 proc $MODULE.instantiate { eid node } {
-    catch {nexec ngctl mkpeer hub anchor anchor | tail -1} resp
-    foreach elem [split [lindex [split $resp "\{\}"] 1]] {
-       if {[string equal -length 5 $elem "id=0x"]} {
-           set id [string range $elem 5 end]
-           catch {nexec ngctl name \[$id\]: "$eid\_$node"}
-       }
-    }
+    global ngnodemap
+
+    catch {exec ngctl mkpeer hub anchor anchor | tail -1} resp
+    catch {exec ngctl l | fgrep "  Name: " | cut -c51-58 | xargs echo } nglist
+    set id [lindex $nglist 1]
+    catch {exec ngctl name \[$id\]: $eid\_$node}
+    set ngnodemap($eid\_$node) $eid\_$node
 }
 
 #****f* hub.tcl/hub.start

diff --git a/lanswitch.tcl b/lanswitch.tcl
index 4eed885d9e19c1c924efc5070e54640d26789f8b..e879f0ae5a9eca04d5f005d47d9c36b0dff8c0c6 100755 (executable)
--- a/lanswitch.tcl
+++ b/lanswitch.tcl
@@ -1,4 +1,4 @@
-# $Id: lanswitch.tcl,v 1.10 2007/05/07 08:43:20 ana Exp $ 
+# $Id: lanswitch.tcl,v 1.11 2007/05/07 23:09:07 marko Exp $ 
 #
 # Copyright 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -78,13 +78,13 @@ proc $MODULE.layer {} {
 #****
 
 proc $MODULE.instantiate { eid node } {
-    catch {nexec ngctl mkpeer bridge anchor anchor | tail -1} resp
-    foreach elem [split [lindex [split $resp "\{\}"] 1]] {
-       if {[string equal -length 5 $elem "id=0x"]} {
-           set id [string range $elem 5 end]
-           catch {nexec ngctl name \[$id\]: "$eid\_$node"}
-       }
-    }
+    global ngnodemap
+
+    catch {exec ngctl mkpeer bridge anchor anchor | tail -1} resp
+    catch {exec ngctl l | fgrep "  Name: " | cut -c51-58 | xargs echo } nglist
+    set id [lindex $nglist 1]
+    catch {exec ngctl name \[$id\]: $eid\_$node}
+    set ngnodemap($eid\_$node) $eid\_$node
 }