Commit 49c9f2d2 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Changes to reflect new delays syntax returned by the TMCD. The

interface name (fxp) is returned from the DB.
parent fd2e5f3a
......@@ -227,8 +227,8 @@ sub dodelays ()
print DEL "sysctl -w net.link.ether.bridge_cfg=${CTLIFACE}:6,";
foreach $delay (@delays) {
$delay =~ /DELAY INT0=(\d) INT1=(\d) DELAY/;
print DEL "$IFACE$1:$count,$IFACE$2:$count,";
$delay =~ /DELAY INT0=(\w+) INT1=(\w+) DELAY/;
print DEL "$1:$count,$2:$count,";
$count++;
}
print DEL "\n";
......@@ -240,10 +240,13 @@ sub dodelays ()
$pipe = 100;
foreach $delay (@delays) {
$delay =~
/DELAY INT0=(\d) INT1=(\d) DELAY=(\d+) BW=([\d\.]+) PLR=([\d\.]+)/;
/DELAY INT0=(\w+) INT1=(\w+) DELAY=(\d+) BW=([\d\.]+) PLR=([\d\.]+)/;
$iface1 = "$IFACE$1";
$iface2 = "$IFACE$2";
#
# tmcd returns the INTs as fxpX. Nice, eh?
#
$iface1 = $1;
$iface2 = $2;
$p1 = $pipe += 10;
$p2 = $pipe += 10;
$delay = $3;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment