network

network@lists.ipfire.org

108 discussions

[PATCH 1/3] Adapt nitsi command line to new syntax
by Jonatan Schlag 25 Jun '18

25 Jun '18

Nitsi is now using subparsers so we have to add 'run-test' to the command line. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8139399..f11c721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -601,7 +601,7 @@ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) $(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) - $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ + $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ .PHONY: nitsi nitsi: dist $(NITSI_TESTS) -- 2.11.0

1 2

[PATCH 1/7] nitsi: Create "nitsi" Makefile target
by Michael Tremer 15 Jun '18

15 Jun '18

Calling "make nitsi" will run all nitsi tests Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- Makefile.am | 22 ++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 23 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7a755cc264a1..c02376462cf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \ # ------------------------------------------------------------------------------ +AM_V_NITSI = $(AM_V_NITSI_$(V)) +AM_V_NITSI_ = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY)) +AM_V_NITSI_0 = @echo " NITSI " $@; + AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@; @@ -543,3 +547,21 @@ TESTS = \ test/functions/ip/ip_prefix_is_valid \ test/functions/ip/ip_protocol_is_supported \ test/functions/ip/ip_split_prefix + +# - NITSI tests ---------------------------------------------------------------- + +NITSI_TESTS = \ + test/nitsi/test/hello-world + +EXTRA_DIST += \ + test/nitsi/test/hello-world/recipe \ + test/nitsi/test/hello-world/settings + +NITSI_ENVIRONMENT = + +.PHONY: $(NITSI_TESTS) +$(NITSI_TESTS): + $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ + +.PHONY: nitsi +nitsi: $(NITSI_TESTS) diff --git a/configure.ac b/configure.ac index 7cb5ef1110fa..515941451aba 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_SED +AC_PATH_PROG([NITSI], [nitsi]) AC_PATH_PROG([XSLTPROC], [xsltproc]) # pkg-config -- 2.17.0

2 12

[PATCH 1/4] Fix test hello-world
by Jonatan Schlag 04 Jun '18

04 Jun '18

In the moment a single all statement is not supported by nitsi. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- test/nitsi/test/hello-world/recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/nitsi/test/hello-world/recipe b/test/nitsi/test/hello-world/recipe index 6312787..fc83ede 100644 --- a/test/nitsi/test/hello-world/recipe +++ b/test/nitsi/test/hello-world/recipe @@ -1 +1,2 @@ -all: echo "Hello World" +alice: echo "Hello World" +bob: echo "Hello World" -- 2.11.0

1 0

[PATCH 1/3] Fix path to virtual environment of hello-world test
by Jonatan Schlag 04 Jun '18

04 Jun '18

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- test/nitsi/test/hello-world/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings index 27447c2..ee066ce 100644 --- a/test/nitsi/test/hello-world/settings +++ b/test/nitsi/test/hello-world/settings @@ -7,5 +7,5 @@ Copy_to = /root/ [VIRTUAL_ENVIRONMENT] Name = basic -path = ../virtual-environment/basic +path = ../../virtual-environment/basic -- 2.11.0

1 0

[PATCH 1/2] Add first basic virtual environment for nitsi
by Jonatan Schlag 04 Jun '18

04 Jun '18

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- .../basic/machines/alice/machine.xml | 110 +++++++++++++++++++++ .../basic/machines/alice/snapshot.xml | 8 ++ .../basic/machines/bob/machine.xml | 110 +++++++++++++++++++++ .../basic/machines/bob/snapshot.xml | 8 ++ .../basic/network/network1/network.xml | 8 ++ .../basic/network/network2/network.xml | 8 ++ .../basic/network/network3/network.xml | 8 ++ .../basic/network/network4/network.xml | 8 ++ test/nitsi/virtual-environment/basic/settings | 34 +++++++ 9 files changed, 302 insertions(+) create mode 100644 test/nitsi/virtual-environment/basic/machines/alice/machine.xml create mode 100644 test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml create mode 100644 test/nitsi/virtual-environment/basic/machines/bob/machine.xml create mode 100644 test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml create mode 100644 test/nitsi/virtual-environment/basic/network/network1/network.xml create mode 100644 test/nitsi/virtual-environment/basic/network/network2/network.xml create mode 100644 test/nitsi/virtual-environment/basic/network/network3/network.xml create mode 100644 test/nitsi/virtual-environment/basic/network/network4/network.xml create mode 100644 test/nitsi/virtual-environment/basic/settings diff --git a/test/nitsi/virtual-environment/basic/machines/alice/machine.xml b/test/nitsi/virtual-environment/basic/machines/alice/machine.xml new file mode 100644 index 0000000..5f5b4ac --- /dev/null +++ b/test/nitsi/virtual-environment/basic/machines/alice/machine.xml @@ -0,0 +1,110 @@ +<domain type='kvm'> + <name>alice</name> + <uuid>76eb4b45-158b-435d-84eb-0bdc0aafd1f8</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.8'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/ipfire-alice.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <master startport='0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <master startport='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <master startport='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </controller> + <interface type='network'> + <mac address='52:54:00:8a:b8:b5'/> + <source network='net1'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:ea:62:65'/> + <source network='net2'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:49:0f:04'/> + <source network='net3'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:33:67:4a'/> + <source network='net4'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <input type='tablet' bus='usb'> + <address type='usb' bus='0' port='1'/> + </input> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <image compression='off'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </memballoon> + </devices> +</domain> + diff --git a/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml b/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml new file mode 100644 index 0000000..fff9b97 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml @@ -0,0 +1,8 @@ +<domainsnapshot> + <description>Snapshot to undo all changes from this test</description> + <memory>no</memory> + <disks> + <disk name='/var/lib/libvirt/images/ipfire-alice.qcow2'> + </disk> + </disks> +</domainsnapshot> diff --git a/test/nitsi/virtual-environment/basic/machines/bob/machine.xml b/test/nitsi/virtual-environment/basic/machines/bob/machine.xml new file mode 100644 index 0000000..6068211 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/machines/bob/machine.xml @@ -0,0 +1,110 @@ +<domain type='kvm'> + <name>bob</name> + <uuid>b411a615-d6af-41cb-9b30-aaf9a8c52d51</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.8'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/ipfire-bob.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <master startport='0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <master startport='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <master startport='4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </controller> + <interface type='network'> + <mac address='52:54:00:36:ba:7d'/> + <source network='net1'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:e3:cb:28'/> + <source network='net2'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:b6:95:a5'/> + <source network='net3'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </interface> + <interface type='network'> + <mac address='52:54:00:f8:ce:4b'/> + <source network='net4'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <input type='tablet' bus='usb'> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <image compression='off'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </memballoon> + </devices> +</domain> + diff --git a/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml b/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml new file mode 100644 index 0000000..a8311a2 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml @@ -0,0 +1,8 @@ +<domainsnapshot> + <description>Snapshot to undo all changes from this test</description> + <memory>no</memory> + <disks> + <disk name='/var/lib/libvirt/images/ipfire-bob.qcow2'> + </disk> + </disks> +</domainsnapshot> diff --git a/test/nitsi/virtual-environment/basic/network/network1/network.xml b/test/nitsi/virtual-environment/basic/network/network1/network.xml new file mode 100644 index 0000000..7495723 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/network/network1/network.xml @@ -0,0 +1,8 @@ +<network> + <name>net1</name> + <uuid>c2c82218-4aff-466a-bc20-57f723d6ce3d</uuid> + <bridge name='virbr4' stp='on' delay='0'/> + <mac address='52:54:00:c4:0c:3b'/> + <domain name='net1'/> +</network> + diff --git a/test/nitsi/virtual-environment/basic/network/network2/network.xml b/test/nitsi/virtual-environment/basic/network/network2/network.xml new file mode 100644 index 0000000..366fa74 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/network/network2/network.xml @@ -0,0 +1,8 @@ +<network> + <name>net2</name> + <uuid>36d10800-09f3-43a7-b99f-3200722393eb</uuid> + <bridge name='virbr5' stp='on' delay='0'/> + <mac address='52:54:00:28:54:45'/> + <domain name='net2'/> +</network> + diff --git a/test/nitsi/virtual-environment/basic/network/network3/network.xml b/test/nitsi/virtual-environment/basic/network/network3/network.xml new file mode 100644 index 0000000..4d3888b --- /dev/null +++ b/test/nitsi/virtual-environment/basic/network/network3/network.xml @@ -0,0 +1,8 @@ +<network> + <name>net3</name> + <uuid>d7715ce7-f9f0-45b1-940f-790d6d487e5b</uuid> + <bridge name='virbr6' stp='on' delay='0'/> + <mac address='52:54:00:cd:1a:eb'/> + <domain name='net3'/> +</network> + diff --git a/test/nitsi/virtual-environment/basic/network/network4/network.xml b/test/nitsi/virtual-environment/basic/network/network4/network.xml new file mode 100644 index 0000000..656fe23 --- /dev/null +++ b/test/nitsi/virtual-environment/basic/network/network4/network.xml @@ -0,0 +1,8 @@ +<network> + <name>net4</name> + <uuid>e22c49db-894e-4c7b-9899-fd976f333ffb</uuid> + <bridge name='virbr7' stp='on' delay='0'/> + <mac address='52:54:00:56:ff:36'/> + <domain name='net4'/> +</network> + diff --git a/test/nitsi/virtual-environment/basic/settings b/test/nitsi/virtual-environment/basic/settings new file mode 100644 index 0000000..44805ae --- /dev/null +++ b/test/nitsi/virtual-environment/basic/settings @@ -0,0 +1,34 @@ +[DEFAULT] +name = ipfire +machines = alice, bob +networks = network1, network2, network3, network4 +uri = qemu:///system + +[alice] +xml_file = machines/alice/machine.xml +snapshot_xml_file = machines/alice/snapshot.xml +image = /var/lib/libvirt/images/ipfire-alice.qcow2 +root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d +username = root +password = root + +[bob] +xml_file = machines/bob/machine.xml +snapshot_xml_file = machines/bob/snapshot.xml +image = /var/lib/libvirt/images/ipfire-bob.qcow2 +root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d +username = root +password = root + +[network1] +xml_file = network/network1/network.xml + +[network2] +xml_file = network/network2/network.xml + + +[network3] +xml_file = network/network3/network.xml + +[network4] +xml_file = network/network4/network.xml -- 2.11.0

1 1

[PATCH] Add first test for nitsi
by Jonatan Schlag 29 May '18

29 May '18

This commit introduce NITSI. Nitsi is the "Networking integration test suite for IPFire". We can test the network code in a virtual environment on any system. This test has the only purpose to check if nitsi is working. For more information about nitsi see the manpages and the git repository on git.ipfire.org Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- test/nitsi/test/hello-world/recipe | 1 + test/nitsi/test/hello-world/settings | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 test/nitsi/test/hello-world/recipe create mode 100644 test/nitsi/test/hello-world/settings diff --git a/test/nitsi/test/hello-world/recipe b/test/nitsi/test/hello-world/recipe new file mode 100644 index 0000000..6312787 --- /dev/null +++ b/test/nitsi/test/hello-world/recipe @@ -0,0 +1 @@ +all: echo "Hello World" diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings new file mode 100644 index 0000000..27447c2 --- /dev/null +++ b/test/nitsi/test/hello-world/settings @@ -0,0 +1,11 @@ +[DEFAULT] +Name = Hello World +Description = This is a test to just check if nitsi is working. + +Copy_from = +Copy_to = /root/ + +[VIRTUAL_ENVIRONMENT] +Name = basic +path = ../virtual-environment/basic + -- 2.11.0

2 1

[PATCH v2] IPsec: regenerate a swanctl config on connection startup if no config is found
by Jonatan Schlag 08 Mar '18

08 Mar '18

This is an easy way to forcing a regenration if we do not want to change any setting. Fixes: #11627 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ipsec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/functions/functions.ipsec b/src/functions/functions.ipsec index 6f14c8e..d8206e0 100644 --- a/src/functions/functions.ipsec +++ b/src/functions/functions.ipsec @@ -526,6 +526,12 @@ ipsec_connection_up() { return ${EXIT_ERROR} fi + if ! [ -f "${NETWORK_IPSEC_SWANCTL_CONNECTIONS_DIR}/${connection}.conf" ]; then + log DEBUG "Could not find a swanctl config, generating swanctl config" + ipsec_connection_to_strongswan "${connection}" + ipsec_strongswan_load + fi + cmd swanctl --initiate --child "${connection}" } -- 2.6.3

2 1

[PATCH] IPsec: regenerate a swanctl config on connection startup if config is found
by Jonatan Schlag 08 Mar '18

08 Mar '18

1 0

[PATCH 1/5] ip-tunnel: add new function
by Jonatan Schlag 04 Mar '18

04 Mar '18

To be undependent from the IP protocol we use, when we use tunnel modes in our code, this function converts the modes to the modes the iproute2 tool uses which often depend on the IP protocol version. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ip-tunnel | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/functions/functions.ip-tunnel b/src/functions/functions.ip-tunnel index 7bb4e3f..550b0b3 100644 --- a/src/functions/functions.ip-tunnel +++ b/src/functions/functions.ip-tunnel @@ -21,6 +21,34 @@ IP_TUNNEL_MODES="gre sit vti" +# This function converts our modes into the type +# the iproute2 tool uses +ip_tunnel_convert_mode_to_iproute2_mode() { + local mode=${1} + local protocol=${2} + + if ! isset mode || ! isset protocol; then + log ERROR "Did not get mode and/or protocol" + return ${EXIT_ERROR} + fi + + if [[ "${protocol}" = "ipv4" ]]; then + # When we use IPv4 we can use our modes + echo "${mode}" + fi + + if [[ "${protocol}" = "ipv6" ]]; then + # When we use IPv6 we have to convert + case "${mode}" in + "vti") + echo "vti6" + ;; + "gre") + echo "ip6gre" + esac + fi +} + ip_tunnel_add() { local device=${1} shift -- 2.6.3

1 4

[PATCH] IPsec: Fix routing in tunnel mode
by Jonatan Schlag 04 Mar '18

04 Mar '18

Two syntax errors make the routing in tunnel mode non working Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/helpers/ipsec-updown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/ipsec-updown b/src/helpers/ipsec-updown index 3764085..185c2c7 100644 --- a/src/helpers/ipsec-updown +++ b/src/helpers/ipsec-updown @@ -108,7 +108,7 @@ case "${PLUTO_VERB}" in fi else # Get the device which we use to peer with the other site. - ME_DEVICE = "$(device_get_by_ip_address "${PLUTO_ME}")" + ME_DEVICE="$(device_get_by_assigned_ip_address "${PLUTO_ME}")" # We can only go on if we found a device. if isset ME_DEVICE; then -- 2.6.3

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network