Commit e089f2fc authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor changes to linkdelay rules. The ones I had were not going to

work for virtual links when the node was a router, so pull them out
until I have the ipfw changes installed (the changes to use nexthop).
parent 564afc52
...@@ -482,8 +482,8 @@ sub LinkDelaySetup() ...@@ -482,8 +482,8 @@ sub LinkDelaySetup()
print DEL "ifconfig $iface media 100baseTX mediaopt full-duplex"; print DEL "ifconfig $iface media 100baseTX mediaopt full-duplex";
print DEL "\n"; print DEL "\n";
print DEL "ipfw add $ruleno pipe $pipeno ip from $inet to ". print DEL "ipfw add $ruleno pipe $pipeno ip from any to ".
"any out xmit $iface\n"; "any out xmit $iface nexthop $inet\n";
print DEL "ipfw pipe $pipeno config delay ${delay}ms "; print DEL "ipfw pipe $pipeno config delay ${delay}ms ";
print DEL "bw ${bandw}Kbit/s plr $plr $queue $redparams\n"; print DEL "bw ${bandw}Kbit/s plr $plr $queue $redparams\n";
...@@ -493,10 +493,11 @@ sub LinkDelaySetup() ...@@ -493,10 +493,11 @@ sub LinkDelaySetup()
# #
# Want to force the reverse side to 1 queue slot to enforce # Want to force the reverse side to 1 queue slot to enforce
# the proper bandwidth. Not ideal. # the proper bandwidth. Not ideal, especially since at 1000HZ
# 1 queue slot is not enough. Make it 4 instead.
# #
print DEL "ipfw add $dupruleno pipe $rpipeno ip from any ". print DEL "ipfw add $dupruleno pipe $rpipeno ip from any ".
"to $inet in recv $iface\n"; "to any in recv $iface\n";
print DEL "ipfw pipe $rpipeno config delay ${rdelay}ms ". print DEL "ipfw pipe $rpipeno config delay ${rdelay}ms ".
"bw ${rbandw}Kbit/s plr $rplr queue 4\n"; "bw ${rbandw}Kbit/s plr $rplr queue 4\n";
......
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