From: miljenko Date: Tue, 6 Dec 2005 08:55:30 +0000 (+0000) Subject: Link parameters can now (again) be changed during simulation. X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=add4eb3ca9f36d3c2f910a7a5320917d3c5861ad;p=imunes.git Link parameters can now (again) be changed during simulation. (proc execSetLinkParams) Bug found by: Submitted by: Requested by: Reviewed by: Approved by: Obtained from: --- diff --git a/editor.tcl b/editor.tcl index c3fefe7..c12ade8 100755 --- a/editor.tcl +++ b/editor.tcl @@ -1825,6 +1825,9 @@ proc popupConfigApply { wi object_type target close phase } { } set changed 1 } + if { $changed == 1 } { + execSetLinkParams $eid $target + } } } if { $changed == 1 } { diff --git a/exec.tcl b/exec.tcl index f9fa2d4..147b28a 100755 --- a/exec.tcl +++ b/exec.tcl @@ -378,10 +378,6 @@ proc deployCfg {} { statline "Creating link $link" } - set bandwidth [expr [getLinkBandwidth $link] + 0] - set delay [expr [getLinkDelay $link] + 0] - set ber [expr [getLinkBER $link] + 0] - set dup [expr [getLinkDup $link] + 0] set lname $eid\_$lnode1-$lnode2 set ngpeer1 \ @@ -400,10 +396,7 @@ proc deployCfg {} { #nexec ngctl msg $lname: setcfg "{ header_offset=14 }" HDLC ??? # Link parameters - nexec ngctl msg $lname: setcfg \ - "{ bandwidth=$bandwidth delay=$delay \ - upstream={ BER=$ber duplicate=$dup } \ - downstream={ BER=$ber duplicate=$dup } }" + execSetLinkParams # Queues foreach node [list $lnode1 $lnode2] { @@ -604,3 +597,22 @@ proc execSetIfcQLen { eid node ifc qlen } { } } + +proc execSetLinkParams { eid link } { + set lnode1 [lindex [linkPeers $link] 0] + set lnode2 [lindex [linkPeers $link] 1] + set lname $eid\_$lnode1-$lnode2 + + set bandwidth [expr [getLinkBandwidth $link] + 0] + set delay [expr [getLinkDelay $link] + 0] + set ber [expr [getLinkBER $link] + 0] + set dup [expr [getLinkDup $link] + 0] + + set mmdelay $delay + if { $delay == 0 } { set mmdelay -1 } + nexec ngctl msg $lname: setcfg \ + "{ bandwidth=$bandwidth delay=$mmdelay \ + upstream={ BER=$ber duplicate=$dup } \ + downstream={ BER=$ber duplicate=$dup } }" +} +