network

network@lists.ipfire.org

108 discussions

[PATCH] Makefile.am: Fix typo defining the logdir
by Stefan Schantl 19 Mar '23

19 Mar '23

The correct value name should be "localstatedir" Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 893f1b8..5dc4629 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ hooks_zonesdir = $(hooksdir)/zones triggersdir = $(networkdir)/triggers -logdir = $(localestatedir)/log/network +logdir = $(localstatedir)/log/network utildir = $(networkdir) CLEANFILES = -- 2.30.2

1 0

[PATCH] Add documentation for the IPsec VPN
by Jonatan Schlag 24 Jun '19

24 Jun '19

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- man/network-vpn-ipsec.txt | 97 +++++++++++++++++++++++++++++++++++++++++++++++ man/network-vpn.txt | 5 +++ 2 files changed, 102 insertions(+) create mode 100644 man/network-vpn-ipsec.txt diff --git a/man/network-vpn-ipsec.txt b/man/network-vpn-ipsec.txt new file mode 100644 index 0000000..25347a8 --- /dev/null +++ b/man/network-vpn-ipsec.txt @@ -0,0 +1,97 @@ += network-vpn-security-policies(8) + +== NAME +network-ipsec - Configure IPsec VPN connections + +== SYNOPSIS +[verse] +'network vpn ipsec [new|destroy]' NAME... +'network vpn ipsec' NAME COMMAND ... + +== DESCRIPTION +With help of the 'vpn ipsec', it is possible to create, destroy +and edit IPsec VPN connections. + + +== COMMANDS +The following commands are understood: + +'new NAME':: + A new IPsec VPN connection may be created with the 'new' command. + + + NAME does not allow any spaces. + +'destroy NAME':: + A IPsec VPN connection can be destroyed with this command. + +For all other commands, the name of the IPsec VPN connection needs to be passed first: + +'NAME show':: + Shows the configuration of the IPsec VPN connection + +'NAME authentication mode':: + Set the authentication mode out of the following available modes: + * psk + +'NAME authentication psk PSK':: + Set the pre-shared-key to PSK, only useful when the authentication mode is psk: + +include::include-color.txt[] + +include::include-description.txt[] + +'NAME down':: + Shutdown a etablished IPsec VPN connection + +'NAME inactivity-timeout TIME':: + Set the inactivity timeout with TIME in seconds or in the format hh:mm:ss + +'NAME local id ID':: + Specify the identity of the local system. + + + The ID must be in one of the following formats: + * IP address + * FQDN + * a string which starts with @ + +'NAME local prefix [PREFIX-LIST|+PREFIX ...|-PREFIX ...]':: + Specify the subnets of the local system which should be made available to the remote peer. + +'NAME mode [transport|tunnel]':: + Set the mode of the IPsec VPN connection. + +'NAME peer PEER':: + Set the peer to which the IPsec VPN connection should be etablished. + +'NAME remote id ID':: + Specify the identity of the remote machine. + + + The ID must be in one of the following formats: + * IP address + * FQDN + * A string which starts with @ + +'NAME remote prefix [PREFIX-LIST|+PREFIX ...|-PREFIX ...]':: + Specify the subnets which the remote side makes available to us. + +'NAME security-policy':: + Set the security policy which the connection uses. + + + See link:network-vpn-security-policies[8] for details. + +'NAME up':: + Establishes the IPsec VPN connection to the remote peer. + +'NAME zone':: + When you specify a zone of type ip-tunnel here the IPsec connection is established over a vti tunnel. + The remote and local prefixes are ignored. Imagine a fiber connection between this two machines, and how you would use it. + The IPsec VPN connection works in the same way. You must configure routes and IP addresses of the ip-tunnel hook manually. + + +== AUTHORS +Michael Tremer, +Jonatan Schlag + +== SEE ALSO +link:network[8], +link:network-vpn[8] diff --git a/man/network-vpn.txt b/man/network-vpn.txt index 5a905db..be33606 100644 --- a/man/network-vpn.txt +++ b/man/network-vpn.txt @@ -19,6 +19,11 @@ The following commands are understood: + See link:network-vpn-security-policies[8] for details. +'ipsec' ...:: + Use this command to manage ipsec vpn connections. + + + See link:network-vpn-ipsec[8] for details. + == AUTHORS Michael Tremer -- 2.11.0

1 0

[PATCH] Fix hook for static address configuration.
by Stefan Schantl 15 Sep '18

15 Sep '18

Add the required hook_new function and "id" information which have been introduced in earlier commits to make this hook work again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/hooks/configs/static | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/hooks/configs/static b/src/hooks/configs/static index 91bba8a..37f3d32 100644 --- a/src/hooks/configs/static +++ b/src/hooks/configs/static @@ -52,6 +52,8 @@ hook_check_config_settings() { hook_parse_cmdline() { local protocol + local id="${1}" + shift while [ $# -gt 0 ]; do case "${1}" in @@ -153,12 +155,34 @@ hook_parse_cmdline() { fi # Check any conflicts - if zone_config_check_same_setting "${zone}" "static" "ADDRESS" "${ADDRESS}"; then + if zone_config_check_same_setting "${zone}" "static" "${id}" "ADDRESS" "${ADDRESS}"; then error "A static configuration with the same address is already configured" return ${EXIT_CONF_ERROR} fi } +hook_new() { + local zone="${1}" + shift + + if zone_config_hook_is_configured ${zone} "static"; then + log ERROR "You can configure the static hook only once for a zone" + return ${EXIT_ERROR} + fi + + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi + + zone_config_settings_write "${zone}" "${HOOK}" "${id}" + + exit ${EXIT_OK} +} + hook_up() { local zone="${1}" local config="${2}" -- 2.17.1

3 3

[PATCH 1/2] Add new test zone-new-bridge
by Jonatan Schlag 11 Aug '18

11 Aug '18

This test checks if we can create a new zone of type bridge. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 15 +++++++++------ test/nitsi/test/zone-new-bridge/.gitignore | 3 +++ test/nitsi/test/zone-new-bridge/recipe | 9 +++++++++ test/nitsi/test/zone-new-bridge/settings.in | 9 +++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 test/nitsi/test/zone-new-bridge/.gitignore create mode 100644 test/nitsi/test/zone-new-bridge/recipe create mode 100644 test/nitsi/test/zone-new-bridge/settings.in diff --git a/Makefile.am b/Makefile.am index 4a0c4ea..1ea715e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -601,21 +601,24 @@ CLEANFILES += \ NITSI_TESTS = \ test/nitsi/test/hello-world \ test/nitsi/test/make-check \ - test/nitsi/test/raw-device-get-by-mac + test/nitsi/test/raw-device-get-by-mac \ + test/nitsi/test/zone-new-bridge EXTRA_DIST += \ test/nitsi/test/hello-world/recipe \ test/nitsi/test/hello-world/settings \ test/nitsi/test/make-check/recipe.in \ - test/nitsi/test/make-check/settings.in - test/nitsi/test/raw-device-get-by-mac/recipe\ - test/nitsi/test/raw-device-get-by-mac/settings.in - + test/nitsi/test/make-check/settings.in \ + test/nitsi/test/raw-device-get-by-mac/recipe \ + test/nitsi/test/raw-device-get-by-mac/settings.in \ + test/nitsi/test/zone-new-bridge/recipe \ + test/nitsi/test/zone-new-bridge/settings.in CLEANFILES += \ test/nitsi/test/make-check/recipe \ test/nitsi/test/make-check/settings \ - test/nitsi/test/raw-device-get-by-mac/settings + test/nitsi/test/raw-device-get-by-mac/settings \ + test/nitsi/test/zone-new-bridge/settings NITSI_ENVIRONMENT = diff --git a/test/nitsi/test/zone-new-bridge/.gitignore b/test/nitsi/test/zone-new-bridge/.gitignore new file mode 100644 index 0000000..8a9bd77 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/.gitignore @@ -0,0 +1,3 @@ +/log +/recipe.log +/settings diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe new file mode 100644 index 0000000..d6dcfb7 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/recipe @@ -0,0 +1,9 @@ +include: ../../include/make-install +include: ../../include/network-settings +include: ../../include/network-reset +alice: network zone new upl0 bridge +# this returns zero if the device exists +alice: ip link show upl0 +alice: ls /sys/class/net/upl0 +# check that the config dir exists +alice: ls /etc/network/zones/upl0 diff --git a/test/nitsi/test/zone-new-bridge/settings.in b/test/nitsi/test/zone-new-bridge/settings.in new file mode 100644 index 0000000..207cfa0 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/settings.in @@ -0,0 +1,9 @@ +[GENERAL] +name = zone-new-bridge +description = This test checks if we can create a new zone of the type 'bridge' + +copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz +copy_to = /root/ + +[VIRTUAL_ENVIRONMENT] +path = ../../virtual-environment/basic -- 2.11.0

1 1

[PATCH 1/4] Add recipe to reset network configuration
by Jonatan Schlag 28 Jul '18

28 Jul '18

We use --force here to avoid the y/n question. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 7 +++++-- test/nitsi/include/network-reset | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/nitsi/include/network-reset diff --git a/Makefile.am b/Makefile.am index e56d0fb..2574a2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ NITSI_INCLUDE_RECIPES = \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/network-reset EXTRA_DIST += \ test/nitsi/include/make-install.in + test/nitsi/include/network-reset CLEANFILES += \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + NITSI_TESTS = \ test/nitsi/test/hello-world \ diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset new file mode 100644 index 0000000..d82e2b1 --- /dev/null +++ b/test/nitsi/include/network-reset @@ -0,0 +1 @@ +all: network reset --force -- 2.11.0

1 3

[PATCH 1/3] Add make install recipe for alice only
by Jonatan Schlag 24 Jul '18

24 Jul '18

It saves us much time when we install the network only on alice, when we are using alice only. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 9 ++++++--- test/nitsi/include/alice_make-install.in | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/nitsi/include/alice_make-install.in diff --git a/Makefile.am b/Makefile.am index e56d0fb..bde49ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ NITSI_INCLUDE_RECIPES = \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install EXTRA_DIST += \ - test/nitsi/include/make-install.in + test/nitsi/include/make-install.in \ + test/nitsi/include/alice_make-install.in CLEANFILES += \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install NITSI_TESTS = \ test/nitsi/test/hello-world \ diff --git a/test/nitsi/include/alice_make-install.in b/test/nitsi/include/alice_make-install.in new file mode 100644 index 0000000..6718510 --- /dev/null +++ b/test/nitsi/include/alice_make-install.in @@ -0,0 +1,4 @@ +alice: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +alice: ./configure --prefix=/usr && make -j2 +alice: make +alice: make install -- 2.11.0

1 2

[PATCH 1/3] This recipe just resets the network config to a clean state
by Jonatan Schlag 30 Jun '18

30 Jun '18

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- test/nitsi/include/network-reset | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/nitsi/include/network-reset diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset new file mode 100644 index 0000000..d82e2b1 --- /dev/null +++ b/test/nitsi/include/network-reset @@ -0,0 +1 @@ +all: network reset --force -- 2.11.0

2 4

[PATCH] Fix network reset
by Jonatan Schlag 30 Jun '18

30 Jun '18

The functions zone_destroy and zone_destroy_now where merged to zone_destroy in an earlier commit. So we have to use zone_destroy here. 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 9a2d480..b28ecdb 100644 --- a/src/network +++ b/src/network @@ -1170,7 +1170,7 @@ cli_reset() { local zone for zone in $(zones_get --all); do - zone_destroy_now "${zone}" + zone_destroy "${zone}" done local port -- 2.11.0

2 1

Re: [PATCH] Add include dir for nitsi test
by Michael Tremer 30 Jun '18

30 Jun '18

Cool! :) Please don't forget to CC the list. On Sat, 2018-06-30 at 18:08 +0200, Jonatan Schlag wrote: > Hi, > > The next test which I will post hopefully later this evening. > > Jonatan > > Am Sa, 30. Jun, 2018 um 6:07 schrieb Michael Tremer > <michael.tremer(a)ipfire.org>: > > What is going to use this? > > > > -Michael > > > > On Sat, 2018-06-30 at 17:54 +0200, Jonatan Schlag wrote: > > > When we include recipes in our recipe we must be shure in some cases > > > that the recipe are generated out of a .in file. > > > > > > All files in the include dir will be generated before every test so > > > we > > > can be shure that these files are present. > > > > > > This is useful for recipes like the make-install recipe in this > > > test, > > > which needs to be generated and will be included in nearly every > > > test. > > > > > > Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> > > > --- > > > Makefile.am | 11 ++++++++++- > > > test/nitsi/include/make-install.in | 4 ++++ > > > 2 files changed, 14 insertions(+), 1 deletion(-) > > > create mode 100644 test/nitsi/include/make-install.in > > > > > > diff --git a/Makefile.am b/Makefile.am > > > index b976da6..e56d0fb 100644 > > > --- a/Makefile.am > > > +++ b/Makefile.am > > > @@ -585,6 +585,15 @@ VIRTUAL_ENVIRONMENT_IMAGES_DIR = > > > $(abs_builddir)/test/nitsi/virtual-environment/ > > > VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ > > > > > > https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/b > > > asic/ > > > > > > +NITSI_INCLUDE_RECIPES = \ > > > + test/nitsi/include/make-install > > > + > > > +EXTRA_DIST += \ > > > + test/nitsi/include/make-install.in > > > + > > > +CLEANFILES += \ > > > + test/nitsi/include/make-install > > > + > > > NITSI_TESTS = \ > > > test/nitsi/test/hello-world \ > > > test/nitsi/test/make-check > > > @@ -602,7 +611,7 @@ CLEANFILES += \ > > > NITSI_ENVIRONMENT = > > > > > > .PHONY: $(NITSI_TESTS) > > > -$(NITSI_TESTS): % : %/recipe %/settings > > > $(VIRTUAL_ENVIRONMENT_FILES) > > > $(VIRTUAL_ENVIRONMENT_IMAGES) > > > +$(NITSI_TESTS): % : %/recipe %/settings > > > $(VIRTUAL_ENVIRONMENT_FILES) > > > $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES) > > > $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error > > > run- > > > test -d $@ > > > > > > .PHONY: nitsi > > > diff --git a/test/nitsi/include/make-install.in > > > b/test/nitsi/include/make- > > > install.in > > > new file mode 100644 > > > index 0000000..581c02d > > > --- /dev/null > > > +++ b/test/nitsi/include/make-install.in > > > @@ -0,0 +1,4 @@ > > > +all: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd > > > @PACKAGE_NAME@-@P > > > ACKAGE_VERSION@ > > > +all: ./configure --prefix=/usr && make -j2 > > > +all: make > > > +all: make install > >

1 0

[PATCH] Add include dir for nitsi test
by Jonatan Schlag 30 Jun '18

30 Jun '18

When we include recipes in our recipe we must be shure in some cases that the recipe are generated out of a .in file. All files in the include dir will be generated before every test so we can be shure that these files are present. This is useful for recipes like the make-install recipe in this test, which needs to be generated and will be included in nearly every test. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 11 ++++++++++- test/nitsi/include/make-install.in | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/nitsi/include/make-install.in diff --git a/Makefile.am b/Makefile.am index b976da6..e56d0fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -585,6 +585,15 @@ VIRTUAL_ENVIRONMENT_IMAGES_DIR = $(abs_builddir)/test/nitsi/virtual-environment/ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ +NITSI_INCLUDE_RECIPES = \ + test/nitsi/include/make-install + +EXTRA_DIST += \ + test/nitsi/include/make-install.in + +CLEANFILES += \ + test/nitsi/include/make-install + NITSI_TESTS = \ test/nitsi/test/hello-world \ test/nitsi/test/make-check @@ -602,7 +611,7 @@ CLEANFILES += \ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) +$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES) $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ .PHONY: nitsi diff --git a/test/nitsi/include/make-install.in b/test/nitsi/include/make-install.in new file mode 100644 index 0000000..581c02d --- /dev/null +++ b/test/nitsi/include/make-install.in @@ -0,0 +1,4 @@ +all: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +all: ./configure --prefix=/usr && make -j2 +all: make +all: make install -- 2.11.0

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network