network January 2018

network@lists.ipfire.org

2 participants
4 discussions

[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

[PATCH] dhclient-script: fix bound
by Jonatan Schlag 22 Jan '18

22 Jan '18

When we get a BOUND we should have only new_* variables set. So it is stated in the manpage. Apparently, also old_* variables are set so we never got into the block where the IP address was set. We now always set a new IP Address when we get a BOUND. Fixes: #11363 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/dhclient-script | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dhclient-script b/src/dhclient-script index c2e0678..ec990bf 100644 --- a/src/dhclient-script +++ b/src/dhclient-script @@ -197,7 +197,8 @@ case "${reason}" in BOUND|RENEW|REBIND|REBOOT) # Check if the IP address has changed. If so, delete all routes and stuff. - if [ -n "${old_ip_address}" -a "${old_ip_address}" != "${new_ip_address}" ]; then + if [ -n "${old_ip_address}" -a "${old_ip_address}" != "${new_ip_address}" ] || \ + [ "${reason}" = "BOUND" ]; then ipv4_flush_device ${interface} fi @@ -208,7 +209,8 @@ case "${reason}" in [ ! "${old_network_number}" = "${new_network_number}" ] || \ [ ! "${old_broadcast_address}" = "${new_broadcast_address}" ] || \ [ ! "${old_routers}" = "${new_routers}" ] || \ - [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then + [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ] || \ + [ "${reason}" = "BOUND" ]; then # Calc the prefix from the subnet mask -- 2.6.3

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network January 2018