network fix parameter passing when using ""

[people/stevee/network.git] / src / functions / functions.ipv6

diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6
index 9f1b2a939bf50ea69fa5985adbf8d61e212d2af3..50c2b9efc84ba84423a70e5918079f62045e70b5 100644 (file)
--- a/src/functions/functions.ipv6
+++ b/src/functions/functions.ipv6
@@ -64,7 +64,7 @@ ipv6_device_forwarding_enable() {
                                accept_ra=2
                                ;;
                esac
-       done <<< "$(args $@)"
+       done <<< "$(args "$@")"
 
        sysctl_set "net.ipv6.conf.${device}.forwarding" 1
 
@@ -105,7 +105,21 @@ ipv6_device_privacy_extensions_disable() {
 }
 
 ipv6_is_valid() {
-       inetcalc -6 -c $@ && return ${EXIT_OK} || return ${EXIT_ERROR}
+       local address=${1}
+
+       local prefix=$(ip_get_prefix ${address})
+       address=$(ip_split_prefix ${address})
+
+       # If prefix is set, we check if it is correct
+       if isset prefix; then
+               # Must be numeric
+               isinteger prefix || return ${EXIT_FALSE}
+
+               # Must be 128 if present
+               [ ${prefix} -eq 128 ] || return ${EXIT_FALSE}
+       fi
+
+       inetcalc -6 -c ${address} && return ${EXIT_TRUE} || return ${EXIT_FALSE}
 }
 
 ipv6_net_is_valid() {
@@ -177,7 +191,7 @@ ipv6_address_add() {
                                wait_for_dad="false"
                                ;;
                esac
-       done <<< "$(args $@)"
+       done <<< "$(args "$@")"
 
        local cmd="ip addr add ${address} dev ${device} scope ${scope}"
 
@@ -266,7 +280,7 @@ ipv6_address_change_lifetime() {
                                valid_lft="$(cli_get_val "${arg}")"
                                ;;
                esac
-       done <<< "$(args $@)"
+       done <<< "$(args "$@")"
 
        local cmd="ip -6 addr change ${address} dev ${device} scope global"
 
@@ -371,7 +385,7 @@ ipv6_device_get_addresses() {
                                scope="$(cli_get_val "${arg}")"
                                ;;
                esac
-       done <<< "$(args $@)"
+       done <<< "$(args "$@")"
 
        local cmd="ip -o addr show dev ${device}"
        if isset scope; then
@@ -397,7 +411,7 @@ ipv6_device_get_addresses() {
 }
 
 ipv6_format() {
-       inetcalc -6 -f $@
+       inetcalc -6 -f "$@"
 }
 
 ipv6_addr_eq() {
@@ -421,106 +435,17 @@ ipv6_addr_gt() {
 }
 
 ipv6_addr_ge() {
-       ipv6_addr_eq $@ || ipv6_addr_gt $@
+       ipv6_addr_eq "$@" || ipv6_addr_gt "$@"
 }
 
 ipv6_addr_lt() {
-       ! ipv6_addr_eq $@ && ! ipv6_addr_gt $@
+       ! ipv6_addr_eq "$@" && ! ipv6_addr_gt "$@"
 }
 
 ipv6_addr_le() {
-       ipv6_addr_eq $@ || ! ipv6_addr_gt $@
-}
-
-ipv6_hash() {
-       local address="${1}"
-       assert isset address
-
-       address="$(ipv6_format "${address}")"
-       echo "${address//:/}"
+       ipv6_addr_eq "$@" || ! ipv6_addr_gt "$@"
 }
 
 ipv6_get_network() {
-       ip_get_network $@
-}
-
-ipv6_6rd_format_address() {
-       local isp_prefix="${1}"
-       assert ipv6_net_is_valid "${isp_prefix}"
-
-       local client_address="${2}"
-       assert ipv4_is_valid "${client_address}"
-
-       local prefix="$(ipv6_get_prefix "${isp_prefix}")"
-       isp_prefix="$(ipv6_split_prefix "${isp_prefix}")"
-
-       # This only works for prefix lengths up to 32 bit.
-       assert [ "${prefix}" -le 32 ]
-       assert [ "${prefix}" -gt  0 ]
-
-       # Explode the address and throw away the second 32 bit.
-       local address
-       local segment
-       for segment in ${isp_prefix//:/ }; do
-               while [[ ${#segment} -lt 4 ]]; do
-                       segment="0${segment}"
-               done
-               list_append address "${segment}"
-       done
-       address="$(list_join ":" ${address})"
-
-       client_address="$(ipv6_6rd_format_client_address ${client_address})"
-       assert isset client_address
-
-       local block1="0x${address:0:4}"
-       local block2="0x${address:5:4}"
-       local block3="0x${address:10:4}"
-       local block4="0x${address:15:4}"
-
-       address="$(( (${block1} << 48) + (${block2} << 32) + (${block3} << 16) + ${block4} ))"
-       assert [ "${address}" -gt 0 ]
-
-       block1="0x${client_address:0:4}"
-       block2="0x${client_address:5:4}"
-
-       client_address="$(( (${block1} << 48) + (${block2} << 32) ))"
-
-       # Fix for numbers that are interpreted by bash as negative
-       # numbers and therefore filled up with ones when shifted to
-       # the right. Weird.
-       if [ "${client_address}" -gt 0 ]; then
-               client_address="$(( ${client_address} >> ${prefix} ))"
-       else
-               local bitmask="$(( 1 << 63 ))"
-               client_address="$(( ${client_address} >> 1 ))"
-               client_address="$(( ${client_address} ^ ${bitmask} ))"
-               client_address="$(( ${client_address} >> $(( ${prefix} - 1 )) ))"
-       fi
-       assert [ "${client_address}" -gt 0 ]
-
-       # XOR everything together
-       address="$(( ${address} ^ ${client_address} ))"
-       prefix="$(( ${prefix} + 32 ))"
-
-       local block formatted_address=":"
-       while [ ${address} -gt 0 ]; do
-               printf -v block "%x" "$(( ${address} & 0xffff ))"
-               formatted_address="${block}:${formatted_address}"
-
-               address="$(( ${address} >> 16 ))"
-       done
-
-       assert ipv6_is_valid "${formatted_address}"
-
-       # Implode the output IP address.
-       formatted_address="$(ipv6_format "${formatted_address}")"
-
-       print "${formatted_address}/${prefix}"
-}
-
-ipv6_6rd_format_client_address() {
-       local address="${1}"
-       assert isset address
-
-       print "%02x%02x:%02x%02x" ${address//\./ }
+       ip_get_network "$@"
 }