network July 2017

network@lists.ipfire.org

2 participants
36 discussions

[PATCH] dhcp: remove delay setting
by Jonatan Schlag 06 Jul '17

06 Jul '17

This settings was never used and so we can remove it safely. This patch also remove one line with unwanted whitespace. Fixes: #11420 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/hooks/configs/dhcp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp index 8f8b2f6..efeaf74 100644 --- a/src/hooks/configs/dhcp +++ b/src/hooks/configs/dhcp @@ -21,16 +21,13 @@ . /usr/lib/network/header-config -HOOK_CONFIG_SETTINGS="HOOK DELAY ENABLE_IPV4 ENABLE_IPV6" +HOOK_CONFIG_SETTINGS="HOOK ENABLE_IPV4 ENABLE_IPV6" # Default settings. -DELAY=0 ENABLE_IPV4="on" ENABLE_IPV6="on" hook_check_config_settings() { - assert isset DELAY - assert isinteger DELAY assert isset ENABLE_IPV4 assert isbool ENABLE_IPV4 assert isset ENABLE_IPV6 @@ -40,9 +37,6 @@ hook_check_config_settings() { hook_parse_cmdline() { while [ $# -gt 0 ]; do case "${1}" in - --delay=*) - DELAY="$(cli_get_val "${1}")" - ;; --enable-ipv4=*) ENABLE_IPV4="$(cli_get_val "${1}")" if ! isbool ${ENABLE_IPV4}; then @@ -171,7 +165,7 @@ hook_status() { if isset gateway; then cli_print_fmt1 4 "Gateway" "${gateway}" fi - + local dns_servers="$(db_get "${zone}/${_proto}/domain-name-servers")" if isset dns_servers; then cli_print_fmt1 4 "DNS Servers" "${dns_servers}" -- 2.6.3

1 0

[PATCH] dhcp: merge ipv4-dhcp and ipv6-dhcp
by Jonatan Schlag 06 Jul '17

06 Jul '17

Fixes: #11404 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/hooks/configs/dhcp | 188 ++++++++++++++++++++++++++++++++++++++++++++ src/hooks/configs/ipv4-dhcp | 122 ---------------------------- src/hooks/configs/ipv6-dhcp | 100 ----------------------- 3 files changed, 188 insertions(+), 222 deletions(-) create mode 100644 src/hooks/configs/dhcp delete mode 100644 src/hooks/configs/ipv4-dhcp delete mode 100644 src/hooks/configs/ipv6-dhcp diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp new file mode 100644 index 0000000..8f8b2f6 --- /dev/null +++ b/src/hooks/configs/dhcp @@ -0,0 +1,188 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +. /usr/lib/network/header-config + +HOOK_CONFIG_SETTINGS="HOOK DELAY ENABLE_IPV4 ENABLE_IPV6" + +# Default settings. +DELAY=0 +ENABLE_IPV4="on" +ENABLE_IPV6="on" + +hook_check_config_settings() { + assert isset DELAY + assert isinteger DELAY + assert isset ENABLE_IPV4 + assert isbool ENABLE_IPV4 + assert isset ENABLE_IPV6 + assert isbool ENABLE_IPV6 +} + +hook_parse_cmdline() { + while [ $# -gt 0 ]; do + case "${1}" in + --delay=*) + DELAY="$(cli_get_val "${1}")" + ;; + --enable-ipv4=*) + ENABLE_IPV4="$(cli_get_val "${1}")" + if ! isbool ${ENABLE_IPV4}; then + log ERROR "--enable-ipv4 accept only on of the following values: on off 1 0 no yes" + return ${EXIT_ERROR} + fi + ;; + --enable-ipv6=*) + ENABLE_IPV6="$(cli_get_val "${1}")" + if ! isbool ${ENABLE_IPV6}; then + log ERROR "--enable-ipv6 accept only on of the following values: on off 1 0 no yes" + return ${EXIT_ERROR} + fi + ;; + *) + warning "Ignoring unknown option '${1}'" + ;; + esac + shift + done +} + +hook_new() { + local zone="${1}" + shift + + if zone_config_hook_is_configured ${zone} "dhcp"; then + log ERROR "You can configure the dhcp hook only once for a zone" + return ${EXIT_ERROR} + fi + + hook_parse_cmdline $@ + + # Check if the user disabled ipv4 and ipv6 + + if ! enabled ENABLE_IPV6 && ! enabled ENABLE_IPV4; then + log ERROR "You disabled IPv4 and IPv6. At least one must be enabled" + fi + + zone_config_settings_write "${zone}" "${HOOK}" + + exit ${EXIT_OK} +} + +hook_up() { + local zone=${1} + local config=${2} + shift 2 + + if ! device_exists ${zone}; then + error "Zone '${zone}' doesn't exist." + exit ${EXIT_ERROR} + fi + + zone_config_settings_read "${zone}" "${config}" + + # Start dhclient for IPv4 on this zone if enabled. + if enabled ENABLE_IPV4; then + dhclient_start ${zone} ipv4 + fi + + # Start dhclient for IPv6 on this zone if enabled. + if enabled ENABLE_IPV6; then + dhclient_start ${zone} ipv6 + fi + + exit ${EXIT_OK} +} + +hook_down() { + local zone=${1} + local config=${2} + shift 2 + + if ! device_exists ${zone}; then + error "Zone '${zone}' doesn't exist." + exit ${EXIT_ERROR} + fi + + # Stop dhclient for IPv4 on this zone. + dhclient_stop ${zone} ipv4 + + # Stop dhclient for IPv6 on this zone. + dhclient_stop ${zone} ipv6 + + exit ${EXIT_OK} +} + +hook_status() { + local zone=${1} + local config=${2} + shift 2 + + if ! device_exists ${zone}; then + error "Zone '${zone}' doesn't exist." + exit ${EXIT_ERROR} + fi + + zone_config_settings_read "${zone}" "${config}" + + local status + if dhclient_status ${zone} ipv4 || dhclient_status ${zone} ipv6; then + status="${MSG_HOOK_UP}" + else + status="${MSG_HOOK_DOWN}" + fi + cli_statusline 3 "${HOOK}" "${status}" + + cli_space + + local proto + for proto in "IPv6" "IPv4"; do + local _proto=${proto,,} + + cli_print_fmt1 3 "${proto}" + + if enabled ENABLE_${proto^^}; then + cli_print_fmt1 4 "Status" "enabled" + + local address="$(db_get "${zone}/${_proto}/local-ip-address")" + if isset address; then + cli_print_fmt1 4 "Address" "${address}" + fi + + local gateway="$(db_get "${zone}/${_proto}/remote-ip-address")" + if isset gateway; then + cli_print_fmt1 4 "Gateway" "${gateway}" + fi + + local dns_servers="$(db_get "${zone}/${_proto}/domain-name-servers")" + if isset dns_servers; then + cli_print_fmt1 4 "DNS Servers" "${dns_servers}" + fi + else + cli_print_fmt1 4 "Status" "disabled" + fi + + cli_space + + done + + exit ${EXIT_OK} +} diff --git a/src/hooks/configs/ipv4-dhcp b/src/hooks/configs/ipv4-dhcp deleted file mode 100644 index 39e0312..0000000 --- a/src/hooks/configs/ipv4-dhcp +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -. /usr/lib/network/header-config - -HOOK_CONFIG_SETTINGS="HOOK DELAY" - -# Default settings. -DELAY=0 - -hook_check_config_settings() { - assert isset DELAY - assert isinteger DELAY -} - -hook_new() { - local zone="${1}" - shift - - if zone_config_hook_is_configured ${zone} "ipv4-dhcp"; then - log ERROR "You can configure the ipv4-dhcp hook only once for a zone" - return ${EXIT_ERROR} - fi - - while [ $# -gt 0 ]; do - case "${1}" in - --delay=*) - DELAY="$(cli_get_val "${1}")" - ;; - esac - shift - done - - zone_config_settings_write "${zone}" "${HOOK}" - - exit ${EXIT_OK} -} - -hook_up() { - local zone=${1} - local config=${2} - shift 2 - - if ! device_exists ${zone}; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - # Start dhclient for IPv4 on this zone. - dhclient_start ${zone} ipv4 - - exit ${EXIT_OK} -} - -hook_down() { - local zone=${1} - local config=${2} - shift 2 - - if ! device_exists ${zone}; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - # Stop dhclient for IPv4 on this zone. - dhclient_stop ${zone} ipv4 - - exit ${EXIT_OK} -} - -hook_status() { - local zone=${1} - local config=${2} - shift 2 - - if ! device_exists ${zone}; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - zone_config_settings_read "${zone}" "${config}" - - local status - if dhclient_status ${zone} ipv4; then - status="${MSG_HOOK_UP}" - else - status="${MSG_HOOK_DOWN}" - fi - cli_statusline 3 "${HOOK}" "${status}" - - cli_print_fmt1 3 "IPv4 address" "$(db_get "${zone}/ipv4/local-ip-address")" - local gateway="$(db_get "${zone}/ipv4/remote-ip-address")" - if isset gateway; then - cli_print_fmt1 3 "Gateway" "${gateway}" - cli_space - fi - local dns_servers="$(db_get "${zone}/ipv4/domain-name-servers")" - if isset dns_servers; then - cli_print_fmt1 3 "DNS-Servers" "${dns_servers}" - cli_space - fi - - exit ${EXIT_OK} -} diff --git a/src/hooks/configs/ipv6-dhcp b/src/hooks/configs/ipv6-dhcp deleted file mode 100644 index 74ec765..0000000 --- a/src/hooks/configs/ipv6-dhcp +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -. /usr/lib/network/header-config - -HOOK_CONFIG_SETTINGS="HOOK" - -hook_new() { - local zone="${1}" - shift - - if zone_config_hook_is_configured ${zone} "ipv6-dhcp"; then - log ERROR "You can configure the ipv6-dhcp hook only once for a zone" - return ${EXIT_ERROR} - fi - - zone_config_settings_write "${zone}" "${HOOK}" - - exit ${EXIT_OK} -} - -hook_up() { - local zone="${1}" - local config="${2}" - shift 2 - - if ! device_exists "${zone}"; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - # Start dhclient for IPv6 on this zone. - dhclient_start "${zone}" "ipv6" - - exit ${EXIT_OK} -} - -hook_down() { - local zone="${1}" - local config="${2}" - shift 2 - - if ! device_exists "${zone}"; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - # Stop dhclient for IPv6 on this zone. - dhclient_stop "${zone}" "ipv6" - - exit ${EXIT_OK} -} - -hook_status() { - local zone="${1}" - local config="${2}" - shift 2 - - if ! device_exists "${zone}"; then - error "Zone '${zone}' doesn't exist." - exit ${EXIT_ERROR} - fi - - zone_config_settings_read "${zone}" "${config}" - - local status - if dhclient_status "${zone}" "ipv6"; then - status="${MSG_HOOK_UP}" - else - status="${MSG_HOOK_DOWN}" - fi - cli_statusline 3 "${HOOK}" "${status}" - - cli_print_fmt1 3 "IPv6 address" "$(db_get "${zone}/ipv6/local-ip-address")" - local gateway="$(db_get "${zone}/ipv6/remote-ip-address")" - if isset gateway; then - cli_print_fmt1 3 "Gateway" "${gateway}" - fi - cli_space - - exit ${EXIT_OK} -} -- 2.6.3

1 0

[PATCH 1/8] zone: new function zone_config_get_new_id
by Jonatan Schlag 05 Jul '17

05 Jul '17

This functions is needed to implement the new id feature described in #11405 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index f321c2d..b44d3b5 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -992,6 +992,24 @@ zone_configs_list() { done } +zone_config_get_new_id() { + # This functions returns the next free id for a zone + + assert [ $# -eq 1 ] + local zone=${1} + + local zone_path=$(zone_dir ${zone}) + local i=0 + + while true; do + if [ ! -f ${zone_path}/configs/*.${i} ]; then + echo "${i}" + return ${EXIT_OK} + fi + (( i++ )) + done +} + zone_config_get_hook() { assert [ $# -eq 2 ] -- 2.6.3

1 7

[PATCH 1/2] settings: remove dot from log message
by Jonatan Schlag 05 Jul '17

05 Jul '17

The dots at the end of log messages can be confusing. Especially behind variables,it is often unclear if the dot was part of the variable or not which make debugging much harder. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/functions.settings b/src/functions/functions.settings index 0e50bf1..c73349a 100644 --- a/src/functions/functions.settings +++ b/src/functions/functions.settings @@ -159,7 +159,7 @@ settings_write() { return ${EXIT_ERROR} fi - log DEBUG "Writing settings file ${settings_file}." + log DEBUG "Writing settings file '${settings_file}'" mkdir -p $(dirname ${settings_file}) 2>/dev/null > ${settings_file} -- 2.6.3

1 1

[PATCH] config: remove old hashes
by Jonatan Schlag 04 Jul '17

04 Jul '17

With the new id feature the old hashes are not necessary anymore. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/hooks/configs/ipv4-static | 3 +-- src/hooks/configs/ipv6-static | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index cb00252..c395200 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -106,8 +106,7 @@ hook_new() { warning "You did not configure a gateway for a non-local zone" fi - # XXX maybe we can add some hashing to identify a configuration again - zone_config_settings_write "${zone}" "${HOOK}.$(uuid)" + zone_config_settings_write "${zone}" "${HOOK}" exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index 2a5e8e2..f43ef7e 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -59,7 +59,7 @@ hook_new() { GATEWAY=$(ipv6_format "${GATEWAY}") fi - zone_config_settings_write "${zone}" "${HOOK}.$(ipv6_hash ${ADDRESS}).${PREFIX}" + zone_config_settings_write "${zone}" "${HOOK}" exit ${EXIT_OK} } -- 2.6.3

2 2

[PATCH 1/7] settings: remove dot from log message
by Jonatan Schlag 04 Jul '17

04 Jul '17

The dots at the end of log messages can be confusing. Especially behind variables,it is often unclear if the dot was part of the variable or not which make debugging much harder. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/functions.settings b/src/functions/functions.settings index 0e50bf1..9efbe8e 100644 --- a/src/functions/functions.settings +++ b/src/functions/functions.settings @@ -159,7 +159,7 @@ settings_write() { return ${EXIT_ERROR} fi - log DEBUG "Writing settings file ${settings_file}." + log DEBUG "Writing settings file '${settings_file}'." mkdir -p $(dirname ${settings_file}) 2>/dev/null > ${settings_file} -- 2.6.3

2 8

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network July 2017