diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-11 14:41:06 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-11 14:41:06 -0700 |
| commit | b7cfe533b5d0dde7fffc773cad9452a330edd8b7 (patch) | |
| tree | 620866b848b43f4d29df8c3fb14e6db9477fee9d | |
| parent | 733014cfc7b2e04caa44d9001549780727b206a4 (diff) | |
| parent | 5d55f49def2ed0fd5740a4a345b756fce1892553 (diff) | |
| download | vyatta-cfg-qos-b7cfe533b5d0dde7fffc773cad9452a330edd8b7.tar.gz vyatta-cfg-qos-b7cfe533b5d0dde7fffc773cad9452a330edd8b7.zip | |
Merge branch 'glendale' into hollywood
4 files changed, 13 insertions, 3 deletions
diff --git a/scripts/VyattaQosMatch.pm b/scripts/VyattaQosMatch.pm index cfc5ed2..44ece49 100644 --- a/scripts/VyattaQosMatch.pm +++ b/scripts/VyattaQosMatch.pm @@ -88,5 +88,5 @@ sub filter { print {$out} " match meta\(vlan mask 0xfff eq $vif\)" if (defined $vif); } - print {$out} " classid $parent:$id\n"; + printf {$out} " classid $parent:%x\n", $id; } diff --git a/scripts/VyattaQosTrafficShaper.pm b/scripts/VyattaQosTrafficShaper.pm index ef7bd7b..4ea494c 100644 --- a/scripts/VyattaQosTrafficShaper.pm +++ b/scripts/VyattaQosTrafficShaper.pm @@ -124,7 +124,7 @@ my $prio_id = 0x4000 + $self->{id}; my $limit = $self->{_limit}; - print {$out} "handle $prio_id: prio\n"; + printf {$out} "handle %x: prio\n", $prio_id; if ($limit) { foreach my $i (qw/1 2 3/) { @@ -193,7 +193,7 @@ printf ${out} "class add dev %s parent %x:1 classid %x:%x htb rate %s", $dev, $parent, $parent, $self->{id}, $rate; - print ${out} " ceil $self->{_ceiling}" if ( defined $self->{_ceiling} ); + print ${out} " ceil $ceil" if ( $ceil ); print ${out} " burst $self->{_burst}" if ( defined $self->{_burst} ); print ${out} " prio $self->{_priority}" if ( defined $self->{_priority} ); print {$out} "\n"; diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def new file mode 100644 index 0000000..2c0cf7a --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def @@ -0,0 +1 @@ +help: Configure qos-policy diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def new file mode 100644 index 0000000..ba98afa --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def @@ -0,0 +1,9 @@ +type: txt +help: Set outbound QOS policy +allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy +create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100 + /opt/vyatta/sbin/vyatta-qos.pl \ + --update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl \ + --delete-interface $VAR(../../../@).$VAR(../../@) $VAR(.) + sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 0 |