From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] network fix parameter passing when using "" Date: Wed, 16 Aug 2017 08:25:13 +0200 Message-ID: <1502864713-6081-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9044391526111529077==" List-Id: --===============9044391526111529077== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When we use "" on the command line to pass a value with spaces the argument was broken when passing it to the next function. Now the argument is kept as one string with spaces Fixes: #11438 Signed-off-by: Jonatan Schlag --- src/functions/functions.bonding | 4 +- src/functions/functions.bridge | 4 +- src/functions/functions.cli.firewall | 16 +-- src/functions/functions.device | 8 +- src/functions/functions.dhcpd | 38 +++---- src/functions/functions.distro | 4 +- src/functions/functions.dns | 6 +- src/functions/functions.editor | 2 +- src/functions/functions.firewall | 4 +- src/functions/functions.firewall-zones | 6 +- src/functions/functions.he | 6 +- src/functions/functions.hook | 8 +- src/functions/functions.hostapd | 12 +- src/functions/functions.http | 6 +- src/functions/functions.interrupts | 2 +- src/functions/functions.ip | 4 +- src/functions/functions.ip-tunnel | 12 +- src/functions/functions.ipsec | 50 ++++----- src/functions/functions.iptables | 12 +- src/functions/functions.ipv4 | 10 +- src/functions/functions.ipv6 | 18 +-- src/functions/functions.list | 20 ++-- src/functions/functions.modem | 6 +- src/functions/functions.ports | 18 +-- src/functions/functions.ppp | 34 +++--- src/functions/functions.pppoe-server | 14 +-- src/functions/functions.route | 64 +++++------ src/functions/functions.settings | 20 ++-- src/functions/functions.util | 10 +- src/functions/functions.vpn | 4 +- src/functions/functions.vpn-security-policies | 16 +-- src/functions/functions.wireless | 12 +- src/functions/functions.wpa_supplicant | 8 +- src/functions/functions.zone | 56 +++++----- src/header-config | 2 +- src/header-port | 8 +- src/header-zone | 10 +- src/hooks/configs/dhcp | 2 +- src/hooks/configs/ipv4-static | 4 +- src/hooks/configs/ipv6-auto | 4 +- src/hooks/configs/ipv6-static | 2 +- src/hooks/configs/pppoe-server | 10 +- src/hooks/ports/batman-adv | 10 +- src/hooks/ports/bonding | 14 +-- src/hooks/ports/dummy | 4 +- src/hooks/ports/vlan | 8 +- src/hooks/ports/wireless-adhoc | 16 +-- src/hooks/ports/wireless-ap | 20 ++-- src/hooks/zones/6to4-tunnel | 14 +-- src/hooks/zones/bridge | 4 +- src/hooks/zones/modem | 20 ++-- src/hooks/zones/pppoe | 12 +- src/hooks/zones/wireless | 10 +- src/network | 152 +++++++++++++-----------= -- 54 files changed, 420 insertions(+), 420 deletions(-) diff --git a/src/functions/functions.bonding b/src/functions/functions.bonding index 490ac2e..afa3306 100644 --- a/src/functions/functions.bonding +++ b/src/functions/functions.bonding @@ -35,10 +35,10 @@ bonding_create() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - address=3D$(cli_get_val ${1}) + address=3D$(cli_get_val "${1}") ;; --mode=3D*) - mode=3D$(cli_get_val ${1}) + mode=3D$(cli_get_val "${1}") ;; *) error "Unrecognized argument: ${1}" diff --git a/src/functions/functions.bridge b/src/functions/functions.bridge index 5b817fb..38f51ed 100644 --- a/src/functions/functions.bridge +++ b/src/functions/functions.bridge @@ -30,10 +30,10 @@ bridge_create() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - address=3D$(cli_get_val ${1}) + address=3D$(cli_get_val "${1}") ;; --mtu=3D*) - mtu=3D$(cli_get_val ${1}) + mtu=3D$(cli_get_val "${1}") ;; *) error "Unrecognized argument: ${1}" diff --git a/src/functions/functions.cli.firewall b/src/functions/functions.c= li.firewall index ffd3a65..74cb652 100644 --- a/src/functions/functions.cli.firewall +++ b/src/functions/functions.cli.firewall @@ -58,7 +58,7 @@ firewall_cli() { ;; =20 zone) - firewall_cli_zone $@ + firewall_cli_zone "$@" ;; =20 ""|help|--help|-h) @@ -81,7 +81,7 @@ firewall_cli_panic() { assert isset protocol shift =20 - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man firewall-panic exit ${EXIT_OK} fi @@ -104,7 +104,7 @@ firewall_cli_panic() { } =20 firewall_cli_settings() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man firewall-settings exit ${EXIT_OK} fi @@ -122,7 +122,7 @@ firewall_cli_zone() { assert isset protocol shift=20 =20 - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man firewall-zone exit ${EXIT_OK} fi @@ -143,15 +143,15 @@ firewall_cli_zone() { # Process the given action. case "${action}" in edit) - firewall_cli_zone_edit ${zone} $@ + firewall_cli_zone_edit ${zone} "$@" ;; status|"") - firewall_cli_zone_status ${zone} $@ + firewall_cli_zone_status ${zone} "$@" ;; =20 # Print the raw configuration settings. show) - firewall_zone_print ${zone} $@ + firewall_zone_print ${zone} "$@" =20 exit ${EXIT_ERROR} ;; @@ -168,7 +168,7 @@ firewall_cli_zone() { =20 case "${action}" in reset) - firewall_zone_reset $@ + firewall_zone_reset "$@" exit $? ;; =20 diff --git a/src/functions/functions.device b/src/functions/functions.device index 897f812..12bf203 100644 --- a/src/functions/functions.device +++ b/src/functions/functions.device @@ -320,11 +320,11 @@ device_get_phy() { } =20 device_is_phy() { - phy_exists $@ + phy_exists "$@" } =20 device_is_serial() { - serial_exists $@ + serial_exists "$@" } =20 # Returns true if a device is a tun device @@ -540,7 +540,7 @@ device_set_promisc() { =20 # Check if the device is free device_is_free() { - ! device_is_used $@ + ! device_is_used "$@" } =20 # Check if the device is used @@ -775,7 +775,7 @@ device_identify() { seconds=3D"$(cli_get_val "${arg}")" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 assert isinteger seconds =20 diff --git a/src/functions/functions.dhcpd b/src/functions/functions.dhcpd index 7d32c39..3b1214f 100644 --- a/src/functions/functions.dhcpd +++ b/src/functions/functions.dhcpd @@ -118,7 +118,7 @@ dhcpd_service() { } =20 dhcpd_start() { - local services=3D$(dhcpd_service $@) + local services=3D$(dhcpd_service "$@") =20 local service for service in ${services}; do @@ -127,7 +127,7 @@ dhcpd_start() { } =20 dhcpd_stop() { - local services=3D$(dhcpd_service $@) + local services=3D$(dhcpd_service "$@") =20 local service for service in ${services}; do @@ -138,7 +138,7 @@ dhcpd_stop() { dhcpd_restart() { # DHCP does not support a reload, so # we retsart it. - local services=3D$(dhcpd_service $@) + local services=3D$(dhcpd_service "$@") =20 local service for service in ${services}; do @@ -147,11 +147,11 @@ dhcpd_restart() { } =20 dhcpd_reload() { - dhcpd_restart $@ + dhcpd_restart "$@" } =20 dhcpd_enable() { - local services=3D$(dhcpd_service $@) + local services=3D$(dhcpd_service "$@") =20 local service for service in ${services}; do @@ -160,7 +160,7 @@ dhcpd_enable() { } =20 dhcpd_disable() { - local services=3D$(dhcpd_service $@) + local services=3D$(dhcpd_service "$@") =20 local service for service in ${services}; do @@ -181,10 +181,10 @@ dhcpd_edit() { =20 case "${proto}" in ipv6) - _dhcpd_edit_ipv6 $@ || return $? + _dhcpd_edit_ipv6 "$@" || return $? ;; ipv4) - _dhcpd_edit_ipv4 $@ || return $? + _dhcpd_edit_ipv4 "$@" || return $? ;; esac =20 @@ -197,7 +197,7 @@ _dhcpd_edit_ipv4() { while [ $# -gt 0 ]; do case "${1}" in --authoritative=3D*) - val=3D$(cli_get_val ${1}) + val=3D$(cli_get_val "${1}") =20 if enabled val; then AUTHORITATIVE=3D"true" @@ -206,7 +206,7 @@ _dhcpd_edit_ipv4() { fi ;; --default-lease-time=3D*) - local val=3D$(cli_get_val ${1}) + local val=3D$(cli_get_val "${1}") DEFAULT_LEASE_TIME=3D$(parse_time ${val}) =20 if ! isinteger DEFAULT_LEASE_TIME; then @@ -215,7 +215,7 @@ _dhcpd_edit_ipv4() { fi ;; --max-lease-time=3D*) - local val=3D$(cli_get_val ${1}) + local val=3D$(cli_get_val "${1}") MAX_LEASE_TIME=3D$(parse_time ${val}) =20 if ! isinteger MAX_LEASE_TIME; then @@ -224,7 +224,7 @@ _dhcpd_edit_ipv4() { fi ;; --min-lease-time=3D*) - local val=3D$(cli_get_val ${1}) + local val=3D$(cli_get_val "${1}") MIN_LEASE_TIME=3D$(parse_time ${val}) =20 if isset MIN_LEASE_TIME; then @@ -252,7 +252,7 @@ _dhcpd_edit_ipv6() { while [ $# -gt 0 ]; do case "${1}" in --preferred-lifetime=3D*) - local val=3D$(cli_get_val ${1}) + local val=3D$(cli_get_val "${1}") PREFERRED_LIFETIME=3D$(parse_time ${val}) =20 if ! isinteger PREFERRED_LIFETIME; then @@ -261,7 +261,7 @@ _dhcpd_edit_ipv6() { fi ;; --valid-lifetime=3D*) - local val=3D$(cli_get_val ${1}) + local val=3D$(cli_get_val "${1}") VALID_LIFETIME=3D$(parse_time ${val}) =20 if ! isinteger VALID_LIFETIME; then @@ -512,7 +512,7 @@ dhcpd_subnet_match() { } =20 dhcpd_subnet_exists() { - dhcpd_subnet_match $@ + dhcpd_subnet_match "$@" } =20 dhcpd_subnet_new() { @@ -520,7 +520,7 @@ dhcpd_subnet_new() { assert isset proto shift =20 - dhcpd_subnet_edit ${proto} "new" $@ + dhcpd_subnet_edit ${proto} "new" "$@" } =20 dhcpd_subnet_edit() { @@ -557,7 +557,7 @@ dhcpd_subnet_edit() { case "${proto},${mode},${1}" in # Common options ipv6,new,*:*/*|ipv4,new,*.*.*.*/*) - local subnet=3D"$(cli_get_val ${1})" + local subnet=3D"$(cli_get_val "${1}")" =20 ADDRESS=3D"$(ip_split_prefix ${subnet})" PREFIX=3D"$(ip_get_prefix ${subnet})" @@ -617,7 +617,7 @@ dhcpd_subnet_edit() { # IPv4 options =20 ipv4,*,--routers=3D*) - ROUTERS=3D$(cli_get_val ${1}) + ROUTERS=3D$(cli_get_val "${1}") ;; =20 *) @@ -948,7 +948,7 @@ dhcpd_subnet_settings() { } =20 dhcpd_subnet_options_file() { - local path=3D$(dhcpd_subnet_path $@) + local path=3D$(dhcpd_subnet_path "$@") assert isset path =20 print "${path}/options" diff --git a/src/functions/functions.distro b/src/functions/functions.distro index 4dc831b..6978233 100644 --- a/src/functions/functions.distro +++ b/src/functions/functions.distro @@ -26,8 +26,8 @@ __os_release() { =20 local line k v while read line; do - k=3D$(cli_get_key ${line}) - v=3D$(cli_get_val ${line}) + k=3D$(cli_get_key "${line}") + v=3D$(cli_get_val "${line}") =20 if [ "${what}" =3D "${k}" ]; then echo "${v//\"/}" diff --git a/src/functions/functions.dns b/src/functions/functions.dns index a54feec..e7c3e47 100644 --- a/src/functions/functions.dns +++ b/src/functions/functions.dns @@ -199,13 +199,13 @@ dns_server_parse_line() { while read -r arg; do case "${arg}" in server=3D*) - server=3D$(cli_get_val ${arg}) + server=3D$(cli_get_val "${arg}") ;; priority=3D*) - priority=3D$(cli_get_val ${arg}) + priority=3D$(cli_get_val "${arg}") ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 # The server address must be set. isset server || return ${EXIT_ERROR} diff --git a/src/functions/functions.editor b/src/functions/functions.editor index f362a6f..6edac62 100644 --- a/src/functions/functions.editor +++ b/src/functions/functions.editor @@ -121,7 +121,7 @@ editor_check() { shift =20 # Execute the check function - "${check_func}" $@ + "${check_func}" "$@" local ret=3D"${?}" =20 case "${ret}" in diff --git a/src/functions/functions.firewall b/src/functions/functions.firew= all index a503c62..58a2aa4 100644 --- a/src/functions/functions.firewall +++ b/src/functions/functions.firewall @@ -740,9 +740,9 @@ _firewall_parse_rule_line() { return ${EXIT_ERROR} fi =20 - val=3D$(cli_get_val ${arg}) + val=3D$(cli_get_val "${arg}") assign "${key}" "${val}" - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 # action must always be set. if ! isset action; then diff --git a/src/functions/functions.firewall-zones b/src/functions/functions= .firewall-zones index a72bb8e..6b06fdf 100644 --- a/src/functions/functions.firewall-zones +++ b/src/functions/functions.firewall-zones @@ -44,7 +44,7 @@ firewall_zone_config() { } =20 firewall_zone_exists() { - local file=3D$(firewall_zone_config $@) + local file=3D$(firewall_zone_config "$@") =20 [ -r "${file}" ] && return ${EXIT_TRUE} || return ${EXIT_FALSE} } @@ -106,10 +106,10 @@ firewall_zone_edit() { while [ $# -gt 0 ]; do case "${1}" in --masquerade4=3D*) - MASQUERADE4=3D$(cli_get_val ${1}) + MASQUERADE4=3D$(cli_get_val "${1}") ;; --policy=3D*) - POLICY=3D$(cli_get_val ${1}) + POLICY=3D$(cli_get_val "${1}") ;; *) warning "Unknown option: ${1}" diff --git a/src/functions/functions.he b/src/functions/functions.he index 205170c..0a73585 100644 --- a/src/functions/functions.he +++ b/src/functions/functions.he @@ -27,13 +27,13 @@ he_tunnelbroker_endpoint_update() { while [ $# -gt 0 ]; do case "${1}" in --username=3D*) - username=3D"$(cli_get_val ${1})" + username=3D"$(cli_get_val "${1}")" ;; --password=3D*) - password=3D"$(cli_get_val ${1})" + password=3D"$(cli_get_val "${1}")" ;; --tunnel-id=3D*) - tunnel_id=3D"$(cli_get_val ${1})" + tunnel_id=3D"$(cli_get_val "${1}")" ;; esac shift diff --git a/src/functions/functions.hook b/src/functions/functions.hook index b8049db..601baee 100644 --- a/src/functions/functions.hook +++ b/src/functions/functions.hook @@ -155,11 +155,11 @@ config_get_hook() { } =20 hook_zone_exists() { - hook_exists zone $@ + hook_exists zone "$@" } =20 hook_zone_exec() { - hook_exec zone $@ + hook_exec zone "$@" } =20 hook_zone_get_all() { @@ -167,11 +167,11 @@ hook_zone_get_all() { } =20 hook_config_exists() { - hook_exists config $@ + hook_exists config "$@" } =20 hook_config_exec() { - hook_exec config $@ + hook_exec config "$@" } =20 hook_config_get_all() { diff --git a/src/functions/functions.hostapd b/src/functions/functions.hostapd index f7bf2fa..8645828 100644 --- a/src/functions/functions.hostapd +++ b/src/functions/functions.hostapd @@ -44,13 +44,13 @@ hostapd_config_write() { while [ $# -gt 0 ]; do case "${1}" in --broadcast-ssid=3D*) - broadcast_ssid=3D$(cli_get_val ${1}) + broadcast_ssid=3D$(cli_get_val "${1}") ;; --channel=3D*) - channel=3D$(cli_get_val ${1}) + channel=3D$(cli_get_val "${1}") ;; --encryption=3D*) - encryption=3D$(cli_get_val ${1}) + encryption=3D$(cli_get_val "${1}") ;; --ieee80211d=3D*) local val=3D"$(cli_get_val "${1}")" @@ -61,13 +61,13 @@ hostapd_config_write() { fi ;; --key=3D*) - key=3D$(cli_get_val ${1}) + key=3D$(cli_get_val "${1}") ;; --mode=3D*) - mode=3D$(cli_get_val ${1}) + mode=3D$(cli_get_val "${1}") ;; --ssid=3D*) - ssid=3D$(cli_get_val ${1}) + ssid=3D$(cli_get_val "${1}") ;; --wmm=3D*) local val=3D"$(cli_get_val "${1}")" diff --git a/src/functions/functions.http b/src/functions/functions.http index 693f9f8..f33aeb6 100644 --- a/src/functions/functions.http +++ b/src/functions/functions.http @@ -34,10 +34,10 @@ http_GET() { while [ $# -gt 0 ]; do case "${1}" in --username=3D*) - username=3D"$(cli_get_val ${1})" + username=3D"$(cli_get_val "${1}")" ;; --password=3D*) - password=3D"$(cli_get_val ${1})" + password=3D"$(cli_get_val "${1}")" ;; *) break @@ -46,7 +46,7 @@ http_GET() { shift done =20 - local url=3D"$(cli_get_val ${1})" + local url=3D"$(cli_get_val "${1}")" shift =20 # Add credentials to the URL. diff --git a/src/functions/functions.interrupts b/src/functions/functions.int= errupts index 4e089d3..3bd2c01 100644 --- a/src/functions/functions.interrupts +++ b/src/functions/functions.interrupts @@ -99,7 +99,7 @@ __bitmap_to_processor_ids() { } =20 __processor_id_to_bitmap() { - hex $(( 1 << $@ )) + hex $(( 1 << "$@" )) } =20 interrupt_set_smp_affinity() { diff --git a/src/functions/functions.ip b/src/functions/functions.ip index d6fd76d..3b43da7 100644 --- a/src/functions/functions.ip +++ b/src/functions/functions.ip @@ -114,13 +114,13 @@ ip_prefix_is_valid() { } =20 ip_get_network() { - inetcalc -n $@ && return ${EXIT_OK} || return ${EXIT_ERROR} + inetcalc -n "$@" && return ${EXIT_OK} || return ${EXIT_ERROR} } =20 ip_network_is_subset_of() { assert [ $# -eq 2 ] =20 - inetcalc -s $@ && return ${EXIT_TRUE} || return ${EXIT_FALSE} + inetcalc -s "$@" && return ${EXIT_TRUE} || return ${EXIT_FALSE} } =20 ip_address_add() { diff --git a/src/functions/functions.ip-tunnel b/src/functions/functions.ip-t= unnel index 0e1115b..cb25edd 100644 --- a/src/functions/functions.ip-tunnel +++ b/src/functions/functions.ip-tunnel @@ -37,24 +37,24 @@ ip_tunnel_add() { while [ $# -gt 0 ]; do case "${1}" in --mode=3D*) - mode=3D"$(cli_get_val ${1})" + mode=3D"$(cli_get_val "${1}")" ;; --ttl=3D*) - ttl=3D"$(cli_get_val ${1})" + ttl=3D"$(cli_get_val "${1}")" ;; --remote-address=3D*) - remote_address=3D"$(cli_get_val ${1})" + remote_address=3D"$(cli_get_val "${1}")" ;; --local-address=3D*) - local_address=3D"$(cli_get_val ${1})" + local_address=3D"$(cli_get_val "${1}")" ;; =20 # Keys for VTI --ikey=3D*) - ikey=3D"$(cli_get_val ${1})" + ikey=3D"$(cli_get_val "${1}")" ;; --okey=3D*) - okey=3D"$(cli_get_val ${1})" + okey=3D"$(cli_get_val "${1}")" ;; esac shift diff --git a/src/functions/functions.ipsec b/src/functions/functions.ipsec index 7283836..038ed87 100644 --- a/src/functions/functions.ipsec +++ b/src/functions/functions.ipsec @@ -65,10 +65,10 @@ cli_ipsec() { =20 case "${action}" in connection) - cli_ipsec_connection $@ + cli_ipsec_connection "$@" ;; pool) - cli_ipsec_pool $@ + cli_ipsec_pool "$@" ;; *) error "Unrecognized argument: ${action}" @@ -86,7 +86,7 @@ cli_ipsec_connection() { =20 case "${key}" in authentication|down|disable|dpd|enable|inactivity_timeout|local|mode|peer= |pool|remote|security_policy|start_action|up) - ipsec_connection_${key} ${connection} $@ + ipsec_connection_${key} ${connection} "$@" ;; show) cli_ipsec_connection_show "${connection}" @@ -103,10 +103,10 @@ cli_ipsec_connection() { =20 case "${action}" in new) - ipsec_connection_new $@ + ipsec_connection_new "$@" ;; destroy) - cli_ipsec_connection_destroy $@ + cli_ipsec_connection_destroy "$@" ;; ""|*) if [ -n "${action}" ]; then @@ -127,7 +127,7 @@ cli_ipsec_pool() { =20 case "${key}" in dns_server|network) - ipsec_pool_${key} ${pool} $@ + ipsec_pool_${key} ${pool} "$@" ;; show) cli_ipsec_pool_show "${pool}" @@ -144,10 +144,10 @@ cli_ipsec_pool() { =20 case "${action}" in new) - ipsec_pool_new $@ + ipsec_pool_new "$@" ;; destroy) - ipsec_pool_destroy $@ + ipsec_pool_destroy "$@" ;; ""|*) if [ -n "${action}" ]; then @@ -363,7 +363,7 @@ ipsec_connection_read_config() { if [ $# -eq 0 ] && [ -n "${IPSEC_CONNECTION_CONFIG_SETTINGS}" ]; then list_append args ${IPSEC_CONNECTION_CONFIG_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 local path=3D"${NETWORK_IPSEC_CONNS_DIR}/${connection}/settings" @@ -477,10 +477,10 @@ ipsec_connection_authentication() { =20 case ${cmd} in mode) - ipsec_connection_authentication_mode "${connection}" $@ + ipsec_connection_authentication_mode "${connection}" "$@" ;; pre-shared-key) - ipsec_connection_authentication_psk "${connection}" $@ + ipsec_connection_authentication_psk "${connection}" "$@" ;; *) log ERROR "Unrecognized argument: ${cmd}" @@ -574,13 +574,13 @@ ipsec_connection_dpd() { =20 case ${cmd} in action) - ipsec_connection_dpd_action "${connection}" $@ + ipsec_connection_dpd_action "${connection}" "$@" ;; delay) - ipsec_connection_dpd_delay "${connection}" $@ + ipsec_connection_dpd_delay "${connection}" "$@" ;; timeout) - ipsec_connection_dpd_timeout "${connection}" $@ + ipsec_connection_dpd_timeout "${connection}" "$@" ;; *) log ERROR "Unrecognized argument: ${cmd}" @@ -621,7 +621,7 @@ ipsec_connection_dpd_delay() { local value=3D$@ =20 if ! isinteger value; then - value=3D$(parse_time $@) + value=3D$(parse_time "$@") if [ ! $? -eq 0 ]; then log ERROR "Parsing the passed time was not sucessful please check the pas= sed values." return ${EXIT_ERROR} @@ -653,7 +653,7 @@ ipsec_connection_dpd_timeout() { local value=3D$@ =20 if ! isinteger value; then - value=3D$(parse_time $@) + value=3D$(parse_time "$@") if [ ! $? -eq 0 ]; then log ERROR "Parsing the passed time was not sucessful please check the pas= sed values." return ${EXIT_ERROR} @@ -686,13 +686,13 @@ ipsec_connection_local() { =20 case ${cmd} in address) - ipsec_connection_local_address "${connection}" $@ + ipsec_connection_local_address "${connection}" "$@" ;; id) - ipsec_connection_id "${connection}" "LOCAL" $@ + ipsec_connection_id "${connection}" "LOCAL" "$@" ;; prefix) - ipsec_connection_prefix "${connection}" "LOCAL" $@ + ipsec_connection_prefix "${connection}" "LOCAL" "$@" ;; *) log ERROR "Unrecognized argument: ${cmd}" @@ -1003,11 +1003,11 @@ ipsec_connection_remote() { =20 case ${cmd} in id) - ipsec_connection_id "${connection}" "REMOTE" $@ + ipsec_connection_id "${connection}" "REMOTE" "$@" ;; =20 prefix) - ipsec_connection_prefix "${connection}" "REMOTE" $@ + ipsec_connection_prefix "${connection}" "REMOTE" "$@" ;; *) log ERROR "Unrecognized argument: ${cmd}" @@ -1030,7 +1030,7 @@ ipsec_connection_inactivity_timeout() { local value=3D$@ =20 if ! isinteger value; then - value=3D$(parse_time $@) + value=3D$(parse_time "$@") if [ ! $? -eq 0 ]; then log ERROR "Parsing the passed time was not sucessful please check the pas= sed values." return ${EXIT_ERROR} @@ -1195,7 +1195,7 @@ ipsec_connection_new() { # Function that deletes based on the passed parameters one ore more vpn secu= rity policies ipsec_connection_destroy() { local connection - for connection in $@; do + for connection in "$@"; do if ! ipsec_connection_exists "${connection}"; then log ERROR "The VPN IPsec connection ${connection} does not exist." continue @@ -1598,7 +1598,7 @@ ipsec_pool_read_config() { if [ $# -eq 0 ] && [ -n "${IPSEC_POOL_CONFIG_SETTINGS}" ]; then list_append args ${IPSEC_POOL_CONFIG_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 local path=3D"${NETWORK_IPSEC_POOLS_DIR}/${pool}/settings" @@ -1679,7 +1679,7 @@ ipsec_pool_new() { # one ore more vpn ipsec pools ipsec_pool_destroy() { local pool - for pool in $@; do + for pool in "$@"; do if ! ipsec_pool_exists "${pool}"; then log ERROR "The VPN IPsec pool ${pool} does not exist." continue diff --git a/src/functions/functions.iptables b/src/functions/functions.iptab= les index 86627a4..821eb60 100644 --- a/src/functions/functions.iptables +++ b/src/functions/functions.iptables @@ -116,7 +116,7 @@ iptables_chain_create() { shift ;; --policy=3D*) - policy=3D"$(cli_get_val ${1})" + policy=3D"$(cli_get_val "${1}")" ;; -*) log WARNING "Unrecognized argument: ${1}" @@ -369,7 +369,7 @@ iptables_dump() { while [ $# -gt 0 ]; do case "${1}" in --log-facility=3D*) - log_facility=3D"$(cli_get_val ${1})" + log_facility=3D"$(cli_get_val "${1}")" ;; *) log WARNING "Unrecognized argument: ${1}" @@ -441,11 +441,11 @@ IPTABLES_MULTIPORT=3D1 IPTABLES_PORTRANGE=3D2 =20 _iptables_port_range() { - grep -q ":" <<< $@ + grep -q ":" <<< "$@" } =20 _iptables_port_multiport() { - grep -q "," <<< $@ + grep -q "," <<< "$@" } =20 _iptables_port() { @@ -461,7 +461,7 @@ _iptables_port() { iptables_source_port() { [ -z "$@" ] && return local type - type=3D$(_iptables_port $@) + type=3D$(_iptables_port "$@") if [ "$type" =3D "$IPTABLES_MULTIPORT" ]; then echo "-m multiport --source-ports $@" else @@ -472,7 +472,7 @@ iptables_source_port() { iptables_destination_port() { [ -z "$@" ] && return local type - type=3D$(_iptables_port $@) + type=3D$(_iptables_port "$@") if [ "$type" =3D "$IPTABLES_MULTIPORT" ]; then echo "-m multiport --destination-ports $@" else diff --git a/src/functions/functions.ipv4 b/src/functions/functions.ipv4 index e893f5e..d19be51 100644 --- a/src/functions/functions.ipv4 +++ b/src/functions/functions.ipv4 @@ -260,11 +260,11 @@ ipv4_netmask2prefix() { } =20 ipv4_get_network() { - ip_get_network $@ + ip_get_network "$@" } =20 ipv4_get_broadcast() { - inetcalc -4 -b $@ && return ${EXIT_OK} || return ${EXIT_ERROR} + inetcalc -4 -b "$@" && return ${EXIT_OK} || return ${EXIT_ERROR} } =20 ipv4_encode() { @@ -315,15 +315,15 @@ ipv4_addr_gt() { } =20 ipv4_addr_ge() { - ipv4_addr_eq $@ || ipv4_addr_gt $@ + ipv4_addr_eq "$@" || ipv4_addr_gt "$@" } =20 ipv4_addr_lt() { - ! ipv4_addr_eq $@ && ! ipv4_addr_gt $@ + ! ipv4_addr_eq "$@" && ! ipv4_addr_gt "$@" } =20 ipv4_addr_le() { - ipv4_addr_eq $@ || ! ipv4_addr_gt $@ + ipv4_addr_eq "$@" || ! ipv4_addr_gt "$@" } =20 ipv4_range() { diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6 index e160fb3..50c2b9e 100644 --- a/src/functions/functions.ipv6 +++ b/src/functions/functions.ipv6 @@ -64,7 +64,7 @@ ipv6_device_forwarding_enable() { accept_ra=3D2 ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 sysctl_set "net.ipv6.conf.${device}.forwarding" 1 =20 @@ -191,7 +191,7 @@ ipv6_address_add() { wait_for_dad=3D"false" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 local cmd=3D"ip addr add ${address} dev ${device} scope ${scope}" =20 @@ -280,7 +280,7 @@ ipv6_address_change_lifetime() { valid_lft=3D"$(cli_get_val "${arg}")" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 local cmd=3D"ip -6 addr change ${address} dev ${device} scope global" =20 @@ -385,7 +385,7 @@ ipv6_device_get_addresses() { scope=3D"$(cli_get_val "${arg}")" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 local cmd=3D"ip -o addr show dev ${device}" if isset scope; then @@ -411,7 +411,7 @@ ipv6_device_get_addresses() { } =20 ipv6_format() { - inetcalc -6 -f $@ + inetcalc -6 -f "$@" } =20 ipv6_addr_eq() { @@ -435,17 +435,17 @@ ipv6_addr_gt() { } =20 ipv6_addr_ge() { - ipv6_addr_eq $@ || ipv6_addr_gt $@ + ipv6_addr_eq "$@" || ipv6_addr_gt "$@" } =20 ipv6_addr_lt() { - ! ipv6_addr_eq $@ && ! ipv6_addr_gt $@ + ! ipv6_addr_eq "$@" && ! ipv6_addr_gt "$@" } =20 ipv6_addr_le() { - ipv6_addr_eq $@ || ! ipv6_addr_gt $@ + ipv6_addr_eq "$@" || ! ipv6_addr_gt "$@" } =20 ipv6_get_network() { - ip_get_network $@ + ip_get_network "$@" } diff --git a/src/functions/functions.list b/src/functions/functions.list index 7e96cdf..9ca13b9 100644 --- a/src/functions/functions.list +++ b/src/functions/functions.list @@ -29,7 +29,7 @@ list_append() { shift =20 local arg - for arg in $@; do + for arg in "$@"; do list_append_one "${list}" "${arg}" done } @@ -60,7 +60,7 @@ list_append_unique() { local ret=3D${EXIT_ERROR} =20 local arg - for arg in $@; do + for arg in "$@"; do if ! list_match ${arg} ${!list}; then list_append_one ${list} "${arg}" ret=3D${EXIT_OK} @@ -83,7 +83,7 @@ list_remove() { =20 local _list k for k in ${!list}; do - if list_match ${k} $@; then + if list_match ${k} "$@"; then ret=3D${EXIT_OK} continue fi @@ -98,7 +98,7 @@ list_remove() { =20 list_sort() { local i - for i in $@; do + for i in "$@"; do print "${i}" done | sort | tr '\n' ' ' print @@ -106,7 +106,7 @@ list_sort() { =20 list_unique() { local items item - for item in $@; do + for item in "$@"; do # Check if the item has already been processed. list_match "${item}" ${items} && continue =20 @@ -120,7 +120,7 @@ list_match() { shift =20 local i - for i in $@; do + for i in "$@"; do [ "${match}" =3D "${i}" ] && return ${EXIT_OK} done =20 @@ -137,7 +137,7 @@ list_length() { local length=3D0 =20 local i - for i in $@; do + for i in "$@"; do length=3D$(( ${length} + 1 )) done =20 @@ -152,7 +152,7 @@ list_count() { local counter=3D0 =20 local arg - for arg in $@; do + for arg in "$@"; do if [ "${arg}" =3D "${what}" ]; then counter=3D$(( ${counter} + 1 )) fi @@ -177,7 +177,7 @@ list_join() { =20 list_reverse() { local reversed arg - for arg in $@; do + for arg in "$@"; do reversed=3D"${arg} ${reversed}" done =20 @@ -187,7 +187,7 @@ list_reverse() { =20 list_head() { local arg - for arg in $@; do + for arg in "$@"; do print "${arg}" return ${EXIT_OK} done diff --git a/src/functions/functions.modem b/src/functions/functions.modem index 90def3f..a2b01ca 100644 --- a/src/functions/functions.modem +++ b/src/functions/functions.modem @@ -34,10 +34,10 @@ modem_chat() { while [ $# -gt 0 ]; do case "${1}" in --timeout=3D*) - timeout=3D$(cli_get_val ${1}) + timeout=3D$(cli_get_val "${1}") ;; --answer=3D*) - answer=3D$(cli_get_val ${1}) + answer=3D$(cli_get_val "${1}") ;; --quiet) quiet=3D"true" @@ -204,7 +204,7 @@ modem_sim_unlocked() { } =20 modem_sim_locked() { - modem_sim_unlocked $@ && return ${EXIT_FALSE} || return ${EXIT_TRUE} + modem_sim_unlocked "$@" && return ${EXIT_FALSE} || return ${EXIT_TRUE} } =20 modem_sim_unlock() { diff --git a/src/functions/functions.ports b/src/functions/functions.ports index af3f5f0..cacc10c 100644 --- a/src/functions/functions.ports +++ b/src/functions/functions.ports @@ -149,7 +149,7 @@ port_is_attached() { } =20 port_is_up() { - device_is_up $@ + device_is_up "$@" } =20 port_new() { @@ -161,7 +161,7 @@ port_new() { return ${EXIT_ERROR} fi =20 - hook_exec port "${hook}" new $@ + hook_exec port "${hook}" new "$@" } =20 port_destroy() { @@ -203,7 +203,7 @@ port_destroy() { } =20 port_create() { - port_cmd "create" $@ + port_cmd "create" "$@" } =20 port_remove() { @@ -234,19 +234,19 @@ port_restart() { } =20 port_edit() { - port_cmd edit $@ + port_cmd edit "$@" } =20 port_up() { - port_cmd up $@ + port_cmd up "$@" } =20 port_down() { - port_cmd down $@ + port_cmd down "$@" } =20 port_status() { - port_cmd status $@ + port_cmd status "$@" } =20 port_cmd() { @@ -265,7 +265,7 @@ port_cmd() { return ${EXIT_ERROR} fi =20 - hook_exec port ${hook} ${cmd} ${port} $@ + hook_exec port ${hook} ${cmd} ${port} "$@" } =20 ports_get() { @@ -404,7 +404,7 @@ ports_lowest_address() { } =20 port_identify() { - device_identify $@ + device_identify "$@" } =20 port_get_color() { diff --git a/src/functions/functions.ppp b/src/functions/functions.ppp index 0840467..b114585 100644 --- a/src/functions/functions.ppp +++ b/src/functions/functions.ppp @@ -399,18 +399,18 @@ pppd_write_config() { while [ $# -gt 0 ]; do case "${1}" in --auth=3D*) - auth=3D$(cli_get_val ${1}) + auth=3D$(cli_get_val "${1}") ;; --baudrate=3D*) - baudrate=3D$(cli_get_val ${1}) + baudrate=3D$(cli_get_val "${1}") assert isoneof baudrate ${SERIAL_BAUDRATES} ;; --connect-command=3D*) - connect_cmd=3D$(cli_get_val ${1}) + connect_cmd=3D$(cli_get_val "${1}") ;; # Enable or disable the use of the default asyncmap. --default-asyncmap=3D*) - value=3D$(cli_get_val ${1}) + value=3D$(cli_get_val "${1}") if enabled value; then default_asyncmap=3D"true" else @@ -419,15 +419,15 @@ pppd_write_config() { ;; # The name of the created ppp interface. --interface=3D*) - interface=3D$(cli_get_val ${1}) + interface=3D$(cli_get_val "${1}") ;; # IPv6 --ipv6=3D*) - ipv6=3D"$(cli_get_val ${1})" + ipv6=3D"$(cli_get_val "${1}")" ;; # LCP echo failure. --lcr-echo-failure=3D*) - lcr_echo_failure=3D$(cli_get_val ${1}) + lcr_echo_failure=3D$(cli_get_val "${1}") =20 if ! isinteger ${lcr_echo_failure}; then error "--lcr-echo-failure=3D requires a number" @@ -436,7 +436,7 @@ pppd_write_config() { ;; # LCP echo interval. --lcr-echo-interval=3D*) - lcr_echo_interval=3D$(cli_get_val ${1}) + lcr_echo_interval=3D$(cli_get_val "${1}") =20 if ! isinteger ${lcr_echo_failure}; then error "--lcr-echo-interval=3D requires a number" @@ -445,23 +445,23 @@ pppd_write_config() { ;; # Maximum Transmission Unit --mtu=3D*) - mtu=3D$(cli_get_val ${1}) + mtu=3D$(cli_get_val "${1}") ;; # Maximum Receive Unit --mru=3D*) - mru=3D$(cli_get_val ${1}) + mru=3D$(cli_get_val "${1}") ;; --password=3D*) - password=3D$(cli_get_val ${1}) + password=3D$(cli_get_val "${1}") ;; --plugin=3D*) - plugin=3D$(cli_get_val ${1}) + plugin=3D$(cli_get_val "${1}") ;; --plugin-options=3D*) - plugin_options=3D$(cli_get_val ${1}) + plugin_options=3D$(cli_get_val "${1}") ;; --pty=3D*) - pty=3D$(cli_get_val ${1}) + pty=3D$(cli_get_val "${1}") ;; # Refused authentication methods --refuse=3D*) @@ -470,13 +470,13 @@ pppd_write_config() { ;; # Sets if the modem is a serial device. --serial=3D*) - serial=3D$(cli_get_val ${1}) + serial=3D$(cli_get_val "${1}") ;; --serial-device=3D*) - serial_device=3D$(cli_get_val ${1}) + serial_device=3D$(cli_get_val "${1}") ;; --username=3D*) - username=3D$(cli_get_val ${1}) + username=3D$(cli_get_val "${1}") ;; *) log WARNING "Unhandled argument: ${1}" diff --git a/src/functions/functions.pppoe-server b/src/functions/functions.p= ppoe-server index 2db7433..5d65d24 100644 --- a/src/functions/functions.pppoe-server +++ b/src/functions/functions.pppoe-server @@ -70,30 +70,30 @@ pppoe_server_options() { while [ $# -gt 0 ]; do case "${1}" in --auth=3D*) - auth=3D$(cli_get_val ${1}) + auth=3D$(cli_get_val "${1}") ;; --default-asyncmap=3D*) - default_asyncmap=3D$(cli_get_val ${1}) + default_asyncmap=3D$(cli_get_val "${1}") ;; --disable-ipv6) ipv6=3D"false" ;; --dns-servers=3D*) - dns_servers=3D"$(cli_get_val ${1})" + dns_servers=3D"$(cli_get_val "${1}")" ;; --lcp-echo-failure=3D*) - lcp_echo_failure=3D$(cli_get_val ${1}) + lcp_echo_failure=3D$(cli_get_val "${1}") assert isinteger ${lcp_echo_failure} ;; --lcp-echo-interval=3D*) - lcp_echo_interval=3D$(cli_get_val ${1}) + lcp_echo_interval=3D$(cli_get_val "${1}") assert isinteger ${lcp_echo_interval} ;; --proxyarp=3D*) - proxyarp=3D$(cli_get_val ${1}) + proxyarp=3D$(cli_get_val "${1}") ;; --require-auth=3D*) - required_auths=3D"${required_auths} $(cli_get_val ${1})" + required_auths=3D"${required_auths} $(cli_get_val "${1}")" ;; esac shift diff --git a/src/functions/functions.route b/src/functions/functions.route index 6a2c1fa..7ca4f59 100644 --- a/src/functions/functions.route +++ b/src/functions/functions.route @@ -23,7 +23,7 @@ # =20 cli_route() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-route exit ${EXIT_OK} fi @@ -33,7 +33,7 @@ cli_route() { =20 case "${action}" in static) - cli_route_static $@ + cli_route_static "$@" ;; *) error "Unrecognized action: ${action}" @@ -47,7 +47,7 @@ cli_route() { } =20 cli_route_static() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-route-static exit ${EXIT_OK} fi @@ -58,20 +58,20 @@ cli_route_static() { case "${action}" in # Add a new route. add) - route_add $@ + route_add "$@" ;; # Remove an existing route. remove) - route_remove $@ + route_remove "$@" ;; # List all routes. list) - route_list $@ + route_list "$@" return ${EXIT_OK} ;; # Reload all routes reload) - route_apply $@ + route_apply "$@" ;; *) error "Unrecognized action: ${action}" @@ -93,7 +93,7 @@ route_add() { while [ $# -gt 0 ]; do case "${1}" in --gateway=3D*) - gateway=3D$(cli_get_val ${1}) + gateway=3D$(cli_get_val "${1}") ;; --unreachable) unreachable=3D"true" @@ -105,7 +105,7 @@ route_add() { blackhole=3D"true" ;; --mtu=3D*) - mtu=3D$(cli_get_val ${1}) + mtu=3D$(cli_get_val "${1}") ;; *) if isset network; then @@ -217,7 +217,7 @@ route_remove() { local _network local error=3D${EXIT_OK} =20 - for _network in $@; do + for _network in "$@"; do # Validate input if ! ip_net_is_valid ${_network} && ! ip_is_valid ${_network}; then error "Invalid IP address or network: ${_network}" @@ -260,7 +260,7 @@ route_list() { while [ $# -gt 0 ]; do case "${1}" in --protocol=3D*) - protocol=3D$(cli_get_val ${1}) + protocol=3D$(cli_get_val "${1}") ;; *) warning "Unrecognized argument: ${1}" @@ -335,25 +335,25 @@ route_parse_line() { while read arg; do case "${arg}" in network=3D*) - network=3D$(cli_get_val ${arg}) + network=3D$(cli_get_val "${arg}") ;; gateway=3D*) - gateway=3D$(cli_get_val ${arg}) + gateway=3D$(cli_get_val "${arg}") ;; unreachable=3D*) - unreachable=3D$(cli_get_val ${arg}) + unreachable=3D$(cli_get_val "${arg}") ;; prohibit=3D*) - prohibit=3D$(cli_get_val ${arg}) + prohibit=3D$(cli_get_val "${arg}") ;; blackhole=3D*) - blackhole=3D$(cli_get_val ${arg}) + blackhole=3D$(cli_get_val "${arg}") ;; mtu=3D*) - mtu=3D$(cli_get_val ${arg}) + mtu=3D$(cli_get_val "${arg}") ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 ### Check if all values are correctly set. =20 @@ -443,19 +443,19 @@ route_entry_add() { while [ $# -gt 0 ]; do case "${1}" in --gateway=3D*) - gateway=3D$(cli_get_val ${1}) + gateway=3D$(cli_get_val "${1}") ;; --table=3D*) - table=3D$(cli_get_val ${1}) + table=3D$(cli_get_val "${1}") ;; --type=3D*) - type=3D$(cli_get_val ${1}) + type=3D$(cli_get_val "${1}") ;; --proto=3D*) - proto=3D$(cli_get_val ${1}) + proto=3D$(cli_get_val "${1}") ;; --mtu=3D*) - mtu=3D$(cli_get_val ${1}) + mtu=3D$(cli_get_val "${1}") ;; *) if isset network; then @@ -574,7 +574,7 @@ route_table_flush() { while [ $# -gt 0 ]; do case "${1}" in --protocol=3D*) - protocol=3D$(cli_get_val ${1}) + protocol=3D$(cli_get_val "${1}") ;; *) table=3D"${1}" @@ -621,7 +621,7 @@ route_table_exists() { while [ $# -gt 0 ]; do case "${1}" in --id=3D*) - _id=3D$(cli_get_val ${1}) + _id=3D$(cli_get_val "${1}") ;; *) _table=3D${1} @@ -653,13 +653,13 @@ route_rule_add() { while [ $# -gt 0 ]; do case "${1}" in --lookup=3D*) - lookup=3D$(cli_get_val ${1}) + lookup=3D$(cli_get_val "${1}") ;; --priority=3D*) - priority=3D$(cli_get_val ${1}) + priority=3D$(cli_get_val "${1}") ;; --protocol=3D*) - protocols=3D$(cli_get_val ${1}) + protocols=3D$(cli_get_val "${1}") =20 assert isoneof protocols ${IP_SUPPORTED_PROTOCOLS} ;; @@ -717,16 +717,16 @@ route_rule_exists() { while [ $# -gt 0 ]; do case "${1}" in --from=3D*) - from=3D$(cli_get_val ${1}) + from=3D$(cli_get_val "${1}") ;; --lookup=3D*) - lookup=3D$(cli_get_val ${1}) + lookup=3D$(cli_get_val "${1}") ;; --priority=3D*) - prio=3D$(cli_get_val ${1}) + prio=3D$(cli_get_val "${1}") ;; --protocol=3D*) - proto=3D$(cli_get_val ${1}) + proto=3D$(cli_get_val "${1}") ;; *) warning "Unrecognized argument: ${1}" diff --git a/src/functions/functions.settings b/src/functions/functions.setti= ngs index a7d9464..becf3f0 100644 --- a/src/functions/functions.settings +++ b/src/functions/functions.settings @@ -37,7 +37,7 @@ settings_read() { list_append valid_keys "${arg}" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 if [ -d "${file}" ]; then error "Not a configuration file: '${file}'" @@ -58,7 +58,7 @@ settings_read() { list_match ${key} ${valid_keys} || continue fi =20 - val=3D$(cli_get_val ${line}) + val=3D$(cli_get_val "${line}") val=3D$(settings_strip ${val}) =20 # Assign variable. @@ -99,7 +99,7 @@ settings_read_array() { fi fi =20 - val=3D$(cli_get_val ${line}) + val=3D$(cli_get_val "${line}") val=3D$(settings_strip ${val}) =20 # Assign variable. @@ -146,7 +146,7 @@ settings_write() { ;; esac shift - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 # Check if all values to be written are sane if isset check_func && ! settings_check "${check_func}"; then @@ -159,7 +159,7 @@ settings_write() { > ${settings_file} =20 local param - for param in $(list_sort $@); do + for param in $(list_sort "$@"); do echo "${param}=3D\"${!param}\"" >> ${settings_file} done } @@ -179,7 +179,7 @@ settings_remove() { settings_print() { local param =20 - for param in $(list_sort $@); do + for param in $(list_sort "$@"); do printf "%-32s =3D %s\n" "${param}" "${!param}" done } @@ -219,8 +219,8 @@ settings_set() { while [ $# -gt 0 ]; do case "${1}" in *=3D*) - local key=3D$(cli_get_key ${1}) - local val=3D$(cli_get_val ${1}) + local key=3D$(cli_get_key "${1}") + local val=3D$(cli_get_val "${1}") =20 log INFO "Setting configuration option '${key}=3D${val}'". =20 @@ -258,8 +258,8 @@ network_settings_set() { =20 case "${arg}" in *=3D*) - local key=3D$(cli_get_key ${arg}) - local val=3D$(cli_get_val ${arg}) + local key=3D$(cli_get_key "${arg}") + local val=3D$(cli_get_val "${arg}") =20 case "${key}" in DNS_RANDOMIZE|DNS_SEARCH_DOMAIN|DNS_USE_LOCAL_RESOLVER) diff --git a/src/functions/functions.util b/src/functions/functions.util index 687d008..24e3e66 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -134,7 +134,7 @@ parse_time() { local ret=3D0 =20 local arg - for arg in $@; do + for arg in "$@"; do local unit =20 case "${arg}" in @@ -495,7 +495,7 @@ cmd() { } =20 cmd_quiet() { - cmd $@ &>/dev/null + cmd "$@" &>/dev/null } =20 cmd_exec() { @@ -515,7 +515,7 @@ cmd_not_implemented() { =20 # Executes the given command in background cmd_background() { - cmd_quiet $@ & + cmd_quiet "$@" & } =20 # Prints the PID of the process that was started last @@ -531,7 +531,7 @@ cmd_background_result() { =20 # Increase security of the read command read() { - builtin read -r $@ + builtin read -r "$@" } =20 seq() { @@ -557,7 +557,7 @@ count() { } =20 which() { - type -P $@ + type -P "$@" } =20 # Prints the number of seconds since epoch. diff --git a/src/functions/functions.vpn b/src/functions/functions.vpn index 6d62f17..c004397 100644 --- a/src/functions/functions.vpn +++ b/src/functions/functions.vpn @@ -25,10 +25,10 @@ cli_vpn() { =20 case "${action}" in ipsec) - cli_ipsec $@ + cli_ipsec "$@" ;; security-policies) - cli_vpn_security_policies $@ + cli_vpn_security_policies "$@" ;; *) error "Unrecognized argument: ${action}" diff --git a/src/functions/functions.vpn-security-policies b/src/functions/fu= nctions.vpn-security-policies index cdd4e83..0f7b49e 100644 --- a/src/functions/functions.vpn-security-policies +++ b/src/functions/functions.vpn-security-policies @@ -269,13 +269,13 @@ cli_vpn_security_policies() { =20 case "${key}" in cipher|compression|integrity|lifetime|pfs|show) - vpn_security_policies_${key} ${security_policy} $@ + vpn_security_policies_${key} ${security_policy} "$@" ;; group-type) - vpn_security_policies_group_type ${security_policy} $@ + vpn_security_policies_group_type ${security_policy} "$@" ;; key-exchange) - vpn_security_policies_key_exchange ${security_policy} $@ + vpn_security_policies_key_exchange ${security_policy} "$@" ;; *) error "Unrecognized argument: ${key}" @@ -288,10 +288,10 @@ cli_vpn_security_policies() { =20 case "${action}" in new) - vpn_security_policies_new $@ + vpn_security_policies_new "$@" ;; destroy) - vpn_security_policies_destroy $@ + vpn_security_policies_destroy "$@" ;; ""|*) if [ -n "${action}" ]; then @@ -419,7 +419,7 @@ vpn_security_policies_read_config() { if [ $# -eq 0 ] && [ -n "${VPN_SECURITY_POLICIES_CONFIG_SETTINGS}" ]; then list_append args ${VPN_SECURITY_POLICIES_CONFIG_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 local path=3D"$(vpn_security_policies_path ${name})" @@ -793,7 +793,7 @@ vpn_security_policies_lifetime(){ fi =20 if ! isinteger value; then - value=3D$(parse_time $@) + value=3D$(parse_time "$@") if [ ! $? -eq 0 ]; then log ERROR "Parsing the passed time was not sucessful please check the pas= sed values." return ${EXIT_ERROR} @@ -892,7 +892,7 @@ vpn_security_policies_new() { # Function that deletes based on the passed parameters one ore more vpn secu= rity policies vpn_security_policies_destroy() { local name - for name in $@; do + for name in "$@"; do if ! vpn_security_policy_exists ${name}; then log ERROR "The vpn security policy ${name} does not exist." continue diff --git a/src/functions/functions.wireless b/src/functions/functions.wirel= ess index 581bdbf..3835f45 100644 --- a/src/functions/functions.wireless +++ b/src/functions/functions.wireless @@ -37,14 +37,14 @@ wireless_create() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - address=3D$(cli_get_val ${1}) + address=3D$(cli_get_val "${1}") ;; --phy=3D*) - phy=3D$(cli_get_val ${1}) + phy=3D$(cli_get_val "${1}") phy=3D$(phy_get ${phy}) ;; --type=3D*) - type=3D$(cli_get_val ${1}) + type=3D$(cli_get_val "${1}") =20 # ap --> __ap [ "${type}" =3D "ap" ] && type=3D"__ap" @@ -274,13 +274,13 @@ wireless_ibss_join() { while [ $# -gt 0 ]; do case "${1}" in --bssid=3D*) - bssid=3D"$(cli_get_val ${1})" + bssid=3D"$(cli_get_val "${1}")" ;; --essid=3D*) - essid=3D"$(cli_get_val ${1})" + essid=3D"$(cli_get_val "${1}")" ;; --channel=3D*) - local channel=3D"$(cli_get_val ${1})" + local channel=3D"$(cli_get_val "${1}")" =20 # Save the frequency of the channel instead # of the channel itself. diff --git a/src/functions/functions.wpa_supplicant b/src/functions/functions= .wpa_supplicant index f8aed22..e7f3677 100644 --- a/src/functions/functions.wpa_supplicant +++ b/src/functions/functions.wpa_supplicant @@ -36,19 +36,19 @@ wpa_supplicant_config_write() { for arg in "$@"; do case "${arg}" in --ap-scan=3D*) - ap_scan=3D$(cli_get_val ${arg}) + ap_scan=3D$(cli_get_val "${arg}") ;; --mode=3D*) - mode=3D$(cli_get_val ${arg}) + mode=3D$(cli_get_val "${arg}") =20 # Empty signals no encryption. isset mode || mode=3D"NONE" ;; --ssid=3D*) - ssid=3D$(cli_get_val ${arg}) + ssid=3D$(cli_get_val "${arg}") ;; --key=3D*) - key=3D$(cli_get_val ${arg}) + key=3D$(cli_get_val "${arg}") ;; *) error "Unrecognized argument: ${arg}" diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 1eb492f..52f8ee1 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -210,7 +210,7 @@ zone_cmd() { local hook=3D"$(zone_get_hook ${zone})" assert isset hook =20 - hook_exec zone "${hook}" "${cmd}" "${zone}" $@ + hook_exec zone "${hook}" "${cmd}" "${zone}" "$@" } =20 zone_new() { @@ -238,7 +238,7 @@ zone_new() { # Create directories for configs and ports mkdir -p $(zone_dir ${zone})/{configs,ports} =20 - hook_zone_exec "${hook}" "new" "${zone}" $@ + hook_zone_exec "${hook}" "new" "${zone}" "$@" local ret=3D$? =20 # Maybe the zone new hook did not exit correctly. @@ -281,7 +281,7 @@ zone_edit() { return ${EXIT_ERROR} fi =20 - hook_zone_exec ${hook} edit ${zone} $@ + hook_zone_exec ${hook} edit ${zone} "$@" } =20 zone_rename() { @@ -388,7 +388,7 @@ zone_up() { =20 zone_db ${zone} starting =20 - hook_zone_exec ${hook} up ${zone} $@ + hook_zone_exec ${hook} up ${zone} "$@" =20 zone_db ${zone} started =20 @@ -418,7 +418,7 @@ zone_down() { =20 zone_db ${zone} stopping =20 - hook_zone_exec ${hook} down ${zone} $@ + hook_zone_exec ${hook} down ${zone} "$@" =20 zone_db ${zone} stopped =20 @@ -475,7 +475,7 @@ zone_identify() { local port for port in $(zone_get_ports "${zone}"); do # Identify all the ports - port_identify "${port}" --background $@ + port_identify "${port}" --background "$@" =20 # Save the PIDs of the subprocesses list_append pids "$(cmd_background_get_pid)" @@ -754,7 +754,7 @@ zone_show() { zones_show() { local zone =20 - for zone in $(zones_get $@); do + for zone in $(zones_get "$@"); do zone_show ${zone} done } @@ -994,23 +994,23 @@ zone_port_cmd() { assert isset hook =20 # Dispatch command to hook - hook_zone_exec "${hook}" "${cmd}" "${zone}" "${port}" $@ + hook_zone_exec "${hook}" "${cmd}" "${zone}" "${port}" "$@" } =20 zone_port_create() { - zone_port_cmd "port_create" $@ + zone_port_cmd "port_create" "$@" } =20 zone_port_remove() { - zone_port_cmd "port_remove" $@ + zone_port_cmd "port_remove" "$@" } =20 zone_port_up() { - zone_port_cmd "port_up" $@ + zone_port_cmd "port_up" "$@" } =20 zone_port_down() { - zone_port_cmd "port_down" $@ + zone_port_cmd "port_down" "$@" } =20 # The next two functions automagically bring up and down @@ -1051,7 +1051,7 @@ zone_port_stop() { } =20 zone_port_status() { - zone_port_cmd "port_status" $@ + zone_port_cmd "port_status" "$@" } =20 zone_ports_cmd() { @@ -1067,28 +1067,28 @@ zone_ports_cmd() { =20 local port for port in $(zone_get_ports ${zone}); do - hook_zone_exec "${hook}" "${cmd}" "${zone}" "${port}" $@ + hook_zone_exec "${hook}" "${cmd}" "${zone}" "${port}" "$@" done } =20 zone_ports_create() { - zone_ports_cmd "port_create" $@ + zone_ports_cmd "port_create" "$@" } =20 zone_ports_remove() { - zone_ports_cmd "port_remove" $@ + zone_ports_cmd "port_remove" "$@" } =20 zone_ports_up() { - zone_ports_cmd "port_up" $@ + zone_ports_cmd "port_up" "$@" } =20 zone_ports_down() { - zone_ports_cmd "port_down" $@ + zone_ports_cmd "port_down" "$@" } =20 zone_ports_status() { - zone_ports_cmd "port_status" $@ + zone_ports_cmd "port_status" "$@" } =20 zone_configs_cmd() { @@ -1105,20 +1105,20 @@ zone_configs_cmd() { local config_hook=3D"$(zone_config_get_hook "${zone}" "${config}")" assert isset config_hook =20 - hook_config_exec "${config_hook}" "${cmd}" "${zone}" "${config}" $@ + hook_config_exec "${config_hook}" "${cmd}" "${zone}" "${config}" "$@" done } =20 zone_configs_up() { - zone_configs_cmd "up" $@ + zone_configs_cmd "up" "$@" } =20 zone_configs_down() { - zone_configs_cmd "down" $@ + zone_configs_cmd "down" "$@" } =20 zone_configs_status() { - zone_configs_cmd "status" $@ + zone_configs_cmd "status" "$@" } =20 zone_configs_list() { @@ -1272,7 +1272,7 @@ zone_config_get_hook_from_id() { } =20 zone_has_ip() { - device_has_ip $@ + device_has_ip "$@" } =20 zone_db() { @@ -1294,7 +1294,7 @@ zone_is_up() { } =20 zone_is_down() { - ! zone_is_up $@ + ! zone_is_up "$@" } =20 zone_get_supported_port_hooks() { @@ -1326,7 +1326,7 @@ zone_settings_read() { if [ $# -eq 0 ] && [ -n "${HOOK_SETTINGS}" ]; then list_append args ${HOOK_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 # Save the HOOK variable. @@ -1395,7 +1395,7 @@ zone_config_settings_read() { if [ $# -eq 0 ] && [ -n "${HOOK_CONFIG_SETTINGS}" ]; then list_append args ${HOOK_CONFIG_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 local path=3D"$(zone_dir "${zone}")/configs/${config}" @@ -1453,7 +1453,7 @@ zone_port_settings_read() { if [ $# -eq 0 ] && [ -n "${HOOK_PORT_SETTINGS}" ]; then list_append args ${HOOK_PORT_SETTINGS} else - list_append args $@ + list_append args "$@" fi =20 local path=3D"$(zone_dir "${zone}")/ports/${port}" diff --git a/src/header-config b/src/header-config index 6341a22..ec85a70 100644 --- a/src/header-config +++ b/src/header-config @@ -55,7 +55,7 @@ hook_edit() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/header-port b/src/header-port index 238749e..9d1c1df 100644 --- a/src/header-port +++ b/src/header-port @@ -51,7 +51,7 @@ hook_default_edit() { =20 port_settings_read "${port}" ${HOOK_SETTINGS} =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 @@ -61,7 +61,7 @@ hook_default_edit() { } =20 hook_edit() { - hook_default_edit $@ + hook_default_edit "$@" } =20 # Returns a list of all children of this port @@ -116,7 +116,7 @@ hook_default_up() { } =20 hook_up() { - hook_default_up $@ + hook_default_up "$@" } =20 hook_default_down() { @@ -135,5 +135,5 @@ hook_default_down() { } =20 hook_down() { - hook_default_down $@ + hook_default_down "$@" } diff --git a/src/header-zone b/src/header-zone index 189fbc3..ead4a32 100644 --- a/src/header-zone +++ b/src/header-zone @@ -34,7 +34,7 @@ hook_new() { assert isset zone shift =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 @@ -56,7 +56,7 @@ hook_edit() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 @@ -112,7 +112,7 @@ hook_port() { local ret case "${action}" in add|create|edit|rem|show) - hook_port_${action} "${zone}" $@ + hook_port_${action} "${zone}" "$@" ret=3D$? ;; *) @@ -150,7 +150,7 @@ hook_default_port_create() { } =20 hook_port_create() { - hook_default_port_create $@ + hook_default_port_create "$@" } =20 hook_default_port_remove() { @@ -163,7 +163,7 @@ hook_default_port_remove() { } =20 hook_port_remove() { - hook_default_port_remove $@ + hook_default_port_remove "$@" } =20 hook_port_up() { diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp index 7f6780b..f22507c 100644 --- a/src/hooks/configs/dhcp +++ b/src/hooks/configs/dhcp @@ -72,7 +72,7 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index ef74991..7aea0b9 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -87,7 +87,7 @@ hook_parse_cmdline() { exit ${EXIT_CONF_ERROR} ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 if ! isset ADDRESS; then error "You need to provide an IPv4 address" @@ -115,7 +115,7 @@ hook_new() { =20 assert zone_exists "${zone}" =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto index 375e585..bf1003d 100644 --- a/src/hooks/configs/ipv6-auto +++ b/src/hooks/configs/ipv6-auto @@ -45,7 +45,7 @@ hook_parse_cmdline() { fi ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" } =20 hook_new() { @@ -57,7 +57,7 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index c41401c..273c201 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -66,7 +66,7 @@ hook_new() { local zone=3D${1} shift =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server index b4d2538..7021be2 100644 --- a/src/hooks/configs/pppoe-server +++ b/src/hooks/configs/pppoe-server @@ -65,24 +65,24 @@ hook_parse_cmdline() { done ;; --max-sessions=3D*) - MAX_SESSIONS=3D$(cli_get_val ${1}) + MAX_SESSIONS=3D$(cli_get_val "${1}") if ! isinteger ${MAX_SESSIONS} || ! [ ${MAX_SESSIONS} -ge 0 ]; then error "Invalid value for '--max-session'. This value must be an integer= greate or eqal zero." exit ${EXIT_ERROR} fi ;; --mtu=3D*) - MTU=3D$(cli_get_val ${1}) + MTU=3D$(cli_get_val "${1}") if ! mtu_is_valid "ipv4" ${MTU}; then error "Invalid value for '--mtu'. Cannot be larger then 9000 or smaller= than 576" exit ${EXIT_ERROR} fi ;; --service-name=3D*) - SERVICE_NAME=3D$(cli_get_val ${1}) + SERVICE_NAME=3D$(cli_get_val "${1}") ;; --subnet=3D*) - SUBNET=3D$(cli_get_val ${1}) + SUBNET=3D$(cli_get_val "${1}") if ! ipv4_net_is_valid "${SUBNET}"; then error "Invalid IPv4 Subnet ${SUBNET}." exit ${EXIT_ERROR} @@ -105,7 +105,7 @@ hook_new() { return ${EXIT_ERROR} fi =20 - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/ports/batman-adv b/src/hooks/ports/batman-adv index 4f16201..b304f4f 100644 --- a/src/hooks/ports/batman-adv +++ b/src/hooks/ports/batman-adv @@ -37,10 +37,10 @@ hook_new() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D"$(cli_get_val ${1})" + ADDRESS=3D"$(cli_get_val "${1}")" ;; --slaves=3D*) - SLAVES=3D"$(cli_get_val ${1})" + SLAVES=3D"$(cli_get_val "${1}")" ;; *) warning "Ignoring unknown argument '${1}'" @@ -67,13 +67,13 @@ hook_edit() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D"$(cli_get_val ${1})" + ADDRESS=3D"$(cli_get_val "${1}")" ;; --add-slave=3D*) - SLAVES=3D"${SLAVES} $(cli_get_val ${1})" + SLAVES=3D"${SLAVES} $(cli_get_val "${1}")" ;; --del-slave=3D*) - local slave=3D"$(cli_get_val ${1})" + local slave=3D"$(cli_get_val "${1}")" =20 local s slaves for s in ${SLAVES}; do diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding index e268186..36bcf6c 100644 --- a/src/hooks/ports/bonding +++ b/src/hooks/ports/bonding @@ -39,16 +39,16 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; --miimon=3D*) - MIIMON=3D$(cli_get_val ${1}) + MIIMON=3D$(cli_get_val "${1}") ;; --mode=3D*) - MODE=3D$(cli_get_val ${1}) + MODE=3D$(cli_get_val "${1}") ;; +*) - local slave=3D$(cli_get_val ${1:1}) + local slave=3D$(cli_get_val "${1:1}") =20 if port_exists "${slave}"; then if list_match "${slave}" ${SLAVES}; then @@ -61,7 +61,7 @@ hook_parse_cmdline() { fi ;; -*) - local slave=3D$(cli_get_val ${1:1}) + local slave=3D$(cli_get_val "${1:1}") if ! list_remove SLAVES "${slave}"; then warning "Port ${slave} is not a slave of this bonding device" fi @@ -84,7 +84,7 @@ hook_parse_cmdline() { } =20 hook_new() { - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 @@ -106,7 +106,7 @@ hook_new() { hook_edit() { local port=3D${1} =20 - if ! hook_default_edit $@; then + if ! hook_default_edit "$@"; then return ${EXIT_ERROR} fi =20 diff --git a/src/hooks/ports/dummy b/src/hooks/ports/dummy index 7e6f5d2..30de50e 100644 --- a/src/hooks/ports/dummy +++ b/src/hooks/ports/dummy @@ -31,7 +31,7 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; *) warning "Unknown argument '${1}'" @@ -53,7 +53,7 @@ hook_parse_cmdline() { } =20 hook_new() { - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan index 3443614..2231de1 100644 --- a/src/hooks/ports/vlan +++ b/src/hooks/ports/vlan @@ -51,13 +51,13 @@ hook_new() { while [ $# -gt 0 ]; do case "${1}" in --parent-device=3D*) - PARENT_DEVICE=3D$(cli_get_val ${1}) + PARENT_DEVICE=3D$(cli_get_val "${1}") ;; --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; --tag=3D*) - TAG=3D$(cli_get_val ${1}) + TAG=3D$(cli_get_val "${1}") ;; *) warning "Unknown argument '${1}'" @@ -83,7 +83,7 @@ hook_edit() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; *) warning "Unknown argument '${1}'" diff --git a/src/hooks/ports/wireless-adhoc b/src/hooks/ports/wireless-adhoc index 09ab402..d97bf55 100644 --- a/src/hooks/ports/wireless-adhoc +++ b/src/hooks/ports/wireless-adhoc @@ -45,22 +45,22 @@ hook_new() { while [ $# -gt 0 ]; do case "${1}" in --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; --bssid=3D*) - BSSID=3D$(cli_get_val ${1}) + BSSID=3D$(cli_get_val "${1}") ;; --channel=3D*) - CHANNEL=3D$(cli_get_val ${1}) + CHANNEL=3D$(cli_get_val "${1}") ;; --mtu=3D*) MTU=3D"$(cli_get_val "${1}")" ;; --phy=3D*) - PHY=3D$(cli_get_val ${1}) + PHY=3D$(cli_get_val "${1}") ;; --ssid=3D*) - SSID=3D$(cli_get_val ${1}) + SSID=3D$(cli_get_val "${1}") ;; *) warning "Ignoring unknown argument '${1}'" @@ -91,16 +91,16 @@ hook_edit() { while [ $# -gt 0 ]; do case "${1}" in --bssid=3D*) - BSSID=3D$(cli_get_val ${1}) + BSSID=3D$(cli_get_val "${1}") ;; --channel=3D*) - CHANNEL=3D$(cli_get_val ${1}) + CHANNEL=3D$(cli_get_val "${1}") ;; --mtu=3D*) MTU=3D"$(cli_get_val "${1}")" ;; --ssid=3D*) - SSID=3D$(cli_get_val ${1}) + SSID=3D$(cli_get_val "${1}") ;; *) warning "Unknown argument '${1}'" diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap index 9c77bb1..e7f9193 100644 --- a/src/hooks/ports/wireless-ap +++ b/src/hooks/ports/wireless-ap @@ -57,28 +57,28 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --broadcast-ssid=3D*) - BROADCAST_SSID=3D$(cli_get_val ${1}) + BROADCAST_SSID=3D$(cli_get_val "${1}") ;; --channel=3D*) - CHANNEL=3D$(cli_get_val ${1}) + CHANNEL=3D$(cli_get_val "${1}") ;; --encryption=3D*) - ENCRYPTION=3D$(cli_get_val ${1}) + ENCRYPTION=3D$(cli_get_val "${1}") ;; --key=3D*) - KEY=3D$(cli_get_val ${1}) + KEY=3D$(cli_get_val "${1}") ;; --mac=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; --mode=3D*) - MODE=3D$(cli_get_val ${1}) + MODE=3D$(cli_get_val "${1}") ;; --phy=3D*) - PHY=3D$(cli_get_val ${1}) + PHY=3D$(cli_get_val "${1}") ;; --ssid=3D*) - SSID=3D$(cli_get_val ${1}) + SSID=3D$(cli_get_val "${1}") ;; *) warning "Ignoring unknown argument '${1}'" @@ -93,7 +93,7 @@ hook_parse_cmdline() { } =20 hook_new() { - if ! hook_parse_cmdline $@; then + if ! hook_parse_cmdline "$@"; then return ${EXIT_ERROR} fi =20 @@ -109,7 +109,7 @@ hook_edit() { local port=3D${1} assert isset port =20 - if ! hook_default_edit $@; then + if ! hook_default_edit "$@"; then return ${EXIT_ERROR} fi =20 diff --git a/src/hooks/zones/6to4-tunnel b/src/hooks/zones/6to4-tunnel index f550741..bf20872 100644 --- a/src/hooks/zones/6to4-tunnel +++ b/src/hooks/zones/6to4-tunnel @@ -64,16 +64,16 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --server-address=3D*) - SERVER_ADDRESS=3D$(cli_get_val ${1}) + SERVER_ADDRESS=3D$(cli_get_val "${1}") ;; --local-ipv4-address=3D*) - LOCAL_ADDRESS=3D$(cli_get_val ${1}) + LOCAL_ADDRESS=3D$(cli_get_val "${1}") ;; --local-ipv6-address=3D*) - LOCAL_ADDRESS6=3D$(cli_get_val ${1}) + LOCAL_ADDRESS6=3D$(cli_get_val "${1}") ;; --auto-update-endpoint=3D*) - local val=3D"$(cli_get_val ${1})" + local val=3D"$(cli_get_val "${1}")" =20 if enabled val; then AUTO_UPDATE_ENDPOINT=3D"true" @@ -82,13 +82,13 @@ hook_parse_cmdline() { fi ;; --tunnel-id=3D*) - TUNNEL_ID=3D"$(cli_get_val ${1})" + TUNNEL_ID=3D"$(cli_get_val "${1}")" ;; --username=3D*) - USERNAME=3D"$(cli_get_val ${1})" + USERNAME=3D"$(cli_get_val "${1}")" ;; --password=3D*) - PASSWORD=3D"$(cli_get_val ${1})" + PASSWORD=3D"$(cli_get_val "${1}")" ;; *) echo "Unknown option: ${1}" >&2 diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge index 245f4c1..e90111c 100644 --- a/src/hooks/zones/bridge +++ b/src/hooks/zones/bridge @@ -268,7 +268,7 @@ hook_port_attach() { PRIORITY=3D"$(cli_get_val "${arg}")" ;; esac - done <<< "$(args $@)" + done <<< "$(args "$@")" =20 if ! zone_port_settings_write "${zone}" "${port}"; then exit ${EXIT_ERROR} @@ -294,7 +294,7 @@ hook_port_detach() { } =20 hook_port_edit() { - hook_port_attach $@ + hook_port_attach "$@" } =20 hook_port_up() { diff --git a/src/hooks/zones/modem b/src/hooks/zones/modem index ff21d45..1b4c3c0 100644 --- a/src/hooks/zones/modem +++ b/src/hooks/zones/modem @@ -94,39 +94,39 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --apn=3D*) - APN=3D$(cli_get_val ${1}) + APN=3D$(cli_get_val "${1}") ;; --auth=3D*) - AUTH=3D$(cli_get_val ${1}) + AUTH=3D$(cli_get_val "${1}") ;; --baudrate=3D*) - BAUDRATE=3D$(cli_get_val ${1}) + BAUDRATE=3D$(cli_get_val "${1}") assert isoneif "${BAUDRATE}" ${SERIAL_BAUDRATES} ;; --device=3D*) - DEVICE=3D$(cli_get_val ${1}) + DEVICE=3D$(cli_get_val "${1}") ;; --imsi=3D*) IMSI=3D"$(cli_get_val "${1}")" ;; --monitor-device=3D*) - MONITOR_DEVICE=3D$(cli_get_val ${1}) + MONITOR_DEVICE=3D$(cli_get_val "${1}") ;; --mtu=3D*) - MTU=3D$(cli_get_val ${1}) + MTU=3D$(cli_get_val "${1}") assert isinteger ${MTU} ;; --password=3D*) - PASSWORD=3D$(cli_get_val ${1}) + PASSWORD=3D$(cli_get_val "${1}") ;; --phone-number=3D*) - PHONE_NUMBER=3D$(cli_get_val ${1}) + PHONE_NUMBER=3D$(cli_get_val "${1}") ;; --pin=3D*) - PIN=3D$(cli_get_val ${1}) + PIN=3D$(cli_get_val "${1}") ;; --username=3D*) - USERNAME=3D$(cli_get_val ${1}) + USERNAME=3D$(cli_get_val "${1}") ;; *) echo "Unknown argument: ${1}" >&2 diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe index 5b44b8c..021d89b 100644 --- a/src/hooks/zones/pppoe +++ b/src/hooks/zones/pppoe @@ -64,10 +64,10 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --access-concentrator=3D*) - ACCESS_CONCENTRATOR=3D$(cli_get_val ${1}) + ACCESS_CONCENTRATOR=3D$(cli_get_val "${1}") ;; --auth=3D*) - AUTH=3D$(cli_get_val ${1}) + AUTH=3D$(cli_get_val "${1}") ;; --ipv6=3D*) local value=3D"$(cli_get_val "${1}")" @@ -78,19 +78,19 @@ hook_parse_cmdline() { fi ;; --mtu=3D*) - MTU=3D$(cli_get_val ${1}) + MTU=3D$(cli_get_val "${1}") ;; --password=3D*) - PASSWORD=3D$(cli_get_val ${1}) + PASSWORD=3D$(cli_get_val "${1}") ;; --prefix-delegation=3D*) PREFIX_DELEGATION=3D"$(cli_get_bool "${1}")" ;; --service-name=3D*) - SERVICE_NAME=3D$(cli_get_val ${1}) + SERVICE_NAME=3D$(cli_get_val "${1}") ;; --username=3D*) - USERNAME=3D$(cli_get_val ${1}) + USERNAME=3D$(cli_get_val "${1}") ;; *) warning "Unknown argument: ${1}" >&2 diff --git a/src/hooks/zones/wireless b/src/hooks/zones/wireless index bd202f2..0bb4aa8 100644 --- a/src/hooks/zones/wireless +++ b/src/hooks/zones/wireless @@ -48,19 +48,19 @@ hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in --phy=3D*|--parent-device=3D*) - PHY=3D$(cli_get_val ${1}) + PHY=3D$(cli_get_val "${1}") ;; --encryption-mode=3D*) - ENCRYPTION_MODE=3D$(cli_get_val ${1}) + ENCRYPTION_MODE=3D$(cli_get_val "${1}") ;; --address=3D*) - ADDRESS=3D$(cli_get_val ${1}) + ADDRESS=3D$(cli_get_val "${1}") ;; --ssid=3D*) - SSID=3D$(cli_get_val ${1}) + SSID=3D$(cli_get_val "${1}") ;; --key=3D*) - KEY=3D$(cli_get_val ${1}) + KEY=3D$(cli_get_val "${1}") ;; *) warning "Unrecognized option: ${1}" diff --git a/src/network b/src/network index 547bab1..4460f0b 100644 --- a/src/network +++ b/src/network @@ -39,13 +39,13 @@ done network_settings_read =20 cli_settings() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-settings exit ${EXIT_OK} fi =20 if [ -n "${1}" ]; then - network_settings_set $@ + network_settings_set "$@" network_settings_write else network_settings_print @@ -53,7 +53,7 @@ cli_settings() { } =20 cli_device() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-device exit ${EXIT_OK} fi @@ -63,7 +63,7 @@ cli_device() { =20 case "${action}" in list) - cli_device_list $@ + cli_device_list "$@" ;; *) local device=3D"${action}" @@ -79,22 +79,22 @@ cli_device() { =20 case "${action}" in discover) - cli_device_discover ${device} $@ + cli_device_discover ${device} "$@" ;; identify) - device_identify "${device}" $@ + device_identify "${device}" "$@" ;; monitor) - cli_device_monitor "${device}" $@ + cli_device_monitor "${device}" "$@" ;; status) cli_device_status ${device} ;; unlock) - cli_device_serial_unlock ${device} $@ + cli_device_serial_unlock ${device} "$@" ;; ussd) - cli_device_send_ussd_command "${device}" $@ + cli_device_send_ussd_command "${device}" "$@" ;; *) cli_show_man network-device @@ -339,7 +339,7 @@ cli_device_discover() { } =20 cli_device_serial_unlock() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-device exit ${EXIT_OK} fi @@ -482,7 +482,7 @@ cli_device_list() { } =20 cli_hostname() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi @@ -501,7 +501,7 @@ cli_hostname() { } =20 cli_port() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-port exit ${EXIT_OK} fi @@ -516,13 +516,13 @@ cli_port() { =20 case "${action}" in edit|create|remove|up|down|status|identify) - port_${action} "${port}" $@ + port_${action} "${port}" "$@" ;; color) - color_cli "port" "${port}" $@ + color_cli "port" "${port}" "$@" ;; description) - description_cli "port" "${port}" $@ + description_cli "port" "${port}" "$@" ;; *) error "Unrecognized argument: ${action}" @@ -535,7 +535,7 @@ cli_port() { =20 case "${action}" in new|destroy) - port_${action} $@ + port_${action} "$@" ;; *) error "Unrecognized argument: ${action}" @@ -546,7 +546,7 @@ cli_port() { } =20 cli_zone() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-zone exit ${EXIT_OK} fi @@ -574,19 +574,19 @@ cli_zone() { =20 case "${action}" in port) - cli_zone_port "${zone}" $@ + cli_zone_port "${zone}" "$@" ;; rename) - cli_zone_rename "${zone}" $@ + cli_zone_rename "${zone}" "$@" ;; config|disable|down|edit|enable|identify|status|up) - zone_${action} ${zone} $@ + zone_${action} ${zone} "$@" ;; color) - color_cli "zone" "${zone}" $@ + color_cli "zone" "${zone}" "$@" ;; description) - description_cli "zone" ${zone} $@ + description_cli "zone" ${zone} "$@" ;; *) error "Unrecognized argument: ${action}" @@ -600,10 +600,10 @@ cli_zone() { =20 case "${action}" in new) - cli_zone_new $@ + cli_zone_new "$@" ;; destroy) - cli_zone_destroy $@ + cli_zone_destroy "$@" ;; ""|*) if [ -n "${action}" ]; then @@ -619,19 +619,19 @@ cli_zone() { } =20 cli_zone_new() { - if cli_help_requested $@ || [ $# -lt 2 ]; then + if cli_help_requested "$@" || [ $# -lt 2 ]; then cli_show_man network-zone-new exit ${EXIT_OK} fi =20 - zone_new $@ + zone_new "$@" } =20 # Removes a zone either immediately, if it is currently down, # or adds a tag that the removal will be done when the zone # is brought down the next time. cli_zone_destroy() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-zone exit ${EXIT_OK} fi @@ -651,7 +651,7 @@ cli_zone_destroy() { } =20 cli_zone_port() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-zone-port exit ${EXIT_OK} fi @@ -666,7 +666,7 @@ cli_zone_port() { =20 case "${action}" in edit) - zone_port_edit "${zone}" "${port}" $@ + zone_port_edit "${zone}" "${port}" "$@" ;; *) error "Unrecognised argument: ${action}" @@ -679,10 +679,10 @@ cli_zone_port() { =20 case "${action}" in attach) - zone_port_attach "${zone}" $@ + zone_port_attach "${zone}" "$@" ;; detach) - zone_port_detach "${zone}" $@ + zone_port_detach "${zone}" "$@" ;; *) error "Unrecognised argument: ${action}" @@ -695,7 +695,7 @@ cli_zone_port() { } =20 cli_zone_rename() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-zone exit ${EXIT_OK} fi @@ -745,7 +745,7 @@ cli_list_hooks() { local type=3D${1} shift =20 - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-zone exit ${EXIT_OK} fi @@ -765,7 +765,7 @@ cli_dhcpd() { local proto=3D${1} shift =20 - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-dhcp exit ${EXIT_OK} fi @@ -775,7 +775,7 @@ cli_dhcpd() { =20 case "${action}" in edit) - dhcpd_edit ${proto} $@ + dhcpd_edit ${proto} "$@" ;; start) dhcpd_start ${proto} @@ -793,10 +793,10 @@ cli_dhcpd() { dhcpd_reload ${proto} ;; subnet) - cli_dhcpd_subnet ${proto} $@ + cli_dhcpd_subnet ${proto} "$@" ;; show|"") - cli_dhcpd_show ${proto} $@ + cli_dhcpd_show ${proto} "$@" ;; *) error "Unrecognized action: ${action}" @@ -885,7 +885,7 @@ cli_dhcpd_subnet() { local proto=3D${1} shift =20 - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-dhcp-subnet exit ${EXIT_OK} fi @@ -895,10 +895,10 @@ cli_dhcpd_subnet() { =20 case "${action}" in new) - dhcpd_subnet_new ${proto} $@ + dhcpd_subnet_new ${proto} "$@" ;; remove) - dhcpd_subnet_remove ${proto} $@ + dhcpd_subnet_remove ${proto} "$@" ;; *:*/*|*.*.*.*/*) local subnet=3D${action} @@ -914,7 +914,7 @@ cli_dhcpd_subnet() { =20 case "${action}" in edit) - dhcpd_subnet_edit ${proto} ${subnet} $@ + dhcpd_subnet_edit ${proto} ${subnet} "$@" local ret=3D$? =20 if [ ${ret} -eq ${EXIT_OK} ]; then @@ -923,15 +923,15 @@ cli_dhcpd_subnet() { exit ${ret} ;; range) - cli_dhcpd_subnet_range ${proto} ${subnet} $@ + cli_dhcpd_subnet_range ${proto} ${subnet} "$@" exit $? ;; show) - cli_dhcpd_subnet_show ${proto} ${subnet} $@ + cli_dhcpd_subnet_show ${proto} ${subnet} "$@" exit $? ;; options) - cli_dhcpd_subnet_options ${proto} ${subnet} $@ + cli_dhcpd_subnet_options ${proto} ${subnet} "$@" exit $? ;; *) @@ -968,10 +968,10 @@ cli_dhcpd_subnet_range() { =20 case "${action}" in new) - dhcpd_subnet_range_new ${proto} ${subnet} $@ || exit ${EXIT_ERROR} + dhcpd_subnet_range_new ${proto} ${subnet} "$@" || exit ${EXIT_ERROR} ;; remove) - dhcpd_subnet_range_remove ${proto} ${subnet} $@ || exit ${EXIT_ERROR} + dhcpd_subnet_range_remove ${proto} ${subnet} "$@" || exit ${EXIT_ERROR} ;; *) error "Unrecognized action: ${action}" @@ -1050,7 +1050,7 @@ cli_dhcpd_subnet_options() { case "${1}" in *=3D*) key=3D$(cli_get_key ${1}) - val=3D$(cli_get_val ${1}) + val=3D$(cli_get_val "${1}") =20 dhcpd_subnet_option_set ${proto} ${subnet} ${key} ${val} esac @@ -1059,12 +1059,12 @@ cli_dhcpd_subnet_options() { } =20 cli_start() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi =20 - local zones=3D$(zones_get $@) + local zones=3D$(zones_get "$@") =20 local zone for zone in ${zones}; do @@ -1075,12 +1075,12 @@ cli_start() { } =20 cli_stop() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi =20 - local zones=3D$(zones_get $@) + local zones=3D$(zones_get "$@") =20 local zone for zone in ${zones}; do @@ -1091,21 +1091,21 @@ cli_stop() { } =20 cli_restart() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi =20 - cli_stop $@ + cli_stop "$@" =20 # Give the system some time to calm down sleep ${TIMEOUT_RESTART} =20 - cli_start $@ + cli_start "$@" } =20 cli_status() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi @@ -1116,7 +1116,7 @@ cli_status() { local log_disable_stdout=3D${LOG_DISABLE_STDOUT} LOG_DISABLE_STDOUT=3D"true" =20 - local zones=3D$(zones_get $@) + local zones=3D$(zones_get "$@") =20 local zone for zone in ${zones}; do @@ -1128,7 +1128,7 @@ cli_status() { } =20 cli_reset() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network exit ${EXIT_OK} fi @@ -1225,7 +1225,7 @@ cli_help() { } =20 cli_dns_server() { - if cli_help_requested $@; then + if cli_help_requested "$@"; then cli_show_man network-dns-server exit ${EXIT_OK} fi @@ -1288,22 +1288,22 @@ cli_raw() { db_dump ;; ipsec-connection-exists) - ipsec_connection_exists $@ + ipsec_connection_exists "$@" ;; list-devices) device_list ;; list-dhcpd-ranges-of-subnet) - dhcpd_subnet_range_list $@ + dhcpd_subnet_range_list "$@" ;; list-dhcpd-settings) - dhcpd_global_settings_list $@ + dhcpd_global_settings_list "$@" ;; list-dhcpd-subnets) - dhcpd_subnet_list $@ + dhcpd_subnet_list "$@" ;; list-dhcpd-subnet-options) - dhcpd_subnet_options_list $@ + dhcpd_subnet_options_list "$@" ;; list-dns-servers) dns_server_list @@ -1312,7 +1312,7 @@ cli_raw() { port_list_free ;; list-hooks) - hook_list $@ + hook_list "$@" ;; list-ipsec-connections) ipsec_list_connections @@ -1321,7 +1321,7 @@ cli_raw() { port_list ;; list-ports-of-zone) - zone_get_ports $@ + zone_get_ports "$@" ;; list-vpn-security-policies-all) vpn_security_policies_list_all @@ -1336,22 +1336,22 @@ cli_raw() { zones_get_next_free ;; list-zone-config-ids) - zone_config_list_ids $@ + zone_config_list_ids "$@" ;; list-zone-config-hids) - zone_config_list_hids $@ + zone_config_list_hids "$@" ;; vpn-security-policy-exists) - vpn_security_policy_exists $@ + vpn_security_policy_exists "$@" ;; zone-name-is-valid) - zone_name_is_valid $@ + zone_name_is_valid "$@" ;; zone-config-id-is-valid) - zone_config_id_is_valid $@ + zone_config_id_is_valid "$@" ;; zone-config-hid-is-valid) - zone_config_hid_is_valid $@ + zone_config_hid_is_valid "$@" ;; *) error "No such command: ${cmd}" @@ -1369,25 +1369,25 @@ case "${action}" in ;; =20 settings|hostname|port|device|zone|start|stop|restart|status|reset|route|vp= n) - cli_${action} $@ + cli_${action} "$@" ;; =20 # DHCP server configuration (automatically detects which protocol to use). dhcpv6|dhcpv4) - cli_dhcpd ${action/dhcp/ip} $@ + cli_dhcpd ${action/dhcp/ip} "$@" ;; =20 # DNS server configuration. dns-server) - cli_dns_server $@ + cli_dns_server "$@" ;; =20 ""|help|--help|-h) - cli_help $@ + cli_help "$@" ;; =20 raw) - cli_raw $@ + cli_raw "$@" ;; =20 *) --=20 2.6.3 --===============9044391526111529077==--