Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Feb 2021 12:31:19 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 7a4dbffa4205 - main - bridge tests: Test that we also forward on some interfaces
Message-ID:  <202102251231.11PCVJrg013116@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=7a4dbffa4205fc274b4884a6332d4831c5791320

commit 7a4dbffa4205fc274b4884a6332d4831c5791320
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2021-02-24 15:40:37 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2021-02-25 09:17:03 +0000

    bridge tests: Test that we also forward on some interfaces
    
    Ensure that we not only block on some interfaces, but also forward on
    some. Without the previous commit we wound up discarding on all ports,
    rather than only on the ports needed to break the loop.
    
    MFC after:      1 week
    Sponsored by:   Orange Business Services
    Differential Revision:  https://reviews.freebsd.org/D28917
---
 tests/sys/net/if_bridge_test.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh
index bc9add68ce25..1f10fe325a2c 100755
--- a/tests/sys/net/if_bridge_test.sh
+++ b/tests/sys/net/if_bridge_test.sh
@@ -117,6 +117,15 @@ stp_body()
 	then
 		atf_fail "STP failed to detect bridging loop"
 	fi
+
+	# We must also have at least some forwarding interfaces
+	a_forwarding=$(jexec a ifconfig ${bridge_a} | grep forwarding)
+	b_forwarding=$(jexec b ifconfig ${bridge_b} | grep forwarding)
+
+	if [ -z "${a_forwarding}" ] && [ -z "${b_forwarding}" ]
+	then
+		atf_fail "STP failed to detect bridging loop"
+	fi
 }
 
 stp_cleanup()
@@ -182,6 +191,15 @@ stp_vlan_body()
 	then
 		atf_fail "STP failed to detect bridging loop"
 	fi
+
+	# We must also have at least some forwarding interfaces
+	a_forwarding=$(jexec a ifconfig ${bridge_a} | grep forwarding)
+	b_forwarding=$(jexec b ifconfig ${bridge_b} | grep forwarding)
+
+	if [ -z "${a_forwarding}" ] && [ -z "${b_forwarding}" ]
+	then
+		atf_fail "STP failed to detect bridging loop"
+	fi
 }
 
 stp_vlan_cleanup()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102251231.11PCVJrg013116>