diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-09-13 17:28:42 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-09-13 17:28:42 +0200 |
| commit | 8ae88b5ba5cbc34b9992ccdde4229d44cfe56225 (patch) | |
| tree | 9502662abab14e1746198251c3586ebbb1d31c1a | |
| parent | d6fde0b09d14cccb7691bff4135ab5a265cf6971 (diff) | |
| download | vyos-1x-8ae88b5ba5cbc34b9992ccdde4229d44cfe56225.tar.gz vyos-1x-8ae88b5ba5cbc34b9992ccdde4229d44cfe56225.zip | |
op-mode: T2841: support IPv6 for "monitor bandwidth-test initiate"
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth-test.xml | 2 | ||||
| -rwxr-xr-x | src/op_mode/monitor_bandwidth_test.sh | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/op-mode-definitions/monitor-bandwidth-test.xml b/op-mode-definitions/monitor-bandwidth-test.xml index 5959e05f2..5b36b1da5 100644 --- a/op-mode-definitions/monitor-bandwidth-test.xml +++ b/op-mode-definitions/monitor-bandwidth-test.xml @@ -20,7 +20,7 @@ <list><hostname> <x.x.x.x> <h:h:h:h:h:h:h:h></list> </completionHelp> </properties> - <command>iperf -c $4</command> + <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$4"</command> </tagNode> </children> </node> diff --git a/src/op_mode/monitor_bandwidth_test.sh b/src/op_mode/monitor_bandwidth_test.sh new file mode 100755 index 000000000..6da0291c5 --- /dev/null +++ b/src/op_mode/monitor_bandwidth_test.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2020 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if ipaddrcheck --is-ipv6 $1; then + # Set address family to IPv6 when an IPv6 address was specified + OPT="-V" +elif [[ $(dig $1 AAAA +short | grep -v '\.$' | wc -l) -gt 0 ]]; then + # CNAME is also part of the dig answer thus we must remove any + # CNAME response and only shot the AAAA response(s), this is done + # by grep -v '\.$' + + # Set address family to IPv6 when FQDN has at least one AAAA record + OPT="-V" +fi + +/usr/bin/iperf $OPT -c $1 + |