network July 2017

network@lists.ipfire.org

2 participants
36 discussions

[PATCH] config hook: prevent two hooks with the same settings
by Jonatan Schlag 14 Jul '17

14 Jul '17

A ipv4-static config with the same IPv4 address twice is senseless. A new function zone_config_check_same_setting is introduced. The function provides an easy way to check if a config of the given hook has the same value for a given key. We can now check inside hook_new if an ipv4-static or ipv6-static config with the same value exist and break with an error. Fixes: #11418 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 33 +++++++++++++++++++++++++++++++++ src/hooks/configs/ipv4-static | 5 +++++ src/hooks/configs/ipv6-static | 5 +++++ 3 files changed, 43 insertions(+) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index d121225..768bb9f 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1024,6 +1024,39 @@ zone_config_get_new_id() { done } +zone_config_check_same_setting() { + # This functions checks if a config hook + # with the same setting is already configured for this zone. + # Returns True when yes and False when no. + + assert [ $# -eq 4 ] + + local zone=${1} + local hook=${2} + local key=${3} + local value=${4} + + # 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 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}" + # Check if the value of the config and the passed value are eqal + if [[ "${value}" == "${!key}" ]]; then + return ${EXIT_TRUE} + fi + done + + return ${EXIT_FALSE} +} + zone_config_get_hook() { assert [ $# -eq 2 ] diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index c395200..9454282 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -102,6 +102,11 @@ hook_new() { exit ${EXIT_CONF_ERROR} fi + if zone_config_check_same_setting "${zone}" "ipv4-static" "ADDRESS" "${ADDRESS}"; then + error "An ipv4-static config with the same IPv4 address is already configured" + exit ${EXIT_CONF_ERROR} + fi + if ! isset GATEWAY && zone_is_nonlocal "${zone}"; then warning "You did not configure a gateway for a non-local zone" fi diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index f43ef7e..b0f6537 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -59,6 +59,11 @@ hook_new() { GATEWAY=$(ipv6_format "${GATEWAY}") fi + if zone_config_check_same_setting "${zone}" "ipv6-static" "ADDRESS" "${ADDRESS}"; then + error "An ipv6-static config with the same IPv6 address is already configured" + exit ${EXIT_CONF_ERROR} + fi + zone_config_settings_write "${zone}" "${HOOK}" exit ${EXIT_OK} -- 2.6.3

2 2

[PATCH v2 1/2] zone: new function zone_config_settings_destroy
by Jonatan Schlag 14 Jul '17

14 Jul '17

Similar to zone_config_settings_write and zone_config_settings_read this function provides an easy way to delete a config file. 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 acf68f5..44237cd 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1272,6 +1272,24 @@ zone_config_settings_write() { settings_write "${path}" ${args} } +zone_config_settings_destroy() { + # This function deletes the config file for a given zone and config + assert [ $# -ge 2 ] + local zone="${1}" + local config="${2}" + + local path="$(zone_dir "${zone}")/configs/${config}" + + # Check if path is valid + if [ ! -f ${path} ]; then + log ERROR "Path: '${path}' is not valid" + return ${EXIT_ERROR} + fi + + log DEBUG "Deleting config file ${path}" + rm -f "${path}" + +} zone_port_settings_read() { assert [ $# -ge 2 ] -- 2.6.3

1 1

[PATCH 1/2] zone: new function zone_config_settings_destroy
by Jonatan Schlag 12 Jul '17

12 Jul '17

Similar to zone_config_settings_write and zone_config_settings_read this function provides an easy way to delete a config file. 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 d121225..0dd4fde 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1248,6 +1248,24 @@ zone_config_settings_write() { settings_write "${path}" ${args} } +zone_config_settings_destroy() { + # This function deletes the config file for a given zone and config + assert [ $# -ge 2 ] + local zone="${1}" + local config="${2}" + + local path="$(zone_dir "${zone}")/configs/${config}" + + # Check if path is valid + if [ ! -f ${path} ]; then + log ERROR "Path: '${path}' is not valid" + return ${EXIT_ERROR} + fi + + log DEBUG "Deleting config file ${path}" + rm -f "${path}" + +} zone_port_settings_read() { assert [ $# -ge 2 ] -- 2.6.3

2 2

[PATCH] zone: make edit syntax clear
by Jonatan Schlag 11 Jul '17

11 Jul '17

Fixes: #11422 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index ff6d945..acf68f5 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -557,9 +557,6 @@ zone_config() { log ERROR "${id} is not a valid id" fi ;; - edit) - zone_config_edit "${zone}" "$@" - ;; list) zone_config_list "${zone}" "$@" ;; -- 2.6.3

1 0

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

11 Jul '17

Fixes: #11404 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 3 +- src/hooks/configs/dhcp | 190 ++++++++++++++++++++++++++++++++++++++++++++ src/hooks/configs/ipv4-dhcp | 122 ---------------------------- src/hooks/configs/ipv6-dhcp | 100 ----------------------- 4 files changed, 191 insertions(+), 224 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/Makefile.am b/Makefile.am index 9124288..e2800d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -196,10 +196,9 @@ INSTALL_EXEC_HOOKS += bridge-stp-install-hook UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook dist_hooks_configs_SCRIPTS = \ - src/hooks/configs/ipv4-dhcp \ + src/hooks/configs/dhcp \ src/hooks/configs/ipv4-static \ src/hooks/configs/ipv6-auto \ - src/hooks/configs/ipv6-dhcp \ src/hooks/configs/ipv6-static \ src/hooks/configs/pppoe-server diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp new file mode 100644 index 0000000..5ac01b6 --- /dev/null +++ b/src/hooks/configs/dhcp @@ -0,0 +1,190 @@ +#!/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_IPV6 ENABLE_IPV4" + +# Default settings. +DELAY=0 +ENABLE_IPV6="on" +ENABLE_IPV4="on" + +hook_check_config_settings() { + assert isset DELAY + assert isinteger DELAY + assert isset ENABLE_IPV6 + assert isbool ENABLE_IPV6 + assert isset ENABLE_IPV4 + assert isbool ENABLE_IPV4 +} + +hook_parse_cmdline() { + while [ $# -gt 0 ]; do + case "${1}" in + --delay=*) + DELAY="$(cli_get_val "${1}")" + ;; + --enable-ipv6) + ENABLE_IPV6="on" + ;; + --disable-ipv6) + ENABLE_IPV6="off" + ;; + --enable-ipv4) + ENABLE_IPV4="on" + ;; + --disable-ipv4) + ENABLE_IPV4="off" + ;; + *) + 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 + + if ! hook_parse_cmdline $@; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi + + # Check if the user disabled ipv4 and ipv6 + + if ! enabled ENABLE_IPV6 && ! enabled ENABLE_IPV4; then + log ERROR "You disabled IPv6 and IPv4. At least one must be enabled" + 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 + + zone_config_settings_read "${zone}" "${config}" + + # Start dhclient for IPv6 on this zone if enabled. + if enabled ENABLE_IPV6; then + dhclient_start ${zone} ipv6 + fi + + # Start dhclient for IPv4 on this zone if enabled. + if enabled ENABLE_IPV4; then + dhclient_start ${zone} ipv4 + 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 IPv6 on this zone. + dhclient_stop ${zone} ipv6 + + # 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 || 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] dhcp: merge hooks ipv4-dhcp and ipv6-dhcp
by Jonatan Schlag 11 Jul '17

11 Jul '17

We use on and off instead of true and false to keep the config files more humand readable. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 3 +- src/hooks/configs/dhcp | 223 ++++++++++++++++++++++++++++++++++++++++++++ src/hooks/configs/ipv4-dhcp | 122 ------------------------ src/hooks/configs/ipv6-dhcp | 100 -------------------- 4 files changed, 224 insertions(+), 224 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/Makefile.am b/Makefile.am index 32e7166..2bbc537 100644 --- a/Makefile.am +++ b/Makefile.am @@ -196,10 +196,9 @@ INSTALL_EXEC_HOOKS += bridge-stp-install-hook UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook dist_hooks_configs_SCRIPTS = \ - src/hooks/configs/ipv4-dhcp \ + src/hooks/configs/dhcp \ src/hooks/configs/ipv4-static \ src/hooks/configs/ipv6-auto \ - src/hooks/configs/ipv6-dhcp \ src/hooks/configs/ipv6-static \ src/hooks/configs/pppoe-server diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp new file mode 100644 index 0000000..4aca87f --- /dev/null +++ b/src/hooks/configs/dhcp @@ -0,0 +1,223 @@ +#!/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() { + # These variables are there to check if a user tries to disable + # and enable ipv6 or ipv4 at the same time. I would not chrash + # but things could happen the user did not expect and + # thats why we check for this mistake + local ipv6_passed + local ipv4_passed + ipv6_passed=false + ipv4_passed=false + + while [ $# -gt 0 ]; do + case "${1}" in + --delay=*) + DELAY="$(cli_get_val "${1}")" + ;; + --enable-ipv6) + ENABLE_IPV6="on" + if ${ipv6_passed}; then + # --disable-ipv6 was passed earlier + log ERROR "You cannot disable and enable ipv6 at the same time" + return ${EXIT_ERROR} + fi + ipv6_passed=true + ;; + --disable-ipv6) + ENABLE_IPV6="off" + if ${ipv6_passed}; then + # --enable-ipv6 was passed earlier + log ERROR "You cannot disable and enable ipv6 at the same time" + return ${EXIT_ERROR} + fi + ipv6_passed=true + ;; + --enable-ipv4) + ENABLE_IPV4="on" + if ${ipv4_passed}; then + # --disable-ipv4 was passed earlier + log ERROR "You cannot disable and enable ipv4 at the same time" + return ${EXIT_ERROR} + fi + ipv4_passed=true + ;; + --disable-ipv4) + ENABLE_IPV4="off" + if ${ipv4_passed}; then + # --enable-ipv4 was passed earlier + log ERROR "You cannot disable and enable ipv4 at the same time" + return ${EXIT_ERROR} + fi + ipv4_passed=true + ;; + *) + 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 + + if ! hook_parse_cmdline $@; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi + + # Check if the user disabled ipv4 and ipv6 + + if ! enabled ENABLE_IPV6 && ! enabled ENABLE_IPV4; then + log ERROR "You disabled IPv6 and IPv4. At least one must be enabled" + 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 + + zone_config_settings_read "${zone}" "${config}" + + # Start dhclient for IPv6 on this zone if enabled. + if enabled ENABLE_IPV6; then + dhclient_start ${zone} ipv6 + fi + + # Start dhclient for IPv4 on this zone if enabled. + if enabled ENABLE_IPV4; then + dhclient_start ${zone} ipv4 + 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 IPv6 on this zone. + dhclient_stop ${zone} ipv6 + + # 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 || 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

2 1

[PATCH 1/2] man: add color documentation
by Jonatan Schlag 10 Jul '17

10 Jul '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 1 + man/network-color.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++ man/network-port.xml | 17 ++++++++++ man/network-zone.xml | 16 +++++++++ 4 files changed, 125 insertions(+) create mode 100644 man/network-color.xml diff --git a/Makefile.am b/Makefile.am index 32e7166..08050d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,6 +333,7 @@ INSTALL_DIRS += \ MANPAGES = \ man/firewall-settings.8 \ man/network.8 \ + man/network-color.8 \ man/network-device.8 \ man/network-dhcp.8 \ man/network-dns-server.8 \ diff --git a/man/network-color.xml b/man/network-color.xml new file mode 100644 index 0000000..d8fce73 --- /dev/null +++ b/man/network-color.xml @@ -0,0 +1,91 @@ +<?xml version="1.0"?> +<!DOCTYPE refentry PUBLIC "-//OASIS/DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<refentry id="network-color"> + <refentryinfo> + <title>networ-color</title> + <productname>network</productname> + + <authorgroup> + <author> + <contrib>Developer</contrib> + <firstname>Jonatan</firstname> + <surname>Schlag</surname> + <email>jonatan.schlag(a)ipfire.org</email> + </author> + </authorgroup> + </refentryinfo> + + <refmeta> + <refentrytitle>network-color</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> + <refname>network-color</refname> + <refpurpose>Network Configuration Control Program</refpurpose> + </refnamediv> + + <refsect1> + <title>Description</title> + + <para> + The <command>color</command> helps to manage colors for zone and ports. + The color is shown in the webinterface and on the status page of a port or zone. + and make it much easier to identify a port or a zone. + </para> + </refsect1> + + <refsect1> + <title>Commands</title> + + <para> + The following commands are understood: + </para> + + <variablelist> + <varlistentry> + <term> + <command>set <replaceable>hex-color-value</replaceable></command> + </term> + + <listitem> + <para> + The color of a zone or port are set with the <command>set</command> command. + It is always required to pass a valid color hex value like 880400. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <command>reset</command> + </term> + + <listitem> + <para> + This reset the color of a zone or port to white. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>See Also</title> + + <para> + <citerefentry> + <refentrytitle>network</refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>network-zone</refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>network-port</refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry> + </para> + </refsect1> +</refentry> diff --git a/man/network-port.xml b/man/network-port.xml index 181bd8c..92d35d8 100644 --- a/man/network-port.xml +++ b/man/network-port.xml @@ -147,6 +147,23 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <command><replaceable>PORT</replaceable> color</command> + </term> + + <listitem> + <para> + With this command you can set a color for a port. + See + <citerefentry> + <refentrytitle>network-color</refentrytitle> + <manvolnum>8</manvolnum>, + </citerefentry> + for more information. + </para> + </listitem> + </varlistentry> <varlistentry> <term> diff --git a/man/network-zone.xml b/man/network-zone.xml index cd7017a..817ad26 100644 --- a/man/network-zone.xml +++ b/man/network-zone.xml @@ -164,7 +164,23 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <command><replaceable>ZONE</replaceable> color</command> + </term> + <listitem> + <para> + This command make is possible to set a color for a zone. + See + <citerefentry> + <refentrytitle>network-color</refentrytitle> + <manvolnum>8</manvolnum>, + </citerefentry> + for more information. + </para> + </listitem> + </varlistentry> <varlistentry> <term> <command><replaceable>ZONE</replaceable> identify</command> -- 2.6.3

1 1

[PATCH] zone: add new command config list
by Jonatan Schlag 10 Jul '17

10 Jul '17

With the new command network <zone> config list a user can get all configured configs with id and hook. Fixes: #11407 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index d121225..ff6d945 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -560,6 +560,9 @@ zone_config() { edit) zone_config_edit "${zone}" "$@" ;; + list) + zone_config_list "${zone}" "$@" + ;; *) # Check is we get a valid id # TODO This could be also a valid hid @@ -613,6 +616,30 @@ zone_config_edit() { zone_config_cmd "edit" "$@" } +zone_config_list() { + # This function list in an nice way all configs of a zone + local zone=${1} + assert isset zone + + # Print a nice header + local format="%-3s %-20s" + print "${format}" "ID" "HOOK" + + local config + local hook + local id + + # Print for all config: + # id and hook + # TODO: Add hids here + for config in $(zone_configs_list "${zone}"); do + id=${config##*.} + hook=$(zone_config_get_hook "${zone}" "${config}") + assert isset hook + print "${format}" "${id}" "${hook}" + done +} + zone_config_show() { zone_config_cmd "show" "$@" } -- 2.6.3

1 0

[PATCH v2] 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> --- Makefile.am | 5 +- src/hooks/configs/dhcp | 188 ++++++++++++++++++++++++++++++++++++++++++++ src/hooks/configs/ipv4-dhcp | 122 ---------------------------- src/hooks/configs/ipv6-dhcp | 100 ----------------------- 4 files changed, 190 insertions(+), 225 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/Makefile.am b/Makefile.am index 32e7166..3a42a03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -196,12 +196,11 @@ INSTALL_EXEC_HOOKS += bridge-stp-install-hook UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook dist_hooks_configs_SCRIPTS = \ - src/hooks/configs/ipv4-dhcp \ src/hooks/configs/ipv4-static \ src/hooks/configs/ipv6-auto \ - src/hooks/configs/ipv6-dhcp \ src/hooks/configs/ipv6-static \ - src/hooks/configs/pppoe-server + src/hooks/configs/pppoe-server \ + src/hooks/configs/dhcp dist_hooks_ports_SCRIPTS = \ src/hooks/ports/batman-adv \ 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

2 1

[PATCH] util: isbool accept now also true and false
by Jonatan Schlag 06 Jul '17

06 Jul '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/functions.util b/src/functions/functions.util index 37feb73..0a9b3d6 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -310,7 +310,7 @@ isoneof() { isbool() { local var=${1} - isoneof ${var} 0 1 no yes on off + isoneof ${var} 0 1 no yes on off true false } isinteger() { -- 2.6.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network July 2017