network

network@lists.ipfire.org

108 discussions

[PATCH] IPsec: Fix routing
by Jonatan Schlag 01 Mar '18

01 Mar '18

Based on the examples found in strongswan we need to specific the source IP for our routes through an IPsec VPN. If we have no source IP (a router can route packages which do not belong to the network assigned to our zones) we set no routes, but clients can still use the tunnel. For IPsec VPNs in tunnel mode we also need the device which has the ${PLUTO_ME} IP address asigned. The source IP is determined ip_get_assigned_addresses_from_net() the device is determined by the device_get_by_ip_address() function. For tunnel mode see: https://www.strongswan.org/testing/testresults/ipv6-stroke/net2net-ip4-in-i… Fixes: #11629 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/helpers/ipsec-updown | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/src/helpers/ipsec-updown b/src/helpers/ipsec-updown index 12ead03..3764085 100644 --- a/src/helpers/ipsec-updown +++ b/src/helpers/ipsec-updown @@ -86,13 +86,45 @@ case "${PLUTO_VERB}" in ;; esac - # Set routes - if isset INTERFACE; then - cmd ip route add "${PLUTO_PEER_CLIENT}" \ - dev "${INTERFACE}" - else - cmd ip route add "${PLUTO_PEER_CLIENT}" \ - via "${PLUTO_PEER}" + #Get sources IP for routes + SRC_IP=($(ip_get_assigned_addresses_from_net \ + "${PLUTO_MY_CLIENT}" "permanent")) + + # Set routes if we have a source IP. + # If not the machine does not has a leg on the net + # and we can go on without routes. + if isset SRC_IP; then + # We take the lowest source IP we found, + # which is ugly because the value is unpredictable. + SRC_IP=${SRC_IP[0]} + + if isset INTERFACE; then + if ! cmd ip route add \ + "${PLUTO_PEER_CLIENT}" \ + dev "${INTERFACE}" \ + src "${SRC_IP}"; then + log ERROR \ + "Could not set routes for ${PLUTO_PEER_CLIENT}" + fi + else + # Get the device which we use to peer with the other site. + ME_DEVICE = "$(device_get_by_ip_address "${PLUTO_ME}")" + + # We can only go on if we found a device. + if isset ME_DEVICE; then + if ! cmd ip route add \ + "${PLUTO_PEER_CLIENT}" \ + dev "${ME_DEVICE}" \ + proto static \ + src "${SRC_IP}" \ + table 220; then + log ERROR \ + "Could not set routes for ${PLUTO_PEER_CLIENT}" + fi + else + log ERROR "Could not get device for ${PLUTO_ME}" + fi + fi fi ;; -- 2.6.3

2 1

[PATCH v2] Add new function ip_get__assigned_addresses_from_net()
by Jonatan Schlag 01 Mar '18

01 Mar '18

This function is neede by IPsec to set the routes correctly. We can now now find a source IP for a given net. This way is ugly because the source IP is unpredictable if we get multiple IPs. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ip | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/functions/functions.ip b/src/functions/functions.ip index 3b43da7..70bd92c 100644 --- a/src/functions/functions.ip +++ b/src/functions/functions.ip @@ -205,3 +205,31 @@ ip_address_del() { return ${EXIT_OK} } + +# Get all currently assigned addresse for a given network +ip_get_assigned_addresses_from_net() { + local net=${1} + shift + local args="$@" + + if ! ip_net_is_valid ${net}; then + log ERROR "IP net ${net} is invalid" + return ${EXIT_ERROR} + fi + + local line + local addresses + + # We read the output of $(ip addr show to ${net} ${args}) + while read -r line; do + # We are only interested in lines which start with inet or inet6 + [[ "${line}" =~ ^(inet6 |inet ) ]] || continue + + # We need the second word the line + line=(${line}) + list_append "addresses" "$(ip_split_prefix "${line[1]}")" + done <<< "$(ip addr show to "${net}" ${args})" + + # We sort the list to get the lowest IP as first item + list_sort ${addresses} +} -- 2.6.3

2 2

[network] Patch notification: 2 patches updated
by Patchwork 01 Mar '18

01 Mar '18

Hello, The following patches (submitted by you) have been updated in Patchwork: * network: [1/3] Add new function: device_get_by_assigned_ip_address() - http://patchwork.ipfire.org/patch/1671/ - for: network was: New now: Accepted * network: [3/3] IPsec: Log the content of all PLUTO variables in debug mode - http://patchwork.ipfire.org/patch/1673/ - for: network was: New now: Accepted This email is a notification only - you do not need to respond. Happy patchworking. -- This is an automated mail sent by the Patchwork system at patchwork.ipfire.org. To stop receiving these notifications, edit your mail settings at: http://patchwork.ipfire.org/mail/

1 0

[PATCH 1/3] Add new function: device_get_by_assigned_ip_address()
by Jonatan Schlag 27 Feb '18

27 Feb '18

This function is used to get a device from an IP address which is assigned to the device. This function needs to be introduced to set the routes for IPsec correctly. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.device | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/functions/functions.device b/src/functions/functions.device index cb4911f..2de1ad9 100644 --- a/src/functions/functions.device +++ b/src/functions/functions.device @@ -1058,3 +1058,30 @@ device_queue_set_smp_affinity() { __processor_id_to_bitmap ${processor} > ${path} } + +# Tries to find a device which has the given IP address assigned +device_get_by_assigned_ip_address() { + local ip=${1} + + assert isset ip + + local device + + # Read the first line of ip addr show to + read -r device <<< $(ip addr show to "${ip}") + + # If we did not found a device we return with ${EXIT_ERROR} + if ! isset device; then + return ${EXIT_ERROR} + fi + + # We get something like: + # 3: upl0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000 + # and we want upl0 so we take the second word and removing the : + device=(${device}) + device=${device[1]} + device=${device%:} + + print "${device}" + return ${EXIT_OK} +} -- 2.6.3

2 7

[PATCH v2] Fix radvd startup
by Jonatan Schlag 11 Feb '18

11 Feb '18

We now only start radvd when we write a config for a zone into the config file. Fixes: #11450 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.radvd | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/functions/functions.radvd b/src/functions/functions.radvd index 4e41160..1c8b8d0 100644 --- a/src/functions/functions.radvd +++ b/src/functions/functions.radvd @@ -23,16 +23,16 @@ RADVD_CONFIGFILE="/etc/radvd.conf" radvd_update() { # (Re-)write the configuration file - radvd_write_config - - # Reload the radvd service if it is already running - if service_is_active radvd; then - service_reload radvd - return ${EXIT_OK} + if radvd_write_config; then + # Reload the radvd service if it is already running + if service_is_active radvd; then + service_reload radvd + return ${EXIT_OK} + fi + + # Start the radvd service + service_start radvd fi - - # Start the radvd service - service_start radvd } radvd_clear_config() { @@ -48,14 +48,21 @@ radvd_write_config() { # Write the configuration for all zones. local zone - for zone in $(zones_get_local); do - __radvd_config_interface ${zone} + # The return value determine if radvd is started or not + local return_value=${EXIT_FALSE} + + for zone in $(zones_get_local); do + if __radvd_config_interface ${zone}; then + # We return TRUE when __radvd_config_interface returns True + return_value=${EXIT_TRUE} + fi done >> ${RADVD_CONFIGFILE} - return ${EXIT_OK} + return ${return_value} } +# This function return ${EXIT_FALSE} if no radvd config was written and ${EXIT_TRUE} in all other cases __radvd_config_interface() { local zone=${1} assert isset zone @@ -65,17 +72,17 @@ __radvd_config_interface() { # If the interface does not provide any routing information, # we can skip this whole stuff. if ! db_exists "${zone}/ipv6"; then - return ${EXIT_OK} + return ${EXIT_FALSE} fi # Skip if zone is not active. local active="$(db_get "${zone}/ipv6/active")" - [ "${active}" = "0" ] && return ${EXIT_OK} + [ "${active}" = "0" ] && return ${EXIT_FALSE} # Skip if there is no prefix or prefix is link-local. local addr="$(db_get "${zone}/ipv6/local-ip-address")" if [ -z "${addr}" ] || [ "${addr:0:5}" = "fe80:" ]; then - return ${EXIT_OK} + return ${EXIT_FALSE} fi # Check if the subnet is configured by the DHCP server. @@ -116,6 +123,8 @@ __radvd_config_interface() { print "};" print + + return ${EXIT_TRUE} } __radvd_config_dns() { -- 2.6.3

2 1

[PATCH] Print better info mesages when we change a service
by Jonatan Schlag 10 Feb '18

10 Feb '18

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.service | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/functions/functions.service b/src/functions/functions.service index 7a12ffd..07bd2cd 100644 --- a/src/functions/functions.service +++ b/src/functions/functions.service @@ -45,6 +45,11 @@ service_stop() { assert isset name systemctl stop "${name}" + local ret=$? + + log INFO "Stopped service '${name}', code=${ret}" + + return ${ret} } service_restart() { @@ -52,6 +57,11 @@ service_restart() { assert isset name systemctl restart "${name}" + local ret=$? + + log INFO "Restarted service '${name}', code=${ret}" + + return ${ret} } service_reload() { @@ -60,7 +70,12 @@ service_reload() { if service_status "${name}"; then systemctl reload "${name}" - return $? + local ret=$? + + log INFO "Reloaded service '${name}', code=${ret}" + + return ${ret} + else log WARNING "Cannot reload service '${name}' which is currently not running." fi -- 2.6.3

2 1

[PATCH v2] Fix zone_config_check_same_setting
by Jonatan Schlag 07 Feb '18

07 Feb '18

Every time we edited a config zone_config_check_same_setting returns that a identical config was found but this config was the config we want to edit. So we now generate the id inside hook_new and pass the id always to hook_parse_cmdline and to zone_config_check_same_setting. So we can skip this config. Fixes: #11451 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 18 +++++++++++------- src/header-config | 8 ++++++-- src/hooks/configs/dhcp | 10 ++++++++-- src/hooks/configs/ipv6-auto | 10 ++++++++-- src/hooks/configs/pppoe-server | 10 ++++++++-- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index f724f50..58c0347 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1097,22 +1097,29 @@ zone_config_check_same_setting() { # with the same setting is already configured for this zone. # Returns True when yes and False when no. - assert [ $# -eq 4 ] + assert [ $# -eq 5 ] local zone=${1} local hook=${2} - local key=${3} - local value=${4} + local id=${3} + local key=${4} + local value=${5} # The key should be local for this function local ${key} local config for config in $(zone_configs_list ${zone}); do + # Check if the config is eqal with the config we want to edit, when continue + if [[ "${config}" = "${hook}.${id}" ]]; then + continue + fi + # Check if the config is from the given hook, when not continue if [[ $(zone_config_get_hook "${zone}" "${config}") != ${hook} ]]; then continue fi + # Get the value of the key for a given function zone_config_settings_read "${zone}" "${config}" \ --ignore-superfluous-settings "${key}" @@ -1343,10 +1350,7 @@ zone_config_settings_write() { local hook="${2}" local id=${3} - if ! isset id; then - id=$(zone_config_get_new_id ${zone}) - log DEBUG "ID for the config is: ${id}" - fi + assert isset id local args if function_exists "hook_check_config_settings"; then diff --git a/src/header-config b/src/header-config index 141d52b..4458eaa 100644 --- a/src/header-config +++ b/src/header-config @@ -23,8 +23,12 @@ hook_new() { local zone="${1}" shift + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + # Parse command line arguments - if ! hook_parse_cmdline "$@"; then + if ! hook_parse_cmdline "${id}" "$@"; then + # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi @@ -68,7 +72,7 @@ hook_edit() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp index f22507c..b643022 100644 --- a/src/hooks/configs/dhcp +++ b/src/hooks/configs/dhcp @@ -35,6 +35,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --enable-ipv6) @@ -72,12 +75,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto index bf1003d..8796723 100644 --- a/src/hooks/configs/ipv6-auto +++ b/src/hooks/configs/ipv6-auto @@ -31,6 +31,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + local arg while read arg; do @@ -57,12 +60,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server index 7021be2..6a2c014 100644 --- a/src/hooks/configs/pppoe-server +++ b/src/hooks/configs/pppoe-server @@ -49,6 +49,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --dns-server=*) @@ -105,12 +108,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } -- 2.6.3

1 0

[PATCH] Fix zone_config_check_same_setting
by Jonatan Schlag 06 Feb '18

06 Feb '18

Every time we edited a config zone_config_check_same_setting returns that a identical config was found but this config was the config we want to edit. So we now generate the id inside hook_new and pass the id always to hook_parse_cmdline and to zone_config_check_same_setting. So we cann skip this config. Fixes: #11451 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 18 +++++++++++------- src/header-config | 2 +- src/hooks/configs/dhcp | 10 ++++++++-- src/hooks/configs/ipv4-static | 12 +++++++++--- src/hooks/configs/ipv6-auto | 10 ++++++++-- src/hooks/configs/ipv6-static | 12 +++++++++--- src/hooks/configs/pppoe-server | 10 ++++++++-- 7 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 2d3d2c7..0d767cf 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1098,22 +1098,29 @@ zone_config_check_same_setting() { # with the same setting is already configured for this zone. # Returns True when yes and False when no. - assert [ $# -eq 4 ] + assert [ $# -eq 5 ] local zone=${1} local hook=${2} - local key=${3} - local value=${4} + local id=${3} + local key=${4} + local value=${5} # The key should be local for this function local ${key} local config for config in $(zone_configs_list ${zone}); do + # Check if the config is eqal with the config we want to edit, when continue + if [[ "${config}" = "${hook}.${id}" ]]; then + continue + fi + # Check if the config is from the given hook, when not continue if [[ $(zone_config_get_hook "${zone}" "${config}") != ${hook} ]]; then continue fi + # Get the value of the key for a given function zone_config_settings_read "${zone}" "${config}" \ --ignore-superfluous-settings "${key}" @@ -1346,10 +1353,7 @@ zone_config_settings_write() { local hook="${2}" local id=${3} - if ! isset id; then - id=$(zone_config_get_new_id ${zone}) - log DEBUG "ID for the config is: ${id}" - fi + assert isset id local args if function_exists "hook_check_config_settings"; then diff --git a/src/header-config b/src/header-config index ec85a70..10b0279 100644 --- a/src/header-config +++ b/src/header-config @@ -55,7 +55,7 @@ hook_edit() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp index f22507c..40c6b48 100644 --- a/src/hooks/configs/dhcp +++ b/src/hooks/configs/dhcp @@ -35,6 +35,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --enable-ipv6) @@ -72,12 +75,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index 7aea0b9..0c16322 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -36,6 +36,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + local arg while read -r arg; do @@ -99,7 +102,7 @@ hook_parse_cmdline() { exit ${EXIT_CONF_ERROR} fi - if zone_config_check_same_setting "${zone}" "ipv4-static" "ADDRESS" "${ADDRESS}"; then + if zone_config_check_same_setting "${zone}" "ipv4-static" "${id}" "ADDRESS" "${ADDRESS}"; then error "An ipv4-static config with the same IPv4 address is already configured" exit ${EXIT_CONF_ERROR} fi @@ -115,12 +118,15 @@ hook_new() { assert zone_exists "${zone}" - if ! hook_parse_cmdline "$@"; then + id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto index bf1003d..b6301b0 100644 --- a/src/hooks/configs/ipv6-auto +++ b/src/hooks/configs/ipv6-auto @@ -31,6 +31,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + local arg while read arg; do @@ -57,12 +60,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index 273c201..8f94819 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -34,6 +34,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --address=*) @@ -49,7 +52,7 @@ hook_parse_cmdline() { shift done - if zone_config_check_same_setting "${zone}" "ipv6-static" "ADDRESS" "${ADDRESS}"; then + if zone_config_check_same_setting "${zone}" "ipv6-static" "${id}" "ADDRESS" "${ADDRESS}"; then error "An ipv6-static config with the same IPv6 address is already configured" exit ${EXIT_CONF_ERROR} fi @@ -66,12 +69,15 @@ hook_new() { local zone=${1} shift - if ! hook_parse_cmdline "$@"; then + id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server index 7021be2..35de2eb 100644 --- a/src/hooks/configs/pppoe-server +++ b/src/hooks/configs/pppoe-server @@ -49,6 +49,9 @@ hook_check_config_settings() { } hook_parse_cmdline() { + local id="${1}" + shift + while [ $# -gt 0 ]; do case "${1}" in --dns-server=*) @@ -105,12 +108,15 @@ hook_new() { return ${EXIT_ERROR} fi - if ! hook_parse_cmdline "$@"; then + id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then # Return an error if the parsing of the cmd line fails return ${EXIT_ERROR} fi - zone_config_settings_write "${zone}" "${HOOK}" + zone_config_settings_write "${zone}" "${HOOK}" "${id}" exit ${EXIT_OK} } -- 2.6.3

2 1

[PATCH] Fix parsing of hids and ids
by Jonatan Schlag 06 Feb '18

06 Feb '18

If we get an id insted of a hid we failed beacuse we passed the wrong variable. I also added some more comments. Fixes: #11453 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index f724f50..2d3d2c7 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -527,7 +527,8 @@ zone_config() { zone_config_list "${zone}" "$@" ;; *) - # usually ${1} is a valid hid + # usually ${cmd} is valid hid + # We get ${hid} ${cmd} $@ from the cli local hid=${cmd} local cmd=${1} shift 1 @@ -538,11 +539,11 @@ zone_config() { if isset id && [[ ${cmd} == "edit" ]]; then zone_config_edit "${zone}" "${id}" "$@" - # If we didn't get a valid hid we check if we got a valid id + # If we didn't get a valid hid we check if we got a valid id (saved in ${hid}) else - if zone_config_id_is_valid ${zone} ${id} && [[ ${cmd} == "edit" ]]; then + if zone_config_id_is_valid ${zone} ${hid} && [[ ${cmd} == "edit" ]]; then shift 1 - zone_config_edit "${zone}" "${id}" "$@" + zone_config_edit "${zone}" "${hid}" "$@" else # in ${hid} is saved the command after network zone ${zone} config error "Unrecognized argument: ${hid}" @@ -1171,6 +1172,8 @@ zone_config_id_is_valid() { local zone=${1} local id=${2} + log DEBUG "Checking if id: ${id} is valid for zone: ${zone}" + local zone_path="${NETWORK_ZONES_DIR}/${zone}" [ -f ${zone_path}/configs/*.${id} ]; -- 2.6.3

2 1

[PATCH] Fix radvd startup
by Jonatan Schlag 06 Feb '18

06 Feb '18

We now only start radvd when we write a config fr a zone into the config file and when no errors happen. Fixes: #11450 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.radvd | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/functions/functions.radvd b/src/functions/functions.radvd index 4e41160..bd016a0 100644 --- a/src/functions/functions.radvd +++ b/src/functions/functions.radvd @@ -23,16 +23,16 @@ RADVD_CONFIGFILE="/etc/radvd.conf" radvd_update() { # (Re-)write the configuration file - radvd_write_config - - # Reload the radvd service if it is already running - if service_is_active radvd; then - service_reload radvd - return ${EXIT_OK} + if radvd_write_config; then + # Reload the radvd service if it is already running + if service_is_active radvd; then + service_reload radvd + return ${EXIT_OK} + fi + + # Start the radvd service + service_start radvd fi - - # Start the radvd service - service_start radvd } radvd_clear_config() { @@ -48,12 +48,19 @@ radvd_write_config() { # Write the configuration for all zones. local zone - for zone in $(zones_get_local); do - __radvd_config_interface ${zone} + # The return value determine if radvd is started or not + local return_value=${EXIT_FALSE} + for zone in $(zones_get_local); do + if __radvd_config_interface ${zone} && [ ${return_value} = ${EXIT_TRUE} ]; then + # We return TRUE when __radvd_config_interface succeed and no errors happend till now + return_value=${EXIT_TRUE} + else + return_value=${EXIT_FALSE} + fi done >> ${RADVD_CONFIGFILE} - return ${EXIT_OK} + return ${return_value} } __radvd_config_interface() { -- 2.6.3

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network