ngnodemap vise nije posljedica instantiate vec start, pa nuzna prilagodba

diff --git a/linux/hub.tcl b/linux/hub.tcl
index 9bde62b4c5fcad3e2f7dcfe86ec41af1dfccfb8c..b04b7eed47baecc63f7370ad9b11e213f990672b 100755 (executable)
--- a/linux/hub.tcl
+++ b/linux/hub.tcl
@@ -84,7 +84,6 @@ proc $MODULE.instantiate { eid node } {
     
     #puts "  >>> id = $id"
     #puts "  catch {exec vimage $eid ngctl name \[$id\]: $node}"
-    set ngnodemap($eid\.$node) $node
     
 }
 
@@ -101,6 +100,7 @@ proc $MODULE.instantiate { eid node } {
 #   * node_id - id of the node (type of the node is hub)
 #****
 proc $MODULE.start { eid node } {
+    set ngnodemap($eid\.$node) $node
 }
 
 #****f* hub.tcl/hub.shutdown

diff --git a/linux/rj45.tcl b/linux/rj45.tcl
index ae881b4b7b850cca833851f66120fc4e1f56669e..c9b528fb1048f3dbb43e1a5e026ced3ee7c642b2 100755 (executable)
--- a/linux/rj45.tcl
+++ b/linux/rj45.tcl
@@ -74,10 +74,6 @@ proc $MODULE.layer {} {
 proc $MODULE.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
 
-    set ifname [getNodeName $node]
-    set ngnodemap($ifname) $ifname
-    # nexec vimage -i $eid $ifname $ifname
-    # nexec vimage $eid ifconfig $ifname up promisc
 }
 
 
@@ -94,6 +90,10 @@ proc $MODULE.instantiate { eid node } {
 #   * node_id - id of the node (type of the node is rj45)
 #****
 proc $MODULE.start { eid node } {
+    set ifname [getNodeName $node]
+    set ngnodemap($ifname) $ifname
+    # nexec vimage -i $eid $ifname $ifname
+    # nexec vimage $eid ifconfig $ifname up promisc
 }