Commit e42a39bc authored by Mike Hibler's avatar Mike Hibler

Pass through pid/eid info to trafgen

parent 5ed0a17b
...@@ -754,6 +754,12 @@ sub dotrafficconfig() ...@@ -754,6 +754,12 @@ sub dotrafficconfig()
$TM = OPENTMCC(TMCCCMD_BOSSINFO); $TM = OPENTMCC(TMCCCMD_BOSSINFO);
($boss) = split(" ", <$TM>); ($boss) = split(" ", <$TM>);
close($TM); close($TM);
my ($pid, $eid, $vname) = check_status();
my $cmdline = "$SETUPDIR/trafgen -s $boss";
if ($pid) {
$cmdline .= " -E $pid/$eid";
}
$TM = OPENTMCC(TMCCCMD_TRAFFIC); $TM = OPENTMCC(TMCCCMD_TRAFFIC);
...@@ -805,7 +811,7 @@ sub dotrafficconfig() ...@@ -805,7 +811,7 @@ sub dotrafficconfig()
print RC "#!/bin/sh\n"; print RC "#!/bin/sh\n";
$didopen = 1; $didopen = 1;
} }
print RC "$SETUPDIR/trafgen -s $boss -N $name -T $target -P $proto -R $role >/tmp/$name.debug 2>&1 &\n"; print RC "$cmdline -N $name -T $target -P $proto -R $role >/tmp/$name.debug 2>&1 &\n";
} }
else { else {
warn "*** WARNING: Bad traffic line: $_"; warn "*** WARNING: Bad traffic line: $_";
......
...@@ -754,6 +754,12 @@ sub dotrafficconfig() ...@@ -754,6 +754,12 @@ sub dotrafficconfig()
$TM = OPENTMCC(TMCCCMD_BOSSINFO); $TM = OPENTMCC(TMCCCMD_BOSSINFO);
($boss) = split(" ", <$TM>); ($boss) = split(" ", <$TM>);
close($TM); close($TM);
my ($pid, $eid, $vname) = check_status();
my $cmdline = "$SETUPDIR/trafgen -s $boss";
if ($pid) {
$cmdline .= " -E $pid/$eid";
}
$TM = OPENTMCC(TMCCCMD_TRAFFIC); $TM = OPENTMCC(TMCCCMD_TRAFFIC);
...@@ -805,7 +811,7 @@ sub dotrafficconfig() ...@@ -805,7 +811,7 @@ sub dotrafficconfig()
print RC "#!/bin/sh\n"; print RC "#!/bin/sh\n";
$didopen = 1; $didopen = 1;
} }
print RC "$SETUPDIR/trafgen -s $boss -N $name -T $target -P $proto -R $role >/tmp/$name.debug 2>&1 &\n"; print RC "$cmdline -N $name -T $target -P $proto -R $role >/tmp/$name.debug 2>&1 &\n";
} }
else { else {
warn "*** WARNING: Bad traffic line: $_"; warn "*** WARNING: Bad traffic line: $_";
......
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