From df411bfa304fa0b2c92e7c0148fb04ac258437f1 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 5 Jul 2018 18:12:40 +0200 Subject: [PATCH] testing: The dhcp plugin uses the DHCP client port again by default This reverts parts of commit becf027cd9b0af162247015a9fff6c00e59fd6ce. Fixes: 707b70725a7d ("dhcp: Only use DHCP server port if explicitly configured") --- .../tests/ikev2/dhcp-dynamic/hosts/moon/etc/iptables.rules | 4 ++-- .../ikev2/dhcp-static-client-id/hosts/moon/etc/iptables.rules | 4 ++-- .../tests/ikev2/dhcp-static-mac/hosts/moon/etc/iptables.rules | 4 ++-- .../tests/swanctl/dhcp-dynamic/hosts/moon/etc/iptables.rules | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/tests/ikev2/dhcp-dynamic/hosts/moon/etc/iptables.rules b/testing/tests/ikev2/dhcp-dynamic/hosts/moon/etc/iptables.rules index 792fc56bc0..2d9a466b0a 100644 --- a/testing/tests/ikev2/dhcp-dynamic/hosts/moon/etc/iptables.rules +++ b/testing/tests/ikev2/dhcp-dynamic/hosts/moon/etc/iptables.rules @@ -5,8 +5,8 @@ -P OUTPUT DROP -P FORWARD DROP -# allow bootps (in relay mode also in OUTPUT) --A OUTPUT -p udp --sport bootps --dport bootps -j ACCEPT +# allow bootpc and bootps +-A OUTPUT -p udp --sport bootpc --dport bootps -j ACCEPT -A INPUT -p udp --sport bootps --dport bootps -j ACCEPT # allow broadcasts from eth1 diff --git a/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/iptables.rules b/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/iptables.rules index 792fc56bc0..2d9a466b0a 100644 --- a/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/iptables.rules +++ b/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/iptables.rules @@ -5,8 +5,8 @@ -P OUTPUT DROP -P FORWARD DROP -# allow bootps (in relay mode also in OUTPUT) --A OUTPUT -p udp --sport bootps --dport bootps -j ACCEPT +# allow bootpc and bootps +-A OUTPUT -p udp --sport bootpc --dport bootps -j ACCEPT -A INPUT -p udp --sport bootps --dport bootps -j ACCEPT # allow broadcasts from eth1 diff --git a/testing/tests/ikev2/dhcp-static-mac/hosts/moon/etc/iptables.rules b/testing/tests/ikev2/dhcp-static-mac/hosts/moon/etc/iptables.rules index 792fc56bc0..2d9a466b0a 100644 --- a/testing/tests/ikev2/dhcp-static-mac/hosts/moon/etc/iptables.rules +++ b/testing/tests/ikev2/dhcp-static-mac/hosts/moon/etc/iptables.rules @@ -5,8 +5,8 @@ -P OUTPUT DROP -P FORWARD DROP -# allow bootps (in relay mode also in OUTPUT) --A OUTPUT -p udp --sport bootps --dport bootps -j ACCEPT +# allow bootpc and bootps +-A OUTPUT -p udp --sport bootpc --dport bootps -j ACCEPT -A INPUT -p udp --sport bootps --dport bootps -j ACCEPT # allow broadcasts from eth1 diff --git a/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/iptables.rules b/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/iptables.rules index 792fc56bc0..2d9a466b0a 100644 --- a/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/iptables.rules +++ b/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/iptables.rules @@ -5,8 +5,8 @@ -P OUTPUT DROP -P FORWARD DROP -# allow bootps (in relay mode also in OUTPUT) --A OUTPUT -p udp --sport bootps --dport bootps -j ACCEPT +# allow bootpc and bootps +-A OUTPUT -p udp --sport bootpc --dport bootps -j ACCEPT -A INPUT -p udp --sport bootps --dport bootps -j ACCEPT # allow broadcasts from eth1