network

network@lists.ipfire.org

108 discussions

[PATCH 1/4] zone: add new function zone_config_list_ids
by Jonatan Schlag 25 Jul '17

25 Jul '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 91ce629..bba1705 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -641,6 +641,21 @@ zone_config_show() { zone_config_cmd "show" "$@" } +# Returns a list of all used ids for a zone +zone_config_list_ids() { + assert [ $# -eq 1 ] + + local zone=${1} + local config + local ids + + for config in $(zone_configs_list ${zone}); do + list_append ids "$(config_get_id_from_config ${config})" + done + + echo ${ids} +} + zone_show() { local zone=${1} -- 2.6.3

2 4

[PATCH 1/3] header-zone: refactor hook_edit nad hook_new
by Jonatan Schlag 19 Jul '17

19 Jul '17

We now return error codes and break when something important goes wrong. because of that, we have to split hook_new and hook_edit. When zone_settins-read fails in hook_edit we cannot go but it would every time we would call it in hook_new. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/header-zone | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/header-zone b/src/header-zone index 98b0ce7..219b0d6 100644 --- a/src/header-zone +++ b/src/header-zone @@ -34,17 +34,39 @@ hook_new() { assert isset zone shift - zone_settings_read "${zone}" - - hook_parse_cmdline $@ + if ! hook_parse_cmdline $@; then + return ${EXIT_ERROR} + fi - zone_settings_write "${zone}" + if ! zone_settings_write "${zone}"; then + log ERROR "Could not write settings for zone ${zone}" + return ${EXIT_ERROR} + fi exit ${EXIT_OK} } hook_edit() { - hook_new $@ + local zone="${1}" + assert isset zone + shift + + if ! zone_settings_read "${zone}"; then + log ERROR "Could not read settings for zone ${zone}" + return ${EXIT_ERROR} + fi + + if ! hook_parse_cmdline $@; then + return ${EXIT_ERROR} + fi + + if ! zone_settings_write "${zone}"; then + log ERROR "Could not write settings for zone ${zone}" + return ${EXIT_ERROR} + fi + + exit ${EXIT_OK} + } hook_remove() { -- 2.6.3

1 2

[PATCH] list: fix a bug
by Jonatan Schlag 19 Jul '17

19 Jul '17

When the list is called "list" we have a problem because ${list}="list" and ${!list}="list" This creates effects nobody wants and which are also not so easy to understand. To avoid such problems in the future we now throw an assertation when the list is called list. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.list | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/functions/functions.list b/src/functions/functions.list index 26ba6c3..ff73b04 100644 --- a/src/functions/functions.list +++ b/src/functions/functions.list @@ -25,6 +25,7 @@ list_append() { local list=${1} assert isset list + assert [ ${list} != "list" ] shift local arg @@ -40,6 +41,7 @@ list_append_one() { shift assert isset list + assert [ ${list} != "list" ] if [ -n "${!list}" ]; then printf -v ${list} -- "${!list} $@" @@ -53,6 +55,7 @@ list_remove() { shift assert isset list + assert [ ${list} != "list" ] local _list k for k in ${!list}; do @@ -127,6 +130,10 @@ list_join() { local list=${1} local delim=${2} + assert isset list + assert isset delim + assert [ ${list} != "list" ] + local ret printf -v ret "${delim}%s" ${!list} -- 2.6.3

1 0

Split the cmd line parsing in the config hooks in seperated functions
by Jonatan Schlag 19 Jul '17

19 Jul '17

Hi the following patches just do what is stated in the subject. If anything else could be improved (I know some code which is touched here and could be improved) i would like to do this when this patchset is merged.

1 4

[PATCH] config: improve config_get_id_from_config and config_get_hook_from_config
by Jonatan Schlag 19 Jul '17

19 Jul '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/functions/functions.config b/src/functions/functions.config index e11a1c2..6a148c7 100644 --- a/src/functions/functions.config +++ b/src/functions/functions.config @@ -58,8 +58,7 @@ config_get_id_from_config() { assert [ $# -eq 1 ] local config=${1} - local hook=$(config_get_hook_from_config ${config}) - echo "${config//"${hook}."/}" + echo "${config##*.}" } @@ -69,5 +68,5 @@ config_get_hook_from_config() { assert [ $# -eq 1 ] local config=${1} - echo "${config//.*[[:digit:]]/}" + echo "${config%%.*[[:digit:]]}" } -- 2.6.3

1 0

Add copy before the vpn security policies
by Jonatan Schlag 19 Jul '17

19 Jul '17

just for clarification why I send this patch alone. I think it is easier to get this patch merged before we talk about the vpn security policies. Make my branches easier and the emails shorter. This method works fine and results in an error every time something goes wrong. The message should be enough o encounter what the problem is. So hopefully this one is ok :-) Jonatan

1 1

[PATCH v3 1/5] util: refactor fwrite
by Jonatan Schlag 17 Jul '17

17 Jul '17

This functions now: - return an error when the destination is a directory - creates the destination if the destination not exist Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/functions/functions.util b/src/functions/functions.util index 381208c..dd223f9 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -179,12 +179,21 @@ fwrite() { assert isset file shift - if [ ! -w "${file}" ]; then - log ERROR "${file}: No such file" + if [ -d "${file}" ]; then + log ERROR "${file} is a directory" return ${EXIT_ERROR} fi - print "%s" "$@" >> ${file} 2>/dev/null + if [ -f "${file}" ]; then + if [ -w "${file}" ]; then + print "%s" "$@" >> ${file} 2>/dev/null + else + log ERROR "${file} is not writeable" + return ${EXIT_ERROR} + fi + else + print "%s" "$@" >> ${file} 2>/dev/null + fi } make_parent_dir() { -- 2.6.3

2 7

[PATCH 1/5] zone: fix zone_config()
by Jonatan Schlag 17 Jul '17

17 Jul '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.zone | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index acf68f5..11a8dc2 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -565,9 +565,9 @@ zone_config() { # TODO This could be also a valid hid local id=${cmd} - if zone_config_id_is valid ${zone} ${id} && [[ ${1} == "edit" ]]; then + if zone_config_id_is_valid ${zone} ${id} && [[ ${1} == "edit" ]]; then shift 1 - zone_config_edit "${zone}" "${id}""$@" + zone_config_edit "${zone}" "${id}" "$@" else error "Unrecognized argument: ${cmd}" cli_usage root-zone-config-subcommands -- 2.6.3

2 8

[PATCH v2 1/5] util: refactor fwrite
by Jonatan Schlag 17 Jul '17

17 Jul '17

This functions now: - return an error when the destination is a directory - creates the destination if the destination not exist Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/functions/functions.util b/src/functions/functions.util index 381208c..3bcd00f 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -179,12 +179,26 @@ fwrite() { assert isset file shift - if [ ! -w "${file}" ]; then - log ERROR "${file}: No such file" + if [ -d "${file}" ]; then + log ERROR "${file} is a directory" return ${EXIT_ERROR} fi - print "%s" "$@" >> ${file} 2>/dev/null + if [ -f "${file}" ]; then + if [ -w "${file}" ]; then + print "%s" "$@" >> ${file} 2>/dev/null + else + log ERROR "${file} is not writeable" + return ${EXIT_ERROR} + fi + else + if ! touch "${file}"; then + log ERROR "Could not touch ${file}" + return ${EXIT_ERROR} + fi + + print "%s" "$@" >> ${file} 2>/dev/null + fi } make_parent_dir() { -- 2.6.3

1 4

[PATCH v2 1/4] util: add copy function
by Jonatan Schlag 15 Jul '17

15 Jul '17

Adds a nice function to copy simple configuration files. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/functions/functions.util b/src/functions/functions.util index 0a9b3d6..a6c98c6 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -766,3 +766,29 @@ hex2dec() { dec2hex() { printf "%02x\n" "${1}" } + + +copy() { + # This function just copy to config files + assert [ $# -eq 2 ] + src=${1} + dst=${2} + + local data=$(fread ${src}) + if [ ! $? -eq 0 ]; then + log ERROR "Could not read data from ${src}" + return ${EXIT_ERROR} + fi + + if [ -e ${dst} ]; then + log ERROR "Destination ${dst} already exist" + return ${EXIT_ERROR} + else + touch ${dst} + fi + + if ! fwrite ${dst} "${data}"; then + log ERROR "Could not write data to ${dst}" + return ${EXIT_ERROR} + fi +} -- 2.6.3

2 5

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network