diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-09 23:37:12 +0100 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-01-10 21:18:03 +0100 |
| commit | da370b63b266254d9a7a7ae15274a9a70bcf5417 (patch) | |
| tree | b1e6cfd25e179db5d6421791e47f46f2f380b98f /src/validators/ipv4-range | |
| parent | a5ad98b2307af974dd498a84caec94fa613f7491 (diff) | |
| download | vyos-1x-da370b63b266254d9a7a7ae15274a9a70bcf5417.tar.gz vyos-1x-da370b63b266254d9a7a7ae15274a9a70bcf5417.zip | |
validators: T4148: Add text output when validators fail
Diffstat (limited to 'src/validators/ipv4-range')
| -rwxr-xr-x | src/validators/ipv4-range | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/validators/ipv4-range b/src/validators/ipv4-range index cc59039f1..6492bfc52 100755 --- a/src/validators/ipv4-range +++ b/src/validators/ipv4-range @@ -7,6 +7,11 @@ ip2dec () { printf '%d\n' "$((a * 256 ** 3 + b * 256 ** 2 + c * 256 + d))" } +error_exit() { + echo "Error: $1 is not a valid IPv4 address range" + exit 1 +} + # Only run this if there is a hypen present in $1 if [[ "$1" =~ "-" ]]; then # This only works with real bash (<<<) - split IP addresses into array with @@ -15,21 +20,21 @@ if [[ "$1" =~ "-" ]]; then ipaddrcheck --is-ipv4-single ${strarr[0]} if [ $? -gt 0 ]; then - exit 1 + error_exit $1 fi ipaddrcheck --is-ipv4-single ${strarr[1]} if [ $? -gt 0 ]; then - exit 1 + error_exit $1 fi start=$(ip2dec ${strarr[0]}) stop=$(ip2dec ${strarr[1]}) if [ $start -ge $stop ]; then - exit 1 + error_exit $1 fi exit 0 fi -exit 1 +error_exit $1 |