network June 2017

network@lists.ipfire.org

2 participants
14 discussions

[PATCH 5/7] lock: refactoring functions
by Jonatan Schlag 21 Jun '17

21 Jun '17

lock_acquire: Refactor function to set the timeout manually and to avoid the sleep of 0,25s when the timeout value is zero. lock_exists: Provides an easier to check if a lock exists Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.device | 2 +- src/functions/functions.lock | 37 +++++++++++++++++++++++++++---------- src/udev/network-hotplug-rename | 2 +- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/functions/functions.device b/src/functions/functions.device index fc88fec..09848e2 100644 --- a/src/functions/functions.device +++ b/src/functions/functions.device @@ -910,7 +910,7 @@ device_auto_configure_smp_affinity() { local device=${1} - if lock_acquire "smp-affinity"; then + if lock_acquire "smp-affinity" 60; then device_set_smp_affinity ${device} auto lock_release "smp-affinity" diff --git a/src/functions/functions.lock b/src/functions/functions.lock index fac86bd..d9c3acf 100644 --- a/src/functions/functions.lock +++ b/src/functions/functions.lock @@ -29,30 +29,47 @@ __lock_path() { fi } -lock_acquire() { +lock_exists() { local name=${1} assert isset name local lockfile=$(__lock_path ${name}) + if [ -e "${lockfile}" ]; then + return ${EXIT_TRUE} + else + return ${EXIT_FALSE} + fi +} + +lock_acquire() { + local name=${1} + assert isset name + # timeout value in seconds - local timeout=120 + local timeout=${2} + + if ! isset timeout; then + timeout=0 + fi + + local lockfile=$(__lock_path ${name}) + timeout=$(( ${timeout} * 4 )) log DEBUG "Acquiring lock '${name}'" - local free="false" - while [ ${timeout} -gt 0 ]; do - if [ ! -e "${lockfile}" ]; then - free="true" - break - fi - + # Wait until lock is available + while [ ${timeout} -gt 0 ] && [ -e "${lockfile}" ]; do timeout=$(( ${timeout} - 1 )) sleep 0.25 done - assert ${free} "Could not acquire lock '${name}'" + # If another lock still exists, we return an error + if [ -e "${lockfile}" ]; then + error "Could not acquire lock '${name}'" + return ${EXIT_ERROR} + fi # Write out pid to the lockfile and make sure that # nobody else can access it. diff --git a/src/udev/network-hotplug-rename b/src/udev/network-hotplug-rename index c56c70d..2d474ef 100644 --- a/src/udev/network-hotplug-rename +++ b/src/udev/network-hotplug-rename @@ -45,7 +45,7 @@ log DEBUG "Called for interface '${INTERFACE}'." device_exists ${INTERFACE} || exit ${EXIT_ERROR} # Acquiring lock for this operation. -lock_acquire ${LOCKFILE} +lock_acquire ${LOCKFILE} 120 # Check if the device is already in use and # prevent the script to touch it in any way. -- 2.6.3

1 2

[PATCH] network check if a zone exist before executing commands
by Jonatan Schlag 21 Jun '17

21 Jun '17

We checked if a zone name was valid so network zone net0 ... fails when theres was no zone net0. net0 is a valid zone name so we jumped into the wrong if part. We now check if a zone exist and when now network zone net0 ... is called when no zone net0 exists we print an error message. This behaviour is similar to network port .., there we do the same thing with port_exists Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network b/src/network index ea7f7d6..20f65e8 100644 --- a/src/network +++ b/src/network @@ -551,7 +551,7 @@ cli_zone() { local action local zone - if zone_name_is_valid ${1}; then + if zone_exists ${1}; then zone=${1} action=${2} shift 2 -- 2.6.3

1 0

[PATCH 1/7] util: add lock/unlock function
by Jonatan Schlag 20 Jun '17

20 Jun '17

This function easily lock or unlock a file. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/functions/functions.util b/src/functions/functions.util index 4b6f956..23e5a4b 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -738,3 +738,17 @@ hex2dec() { dec2hex() { printf "%02x\n" "${1}" } + +lock_file() { + assert [ $# -eq 1 ] + local file=${1} + + touch "${file}.lock" +} + +unlock_file() { + assert [ $# -eq 1 ] + local file=${1} + + rm -f "${file}.lock" +} -- 2.6.3

2 7

[PATCH v3 5/5] color: add colors to zone and ports
by Jonatan Schlag 19 Jun '17

19 Jun '17

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.colors | 194 +++++++++++++++++++++++++++++++++++++++++ src/functions/functions.ports | 8 ++ src/functions/functions.zone | 8 ++ 3 files changed, 210 insertions(+) diff --git a/src/functions/functions.colors b/src/functions/functions.colors index 8d7193c..121d736 100644 --- a/src/functions/functions.colors +++ b/src/functions/functions.colors @@ -73,3 +73,197 @@ MSG_STP_DISCARDING="${CLR_RED_BG}${CLR_WHITE_B} DISCARDING ${CLR_RESET}" MSG_STP_LEARNING="${CLR_YELLOW_BG}${CLR_WHITE_B} LEARNING ${CLR_RESET}" MSG_STP_LISTENING="${CLR_YELLOW_BG}${CLR_WHITE_B} LISTENING ${CLR_RESET}" MSG_STP_BLOCKING="${CLR_RED_BG}${CLR_WHITE_B} BLOCKING ${CLR_RESET}" + +color_cli() { + # Is the cli function to parse the options submitted by a user. + local type=${1} + local name=${2} + local action=${3} + + case ${action} in + set) + local color=${4} + # Check if we get to many arguments + if [ $# -gt 4 ]; then + # We want to print only the 5th and greater argument + shift 4 + error "Too many arguments: $@" + return ${EXIT_ERROR} + fi + color_set ${type} ${name} ${color} + ;; + reset) + # We set the color to white. + # Check if we get to many arguments + shift + if [ $# -gt 3 ]; then + # We want to print only the 4th and greater argument + shift 3 + error "Too many arguments: $@" + return ${EXIT_ERROR} + fi + color_set ${type} ${name} "ffffff" + ;; + *) + error "Invalid argument: ${action}" + ;; + esac + +} + +color_set() { + # Write a given color into the color config file of a zone or port. + assert [ $# -eq 3 ] + + local type=${1} + local name=${2} + local COLOR=${3} + # Check if we get to many arguments + # Check if the color code is valid + if ! color_hex_is_valid ${COLOR}; then + error "Hexadecimal color code '${COLOR}' is not valid" + return ${EXIT_ERROR} + fi + + local file=$(color_format_filename ${type} ${name}) + settings_write ${file} COLOR +} + +color_read() { + # Read a color out of color config file of a zone or port. + # If this is unsuccessful we use white. + local type=${1} + local name=${2} + + local file=$(color_format_filename ${type} ${name}) + + local COLOR + + if ! settings_read ${file} COLOR; then + COLOR="ffffff" + fi + + print "${COLOR}" +} + +color_format_filename() { + # Formats the color config file name. + local type=${1} + local name=${2} + case ${type} in + zone) + echo "$(zone_dir ${name})/color" + ;; + port) + echo "$(port_dir ${name})/color" + ;; + esac +} + +color_hex_is_valid() { + # Check if a color hex is valid. + [[ ${1} =~ ^[0-9a-fA-F]{6}$ ]] +} + +color_hex2rgb() { + # Converts a color hex into rgb values. + local hex=${1} + + assert [ ${#hex} -eq 6 ] + + for (( i = 0; i < 6; i += 2 )); do + hex2dec ${hex:${i}:2} + done | tr '\n' ' ' + + print # newline +} + +_find_nearest_rgb_value() { + # For the calculation of the xterm value the rgb values must be: + # 0; 95; 135; 175; 215; 255; + # this function find the closest value of these 6 numbers for a give rgb number + local rgb=${1} + + local best_value + local best_value_index + + local values=( 0 95 135 175 215 255 ) + local result + local i=0 + + local value + for value in ${values[@]}; do + result=$(( ${value} - ${rgb} )) + result=$(abs ${result}) + + if [ -z ${best_value} ]; then + best_value=${result} + best_value_index=${i} + + # In the first iteration best_value is empty and so set to ${result} + # two lines above. So if statement must use -le because in the first iteration + # is the best_value eqal to result + elif [ ${result} -le ${best_value} ]; then + best_value=${result} + best_value_index=${i} + fi + + (( i++ )) + done + + echo "${best_value_index}" +} + +color_rgb2shell() { + # Converts a rgb value triple into an xterm color code. + assert [ $# -eq 3 ] + + local red=${1} + local green=${2} + local blue=${3} + + local color + for color in red green blue; do + printf -v "${color}" $(_find_nearest_rgb_value ${!color}) + done + + print $(( 16 + 36 * ${red} + 6 * ${green} + ${blue} )) +} + +color_set_shell() { + # Set the shell color which unfourtunately does not work for putty. + local where=${1} + local color=${2} + + local prefix + case "${where}" in + fg) + prefix="\e[38" + ;; + bg) + prefix="\e[48" + ;; + esac + + # Convert color from hex to RGB + local red green blue + read red green blue <<< $(color_hex2rgb ${color}) + + # Set standard shell color + local shell_color=$(color_rgb2shell ${red} ${green} ${blue}) + printf "${prefix};5;${shell_color}m" + + # For shells that support it, we will try to set the RGB color code + case "${TERM}" in + putty*) + # PuTTY is a piece of garbage and does not know + # how to handle colors at all although it has nice + # checkboxes to enable them, but they actually make + # things even worse. So no colors for you Windows + # users. + ;; + *) + printf "${prefix};2;${red};${green};${blue}m" + ;; + esac +} diff --git a/src/functions/functions.ports b/src/functions/functions.ports index c6e45d0..db4e365 100644 --- a/src/functions/functions.ports +++ b/src/functions/functions.ports @@ -422,3 +422,11 @@ ports_lowest_address() { port_identify() { device_identify $@ } + +port_get_color() { + # This function return the color of a port + assert [ $# -eq 1 ] + + local name=${1} + color_read "port" ${name} +} diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 88c81a8..058110d 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1200,3 +1200,11 @@ zone_port_settings_remove() { local path="$(zone_dir "${zone}")/ports/${port}" settings_remove "${path}" } + +zone_get_color() { + # This function return the color of a zone + assert [ $# -eq 1 ] + + local name=${1} + color_read "zone" ${name} +} -- 2.6.3

2 1

[PATCH v2 1/5] ports: Change ports settings file to /etc/network/${port}/settings
by Jonatan Schlag 19 Jun '17

19 Jun '17

The configuration of a port was stored in a file called: /etc/network/${port} This is bad because it is very hard to add further information which belong primary not to the configuration to this file. So we change the settings file to /etc/network/${port}/settings like for the zones. This make it possible to store other configurations like the color in other files in the directory /etc/network/${port}. A workaround to move the config file into the new directory scheme is: port=p1 && mv /etc/network/ports/${port} /etc/network/ports/${port}-save \ && mkdir -p /etc/network/ports/${port} \ && mv /etc/network/ports/${port}-save /etc/network/ports/${port}/settings where port is the name of the port like p1 or p0. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ports | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/functions/functions.ports b/src/functions/functions.ports index 952eef9..c6e45d0 100644 --- a/src/functions/functions.ports +++ b/src/functions/functions.ports @@ -20,7 +20,8 @@ ############################################################################### port_dir() { - echo "${NETWORK_CONFIG_DIR}/ports" + local port="${1}" + echo "${NETWORK_CONFIG_DIR}/ports/${port}" } port_list() { @@ -113,13 +114,13 @@ port_file() { local port="${1}" assert isset port - echo "$(port_dir)/${port}" + echo "$(port_dir ${port})/settings" } port_exists() { local port=${1} - [ -f "${NETWORK_CONFIG_DIR}/ports/${port}" ] + [ -d "${NETWORK_CONFIG_DIR}/ports/${port}" ] } port_get_hook() { @@ -207,7 +208,7 @@ port_destroy() { port_remove "${port}" - rm -f $(port_file ${port}) + rm -rf $(port_dir ${port}) } port_create() { -- 2.6.3

2 5

[PATCH 1/6] util: new function abs
by Jonatan Schlag 14 Jun '17

14 Jun '17

This function return the absolute value of a given number. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/functions/functions.util b/src/functions/functions.util index 4b6f956..699026d 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -268,6 +268,16 @@ uuid() { echo $(</proc/sys/kernel/random/uuid) } +abs() { + local val=${1} + + if [ ${val} -lt 0 ]; then + (( val *= -1 )) + fi + + echo ${val} +} + rand() { local uuid="$(uuid)" echo "${uuid//-/}" -- 2.6.3

2 11

[PATCH v2] util: add function mtu_is_valid
by Jonatan Schlag 07 Jun '17

07 Jun '17

This function checks if an mtu is valid for a given IP protocol. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.util | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/functions/functions.util b/src/functions/functions.util index 4b6f956..b7e35c9 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -321,6 +321,24 @@ isipaddress() { ip_is_valid ${addr} } +mtu_is_valid() { + local proto=${1} + local mtu=${2} + + case ${proto} in + ipv4) + [ ${mtu} -ge 576 ] && [ ${mtu} -le 9000 ] + ;; + ipv6) + [ ${mtu} -ge 1280 ] && [ ${mtu} -le 9000 ] + ;; + *) + error "${proto} is not a valid proto" + return ${EXIT_ERROR} + ;; + esac +} + backtrace() { local start=1 -- 2.6.3

1 0

[PATCH] improve autocompletion of network zone new
by Jonatan Schlag 07 Jun '17

07 Jun '17

Fixes: #11386 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/bash-completion/network | 22 ++++++++++++++++++++-- src/functions/functions.zone | 20 ++++++++++++++++++++ src/network | 6 ++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/bash-completion/network b/src/bash-completion/network index 6f63f1b..fd74027 100644 --- a/src/bash-completion/network +++ b/src/bash-completion/network @@ -299,11 +299,11 @@ _network_zone() { return 0 fi + local args="${words[@]:1}" case "${cmd}" in new) - # TODO - return 0 + _network_zone_new ${args} ;; destroy) _network_complete_zones @@ -316,6 +316,24 @@ _network_zone() { esac } +_network_zone_new() { + local words=( $@ ) + local cmd=${words[@]:0:1} + + # Suggest useful zone names + if [[ -z "${cmd}" ]]; then + local commands="$(network raw list-next-free-zones)" + COMPREPLY=( $(compgen -W "${commands}" -- "${cur}") ) + + # If a valid zone name was entered, we can move on + elif network raw zone-name-is-valid ${cmd}; then + local args="${words[@]:1}" + _network_complete_hooks zone ${args} + fi + + return 0 +} + _network_zone_subcommand() { local zone="${1}" shift diff --git a/src/functions/functions.zone b/src/functions/functions.zone index c727506..88c81a8 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -629,6 +629,26 @@ zones_get_all() { done } +zones_get_next_free() { + # This function return the next free zones. + # Example net0 upl0 upl1 are configured so the next free zones are: + # net1 upl2 + local i + local zone_name + for zone_name in ${VALID_ZONES}; do + i=0 + + while true; do + local zone="${zone_name}${i}" + if ! zone_exists ${zone}; then + echo "${zone}" + break + fi + i=$(( i + 1 )) + done + done +} + zones_get_local() { local zone for zone in $(zones_get_all); do diff --git a/src/network b/src/network index e65eb6b..34faa36 100644 --- a/src/network +++ b/src/network @@ -1320,6 +1320,12 @@ cli_raw() { list-zones) zones_get_all ;; + list-next-free-zones) + zones_get_next_free + ;; + zone-name-is-valid) + zone_name_is_valid $@ + ;; *) error "No such command: ${cmd}" exit ${EXIT_ERROR} -- 2.6.3

1 0

[PATCH 2/3] route: rename route to route static
by Jonatan Schlag 07 Jun '17

07 Jun '17

Fixes: #11374 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/bash-completion/network | 19 +++++++++++++++++++ src/network | 26 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/bash-completion/network b/src/bash-completion/network index 27272e9..ae358bd 100644 --- a/src/bash-completion/network +++ b/src/bash-completion/network @@ -258,6 +258,25 @@ _network_port_subcommand() { _network_route() { local words=( $@ ) + local commands="static" + local cmd="$(_network_find_on_cmdline "${commands}")" + if [[ -z "${cmd}" ]]; then + COMPREPLY=( $(compgen -W "${commands}" -- "${cur}") ) + return 0 + fi + + case "${cmd}" in + static) + local args="${words[@]}" + _network_route_static ${args} + ;; + esac + +} + +_network_route_static() { + local words=( $@ ) + local commands="add list remove reload" local cmd="$(_network_find_on_cmdline "${commands}")" if [[ -z "${cmd}" ]]; then diff --git a/src/network b/src/network index fbb7e9a..4d5955f 100644 --- a/src/network +++ b/src/network @@ -752,6 +752,32 @@ cli_route() { shift case "${action}" in + static) + cli_route_static $@ + ;; + *) + error "Unrecognized action: ${action}" + cli_run_help network route + + exit ${EXIT_ERROR} + ;; + esac + + exit ${EXIT_OK} + + +} + +cli_route_static() { + if cli_help_requested $@; then + cli_show_man network-route-static + exit ${EXIT_OK} + fi + + local action=${1} + shift + + case "${action}" in # Add a new route. add) route_add $@ -- 2.6.3

1 1

[PATCH] route: add new cli command reload
by Jonatan Schlag 04 Jun '17

04 Jun '17

This new command just call route_apply. It provide a nice way to take changes of the config file into affect. Also it helps when the routes are not applied. This should not happen, but when this command is better then network restart. Fixes: 11367 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/bash-completion/network | 2 +- src/network | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bash-completion/network b/src/bash-completion/network index 6f63f1b..27272e9 100644 --- a/src/bash-completion/network +++ b/src/bash-completion/network @@ -258,7 +258,7 @@ _network_port_subcommand() { _network_route() { local words=( $@ ) - local commands="add list remove" + local commands="add list remove reload" local cmd="$(_network_find_on_cmdline "${commands}")" if [[ -z "${cmd}" ]]; then COMPREPLY=( $(compgen -W "${commands}" -- "${cur}") ) diff --git a/src/network b/src/network index e65eb6b..fbb7e9a 100644 --- a/src/network +++ b/src/network @@ -765,6 +765,10 @@ cli_route() { route_list $@ return ${EXIT_OK} ;; + # Reload all routes. + reload) + route_apply $@ + ;; *) error "Unrecognized action: ${action}" cli_run_help network route -- 2.6.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network June 2017