network

network@lists.ipfire.org

108 discussions

[network] [PATCH 1/4] ipv4: new function ipv4_net_is_valid
by Jonatan Schlag 03 Jun '17

03 Jun '17

This function checks if a given network is valid IPv4 network Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ipv4 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/functions/functions.ipv4 b/src/functions/functions.ipv4 index f63c2b7..e893f5e 100644 --- a/src/functions/functions.ipv4 +++ b/src/functions/functions.ipv4 @@ -51,6 +51,15 @@ ipv4_prefix_is_valid() { return ${EXIT_TRUE} } +ipv4_net_is_valid() { + local net="${1}" + + local prefix="$(ip_get_prefix "${net}")" + local addr="$(ip_split_prefix "${net}")" + + ipv4_prefix_is_valid "${prefix}" && ipv4_is_valid "${addr}" +} + ipv4_netmask_is_valid() { local netmask="${1}" -- 2.6.3

2 4

[network] [PATCH] ip: rename ip_is_network to ip_net_is_valid
by Jonatan Schlag 02 Jun '17

02 Jun '17

We rename this function to state clear what the function is actually doing. The function checks if a network is valid and not if something is a network or not. Fixes: 11357 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 2 +- src/functions/functions.ip | 2 +- src/functions/functions.route | 8 ++++---- test/functions/ip/ip_is_network | 27 --------------------------- test/functions/ip/ip_net_is_valid | 27 +++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 33 deletions(-) delete mode 100755 test/functions/ip/ip_is_network create mode 100755 test/functions/ip/ip_net_is_valid diff --git a/Makefile.am b/Makefile.am index acf5a71..7a28bb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,7 +445,7 @@ TESTS = \ test/load-library \ test/functions/ip/ip_detect_protocol \ test/functions/ip/ip_get_prefix \ - test/functions/ip/ip_is_network \ + test/functions/ip/ip_net_is_valid \ test/functions/ip/ip_is_valid \ test/functions/ip/ip_network_is_subnet_of \ test/functions/ip/ip_prefix_is_valid \ diff --git a/src/functions/functions.ip b/src/functions/functions.ip index 97750e3..ec108ac 100644 --- a/src/functions/functions.ip +++ b/src/functions/functions.ip @@ -79,7 +79,7 @@ ip_is_valid() { return ${EXIT_FALSE} } -ip_is_network() { +ip_net_is_valid() { local network=${1} assert isset network diff --git a/src/functions/functions.route b/src/functions/functions.route index 1b6369e..86328a0 100644 --- a/src/functions/functions.route +++ b/src/functions/functions.route @@ -56,7 +56,7 @@ route_add() { assert isset network - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi @@ -154,7 +154,7 @@ route_remove() { for _network in $@; do # Validate input - if ! ip_is_network ${_network} && ! ip_is_valid ${_network}; then + if ! ip_net_is_valid ${_network} && ! ip_is_valid ${_network}; then error "Invalid IP address or network: ${_network}" error=${EXIT_ERROR} continue @@ -296,7 +296,7 @@ route_parse_line() { isset network || return ${EXIT_ERROR} # Is network or IP valid? - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi @@ -408,7 +408,7 @@ route_entry_add() { assert isset network - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi diff --git a/test/functions/ip/ip_is_network b/test/functions/ip/ip_is_network deleted file mode 100755 index 9e9a546..0000000 --- a/test/functions/ip/ip_is_network +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. ${functions} - -. ${testdir}/constants.sh - -failed=0 - -for network in ${VALID_NETWORKS[@]}; do - if ip_is_network ${network}; then - echo "OK: network: ${network} is valid" - else - echo "ERROR: network ${network} is invalid" - failed=1 - fi -done - -for network in ${INVALID_NETWORKS[@]}; do - if ! ip_is_network ${network}; then - echo "OK: network: ${network} is invalid" - else - echo "ERROR: network: ${network} is valid" - failed=1 - fi -done - -exit ${failed} diff --git a/test/functions/ip/ip_net_is_valid b/test/functions/ip/ip_net_is_valid new file mode 100755 index 0000000..4db59e8 --- /dev/null +++ b/test/functions/ip/ip_net_is_valid @@ -0,0 +1,27 @@ +#!/bin/bash + +. ${functions} + +. ${testdir}/constants.sh + +failed=0 + +for network in ${VALID_NETWORKS[@]}; do + if ip_net_is_valid ${network}; then + echo "OK: network: ${network} is valid" + else + echo "ERROR: network ${network} is invalid" + failed=1 + fi +done + +for network in ${INVALID_NETWORKS[@]}; do + if ! ip_net_is_valid ${network}; then + echo "OK: network: ${network} is invalid" + else + echo "ERROR: network: ${network} is valid" + failed=1 + fi +done + +exit ${failed} -- 2.6.3

1 0

[network] [PATCH] man: update the pppoe zone documentation
by Jonatan Schlag 02 Jun '17

02 Jun '17

Fixes: #11375 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- man/network-zone-pppoe.xml | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/man/network-zone-pppoe.xml b/man/network-zone-pppoe.xml index e010676..36c4d0e 100644 --- a/man/network-zone-pppoe.xml +++ b/man/network-zone-pppoe.xml @@ -49,21 +49,6 @@ </para> <variablelist> - <varlistentry> - <term> - <option>--port=<replaceable>PORT</replaceable></option> - </term> - - <listitem> - <para> - This options sets the port, pppd is using to connect to - the modem. - </para> - <para> - This may be a normal ethernet or vlan interface. - </para> - </listitem> - </varlistentry> <varlistentry> <term> @@ -157,6 +142,30 @@ </para> </listitem> </varlistentry> + + <varlistentry> + <term> + <option>--ipv6=[<emphasis>on</emphasis>|off]</option> + </term> + + <listitem> + <para> + By this option, you may enable or disable IPv6 + </para> </listitem> + </varlistentry> + + <varlistentry> + <term> + <option>--prefix-delegation=[<emphasis>on</emphasis>|off]</option> + </term> + + <listitem> + <para> + By this option, you may enable or disable the delegation through your provider of one IPv6 prefix to your system. + </para> + </listitem> + </varlistentry> + </variablelist> </refsect1> -- 2.6.3

1 0

[network] [PATCH 1/2] 6to4-tunnel: LOCAL_ADDRESS6 needs to be a valid IPv6 network
by Jonatan Schlag 02 Jun '17

02 Jun '17

Fixes: #1359 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/hooks/zones/6to4-tunnel | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hooks/zones/6to4-tunnel b/src/hooks/zones/6to4-tunnel index 2a200e0..f550741 100644 --- a/src/hooks/zones/6to4-tunnel +++ b/src/hooks/zones/6to4-tunnel @@ -48,6 +48,8 @@ hook_check_settings() { assert isset SERVER_ADDRESS assert isset LOCAL_ADDRESS assert isset LOCAL_ADDRESS6 + # LOCAL_ADDRESS6 needs to have a prefix + assert ipv6_net_is_valid LOCAL_ADDRESS6 if enabled AUTO_UPDATE_ENDPOINT; then assert isset TUNNEL_ID -- 2.6.3

1 1

[network] [PATCH 1/3] Add missing logdir to Makefile.
by Stefan Schantl 25 Jan '17

25 Jan '17

The logdir has not been created during the "make install" process and therefore not been shipped yet. This directory is used to store various databases which contains data about the zones and routes. They can easily accessed by the upcomming WUI to display or compute those information. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3c94486..cdb9d39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,8 @@ hooks_zonesdir = $(hooksdir)/zones triggersdir = $(networkdir)/triggers +logdir = $(localestatedir)/log/network + CLEANFILES = DISTCLEANFILES = EXTRA_DIST = @@ -230,7 +232,8 @@ EXTRA_DIST += \ src/ppp/ip-updown.in INSTALL_DIRS += \ - $(pppdir) + $(pppdir) \ + $(logdir) ppp-install-hook: ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-pre-up -- 2.9.3

1 3

[network] [PATCH] Improve MTU handling on bridges
by Arne Fitzenreiter 19 Oct '16

19 Oct '16

When the MTU of a bridge is changed, device_set_mtu will now change the MTU of all ports in that bridge, too. This does not seem to be 100% necessary, but it makes it clearer and probably avoids some other bugs. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- src/functions/functions.device | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/functions/functions.device b/src/functions/functions.device index 571b1fb..a261335 100644 --- a/src/functions/functions.device +++ b/src/functions/functions.device @@ -659,6 +659,14 @@ device_set_mtu() { assert device_exists ${device} + # Handle bridges differently + if device_is_bridge ${device}; then + local port + for port in $(bridge_get_members ${device}); do + device_set_mtu ${port} ${mtu} + done + fi + log INFO "Setting MTU of ${device} to ${mtu}" local up -- 2.6.3

1 0

[network] [PATCH] pppoe-server: Check for valid network
by Stefan Schantl 06 Nov '15

06 Nov '15

The pppoe-server did not proper check if a valid IPv4 or IPv6 network has been specified. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/hooks/configs/pppoe-server | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server index 1ef3ba9..ac9b90a 100644 --- a/src/hooks/configs/pppoe-server +++ b/src/hooks/configs/pppoe-server @@ -42,6 +42,12 @@ hook_check_config_settings() { assert isset SUBNET assert isset MAX_SESSIONS + # Check input. + if ! ip_is_network "${SUBNET}"; then + log ERROR "Invalid subnet. Please provide a valid IPv6 or IPv4 network." + return ${EXIT_ERROR} + fi + local server for server in ${DNS_SERVERS}; do assert ipv4_is_valid "${server}" -- 2.4.3

2 2

[network] [PATCH] functions.ipv6: Fix doubble square bracket when calling assert
by Stefan Schantl 18 Oct '15

18 Oct '15

The assert check does not proper work when using doubble square backets, so the check fails for some unknown reasons. Removing one bracket will allow to successfully perform the assert check again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/functions/functions.ipv6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6 index 9aedf84..2299135 100644 --- a/src/functions/functions.ipv6 +++ b/src/functions/functions.ipv6 @@ -399,7 +399,7 @@ ipv6_format() { } ipv6_addr_eq() { - assert [[ $# -eq 2 ]] + assert [ $# -eq 2 ] local addr1="${1}" local addr2="${2}" @@ -409,7 +409,7 @@ ipv6_addr_eq() { } ipv6_addr_gt() { - assert [[ $# -eq 2 ]] + assert [ $# -eq 2 ] local addr1="${1}" local addr2="${2}" -- 2.4.3

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network