From 59d07ee70f173f6822adf56f884916b8eeb73d12 Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy@numa-ubuntu-vm.(none)>
Date: Sun, 13 Sep 2009 18:24:08 +0200
Subject: [PATCH] hrm, ngnodemap je potreban za bridging code u deployCfg, pa
 ga moramo izbuildati rano - srecom trivijalan je

---
 linux/exec.tcl | 26 +++++++++++++++++++-------
 linux/hub.tcl  |  7 ++++++-
 linux/rj45.tcl | 11 +++++++----
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/linux/exec.tcl b/linux/exec.tcl
index 65d03be..4a9152e 100755
--- a/linux/exec.tcl
+++ b/linux/exec.tcl
@@ -287,6 +287,22 @@ proc l3node.instantiate { eid node } {
 # feature FreeBSD-a only (expandanje @ u symlinkovima kao node id)
 #    puts "	nexec vimage $node_id sysctl vfs.morphing_symlinks=1	"
 
+# ngnodemap moramo buildati u instantiate jer ga bridging code koristi
+    upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
+    foreach ifc [ifcList $node] {
+		switch -exact [string range $ifc 0 2] {
+		    eth {
+			set ifid "e${node_id}_${ifc}"
+			set ngnodemap($ifc@$node_id) $ifid
+		    }
+		    ser {
+# TODO: serial interfaceove zasad ne podrzavamo
+#			set ifnum [string range $ifc 3 end]
+#			set ngnodemap(hdlc$ifnum@$node_id) hdlc$ifnum\@$node
+		    }
+		}
+	}
+
 # TODO: OpenVZ CPU tuning
 #    set cpuconf [getNodeCPUConf $node]
 #    set cpumin [lindex [lsearch -inline $cpuconf {min *}] 1]
@@ -388,12 +404,10 @@ proc l3node.start { eid node } {
 	switch -exact [string range $ifc 0 2] {
 	    eth {
 # FreeBSD-specific:
-#		set ifid [createIfc $eid eiface ether]
 #		puts "	nexec vimage $eid vimage -i $node $ifid $ifc	"
-
-# na Linuxu ne moramo pokrenuti createIfc, samo postaviti ovaj standardni format
-# koji ide u vzctl --netif_add
-		set ifid "e${node_id}_${ifc}"
+# na Linux/OpenVZ ne moramo pokrenuti createIfc/vimage, samo izvaditi
+# ime interfacea iz ngnodemapa za vzctl --netif_add
+		set ifid ngnodemap($ifc@$node_id)
 
 		set peer [peerByIfc $node $ifc]
 
@@ -417,7 +431,6 @@ proc l3node.start { eid node } {
 		}
 #		puts "	nexec vimage $node_id ifconfig $ifc link $ether	"
 		nexec vzctl {set} $node_id --netif_add $ifc,$ether,$ifid,$host_ether
-		set ngnodemap($ifc@$node_id) $ifid
 	    }
 	    ser {
 # TODO: serial interfaceove zasad ne podrzavamo
@@ -428,7 +441,6 @@ proc l3node.start { eid node } {
 #		nexec vimage $eid ngctl msg $ifid: broadcast
 #		nexec vimage $eid ngctl name $ifid:inet hdlc$ifnum\@$node
 #		nexec vimage $eid vimage -i $node $ifid $ifc
-#		set ngnodemap(hdlc$ifnum@$node_id) hdlc$ifnum\@$node
 	    }
 	}
     }
diff --git a/linux/hub.tcl b/linux/hub.tcl
index b04b7ee..4f620f0 100755
--- a/linux/hub.tcl
+++ b/linux/hub.tcl
@@ -75,6 +75,12 @@ proc $MODULE.layer {} {
 proc $MODULE.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
 
+# TODO mozda mapformat treba biti standardni node_id?
+#    upvar 0 ::cf::[set ::curcfg]::[set node]::node_id node_id
+#    set mapformat $node_id
+    set mapformat "$eid\.$node"
+    set ngnodemap($mapformat) $node
+
 #    puts "\nhub.INSTANTIATE"
 #    puts "  Ne radi nista. Sve se rjesava prilikom dodavanja pojedinih linkova.
 
@@ -100,7 +106,6 @@ 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 c9b528f..671de19 100755
--- a/linux/rj45.tcl
+++ b/linux/rj45.tcl
@@ -74,6 +74,13 @@ proc $MODULE.layer {} {
 proc $MODULE.instantiate { eid node } {
     upvar 0 ::cf::[set ::curcfg]::ngnodemap ngnodemap
 
+    set ifname [getNodeName $node]
+    set ngnodemap($ifname) $ifname
+
+# FreeBSD-specific:
+    # nexec vimage -i $eid $ifname $ifname
+# TODO je li promisc potreban? ako da, pod OpenVZ mora biti u .start
+    # nexec vimage $eid ifconfig $ifname up promisc
 }
 
 
@@ -90,10 +97,6 @@ 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
 }
 
 
-- 
2.39.5