multiple experiment support u bridging kodu

diff --git a/linux/exec.tcl b/linux/exec.tcl
index 05f86b8c6d1258e4366a6c31f70800f6ba0de046..270db41d3115515927a7262cfef908c81d57de98 100755 (executable)
--- a/linux/exec.tcl
+++ b/linux/exec.tcl
@@ -308,7 +308,7 @@ proc l3node.instantiate { eid node } {
 
 # na Linuxu ne moramo pokrenuti createIfc, samo postaviti ovaj standardni format
 # koji ide u vzctl --netif_add
-               set ifid "to_${node}_${ifc}"
+               set ifid "e${node_id}_${ifc}"
 
                set peer [peerByIfc $node $ifc]
 
@@ -746,10 +746,12 @@ proc deployCfg {} {
             # L3 host side interface u odgovarajuci bridge
             if { [[typemodel $lnode1].layer] == "LINK" } {
                 set port_if $ngpeer2
-                set bridge $lnode1
+                set bridge "b$eid$lnode1"
+                set bridge_node $lnode1
             } else {
                 set port_if $ngpeer1
-                set bridge $lnode2
+                set bridge "b$eid$lnode2"
+                set bridge_node $lnode2
             }
         }
 
@@ -781,9 +783,10 @@ proc deployCfg {} {
         #RJ45 se ponasa kao L2 device, tj. hub, samo u njega treba odmah joinati
         #odgovarajuci fizicki interface koji je rucno upisan u gui
 
-        if { [nodeType $bridge] == "rj45" } {
-            nexec brctl addif $bridge [getNodeName $bridge]
-            puts "  RJ45 emulacija, spojen na [getNodeName $bridge] na hostu."
+        if { [nodeType $bridge_node] == "rj45" } {
+               set bridge_name [getNodeName $bridge_node]
+            nexec brctl addif $bridge $bridge_name
+            puts "  RJ45 emulacija, spojen na $bridge_name na hostu."
         }
         
         #dodaje interface