From nobody Thu Apr 21 08:26:18 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0F1BC1996030; Thu, 21 Apr 2022 08:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KkVxQ6zm6z4llY; Thu, 21 Apr 2022 08:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650529579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tn4sJp+ADJjFFkDd2Zu2rL1pYCoMMEwfTece5MTVCIw=; b=JSmQWdeEMTRXU05IQchWNb0WLvogdk6nNHBssJPdfIdgi6K1oC/ExYU5g3rHlHZ4vQ0jk4 r47s+Vr0pqVSrHVHlTh36Q+HZuVpfDYrUKsszz/lqRsBa2bu62N6SFtay4eo2kFyJ9vgyf ZG9A881Bt+RJb9K9T3siiTH0R8IjkQPjAI+J8GA4zbb0s0aa4Z1UoIRl1hAXk2auBedBbb aP/ygNxwv5LLT6Xne7cRtxR1C7dMt1w6b3HmQmyY1kwqXE6Xsbe7FZbx8N+gDJPdQKpyyt Xow3bHv3NNGxCLE6iEmviAHhjej1T0CtXyLwDHUUMWH3OJB63hJYtzgW+BxQeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF473246F5; Thu, 21 Apr 2022 08:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23L8QIKX068726; Thu, 21 Apr 2022 08:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23L8QI4M068725; Thu, 21 Apr 2022 08:26:18 GMT (envelope-from git) Date: Thu, 21 Apr 2022 08:26:18 GMT Message-Id: <202204210826.23L8QI4M068725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c90f8cb899a7 - main - pfctl tests: fix Ethernet output expectations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c90f8cb899a70419721f5d0005a359af45515791 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650529579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tn4sJp+ADJjFFkDd2Zu2rL1pYCoMMEwfTece5MTVCIw=; b=dX57sHnl5kLrXEfVC4ZwSOfYKHbRnDYUZXlsP7PH96vMFQKL8JZoqylhWurNYegaDtbCpq RQNMVJ0rwZs1kz4Hkjo6pOzqV9/IsfzvN+FN71HFu69MD15zAlyt4Y8HHw7yNFqYL6uAUk oAixBq0W2hNnkUHjVsynGerNzR4m3ltBYy2usi1Sk8fKrZ3nD8q3FqHWfH74i65zH4KehK KkGF1uuJvdHRrtFPSo5pNEJfucmsNa7P036++B4Y9k2gXnhMRYRKNO9Q346Q8PDWn3gBcy HDpsoqq5LGZ7h8qAU0/sD+phrbU8SFxJVwj2sIvZhqRuXVlRzNw9LVme3gOHvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650529579; a=rsa-sha256; cv=none; b=rNsajYBdGygSl8wm/V9kqLZPCPz4U2yAKmiHYDtQnznHWclGA5inUzFhAsGqz7ZmVyqHpA B1i6sPixRhLPqsjgk4lh51bICL9FKIZTYBp5bPZ+mIeqvLf885XsXlj7xfZtNLwi27cUoi M0cUgeMzXJv07Xf52QQM8Mhe3FcTdc67A9BLR3PZHLpwYPwydVbzT5gzjg6g6AeNdMzpRC COgjBCuuQAUbU/cPEOSexE21sAU8Upcs/27nm9ZmPw0Z4V+pvZicc+4TApa6GR8oRGmGQO 2nmJLMCID7OH9qVEGYz2O4hi3l/uVV5aSqNldOe7sZczjEJP0uUqEtUmD8mVEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c90f8cb899a70419721f5d0005a359af45515791 commit c90f8cb899a70419721f5d0005a359af45515791 Author: Kristof Provost AuthorDate: 2022-04-21 08:24:44 +0000 Commit: Kristof Provost CommitDate: 2022-04-21 08:26:00 +0000 pfctl tests: fix Ethernet output expectations Since a16732d670 we always print the l3 src/destination for Ethernet rules. Update the tests to account for this. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/tests/files/pf1007.ok | 2 +- sbin/pfctl/tests/files/pf1008.ok | 2 +- sbin/pfctl/tests/files/pf1009.ok | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/tests/files/pf1007.ok b/sbin/pfctl/tests/files/pf1007.ok index e08b38d7241a..742b5308ec90 100644 --- a/sbin/pfctl/tests/files/pf1007.ok +++ b/sbin/pfctl/tests/files/pf1007.ok @@ -1 +1 @@ -ether block out on igb0 to ! 00:01:02:03:04:05 +ether block out on igb0 to ! 00:01:02:03:04:05 l3 all diff --git a/sbin/pfctl/tests/files/pf1008.ok b/sbin/pfctl/tests/files/pf1008.ok index a9bd472a5070..646ef77c78dd 100644 --- a/sbin/pfctl/tests/files/pf1008.ok +++ b/sbin/pfctl/tests/files/pf1008.ok @@ -1 +1 @@ -ether block out on igb0 to 00:01:02:03:04:05/24 +ether block out on igb0 to 00:01:02:03:04:05/24 l3 all diff --git a/sbin/pfctl/tests/files/pf1009.ok b/sbin/pfctl/tests/files/pf1009.ok index 833c9099837c..3023f1337dd3 100644 --- a/sbin/pfctl/tests/files/pf1009.ok +++ b/sbin/pfctl/tests/files/pf1009.ok @@ -1 +1 @@ -ether block out on igb0 to 00:01:02:03:04:05&ff:ff:ff:00:00:ff +ether block out on igb0 to 00:01:02:03:04:05&ff:ff:ff:00:00:ff l3 all