diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-02-08 11:38:16 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-02-08 11:38:16 -0800 |
| commit | b53403357be44676a3a35a47f7053d02c43429fd (patch) | |
| tree | 1879d5d5ed446b06503768785350fa51cd332a8f | |
| parent | 6746d0c45fe4c2435b92863a720e99e90f474ddc (diff) | |
| parent | 7b26e9d6f256eadad5c1ce2d34ead99c89521076 (diff) | |
| download | vyatta-cfg-qos-b53403357be44676a3a35a47f7053d02c43429fd.tar.gz vyatta-cfg-qos-b53403357be44676a3a35a47f7053d02c43429fd.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-qos into changes-john-southworth
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | interface-templates/redirect/node.def | 18 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/redirect/node.def | 18 |
3 files changed, 24 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index fad85e0..29f27ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-qos (0.15.29) unstable; urgency=low + + * Allow redirect on all interfaces + + -- Stephen Hemminger <shemminger@vyatta.com> Tue, 07 Feb 2012 14:24:25 -0800 + vyatta-cfg-qos (0.15.28) unstable; urgency=low * fix priority generation bug in traffic-policy for vrrp interfaces diff --git a/interface-templates/redirect/node.def b/interface-templates/redirect/node.def new file mode 100644 index 0000000..50788ca --- /dev/null +++ b/interface-templates/redirect/node.def @@ -0,0 +1,18 @@ +type: txt +help: Incoming packet redirection destination +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=input + +syntax:expression: $VAR(@) != $IFNAME ;\ + "interface $IFNAME: redirect to same interface not allowed" +val_help: Interface for packet redirection + +commit:expression: $VAR(../mirror) == "";\ + "interface $IFNAME : can not do both redirect and mirror" + +commit:expression: $VAR(../traffic-policy/in) == ""; \ + "interface $IFNAME : can not use ingress policy and redirect" + +commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $IFNAME --check=all" + +update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $IFNAME +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $IFNAME diff --git a/templates/interfaces/ethernet/node.tag/redirect/node.def b/templates/interfaces/ethernet/node.tag/redirect/node.def deleted file mode 100644 index 8045de7..0000000 --- a/templates/interfaces/ethernet/node.tag/redirect/node.def +++ /dev/null @@ -1,18 +0,0 @@ -type: txt -help: Incoming packet redirection destination -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=input - -syntax:expression: $VAR(@) != $VAR(../@) ;\ - "interface $VAR(../@): redirect to same interface not allowed" -val_help: Interface for packet redirection - -commit:expression: $VAR(../mirror) == "";\ - "interface $VAR(../@) : can not do both redirect and mirror" - -commit:expression: $VAR(../traffic-policy/in) == ""; \ - "interface $VAR(../@) : can not use ingress policy and redirect" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all" - -update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $VAR(../@) -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $VAR(../@) |