diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-30 18:11:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-30 18:11:18 +0200 |
| commit | 703ae7798802da3c711a238e40439d4f7ebcb5b7 (patch) | |
| tree | 69e3bfc6f1e9d1eaea613f2c8e64c7814fc09f9c | |
| parent | 2fa0f52e45f4491b760cf03e72c871020492dfb7 (diff) | |
| parent | 6b4acfc2c0ab2a45be0f50050999a8eaed1aea62 (diff) | |
| download | vyatta-cfg-quagga-703ae7798802da3c711a238e40439d4f7ebcb5b7.tar.gz vyatta-cfg-quagga-703ae7798802da3c711a238e40439d4f7ebcb5b7.zip | |
Merge pull request #101 from sever-sever/T4475-eq
T4475: route-map allow IPv6 address for match peer option
| -rwxr-xr-x | scripts/policy/vyatta-policy.pl | 1 | ||||
| -rw-r--r-- | templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl index f098b48a..b2acab8f 100755 --- a/scripts/policy/vyatta-policy.pl +++ b/scripts/policy/vyatta-policy.pl @@ -45,6 +45,7 @@ sub check_peer_syntax { $_ = $peer; if (/^local$/) { exit 0; } if ( isIpAddress("$peer") ) { exit 0; } + if ( $peer =~ /^[0-9a-fA-F:]+$/) { exit 0; } exit 1; } diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def index ea8fcddc..25465640 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def @@ -1,6 +1,7 @@ type: txt help: Peer address to match val_help: ipv4; Peer IP address +val_help: ipv6; Peer IPv6 address val_help: local: Static or redistributed routes syntax:expression: exec "/opt/vyatta/sbin/vyatta-policy.pl --check-peer-syntax $VAR(@)"; "peer must be either an IP or local" |