From nobody Thu Oct 05 09:54:42 2023 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 4S1Rjt4XSnz4w7Pq; Thu, 5 Oct 2023 09:54:42 +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 4S1Rjt41Rnz3LLN; Thu, 5 Oct 2023 09:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696499682; 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=tf4gwilzt75cmyhjLTdmIH3OYqNrIYlvmUL1xAThxEo=; b=DfJRAYmUz69HKnSGfwBgyCCd+F8i53/qdPsc7vHyc4mCyxxuF7TjQH0z63Z/+znViKetNl /tv+zrDZEZSkvz690titTslEf+CIu3Nea5f6U8b73s2STuTw040x46sO6yPAGAhPZ13X9v WUuNbcGFZNnVDXNqkQ+TMKcI27V/zoYUZAGCxnAXARZGajxAsF68HbVi2Ev+MhjYxWtiXN SJOA5nxKwuwQMtBfsyQeBckAi2dWyHu1sUtZha+n0n8AOyXj9l/OTsSADYslEWf6/LLHsW D5eiwTtHnSpznmglTYweAw9MQZAHbb7wXAIPJ46NqZxQIk4r5LmC4s2T5xFwTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696499682; a=rsa-sha256; cv=none; b=jNIfF6AHkE/XvEvjqVIou8t04at+SYdKatDMDwKC7N9e6YKvKgvU73KYVNLGzKeKlyHwZX 6h3QKLK/cT28J5dDM1OmUO8UHfWHYlgv8KMUp9kWMipqUWhom0gbALAjKpe146AFAS7nSz J4y1tim0U/rDiW0Z+WSudf+pp+Z/jzXInYIBdF9fUugI5Kvol2PEifDxKj71KWFBwdfjsc u1Dp6/CJCiXlFtkkai5QGX1Xwvi6O+gp+dQTY8cG9axusBFv0En0EBk+NEYCLIZZUcHRe9 sdVltqBQpcK+C9O4Jfpz5LcDh6QbcTXNmoFARs6gqt47BSK2HQpB+j9l81xIgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696499682; 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=tf4gwilzt75cmyhjLTdmIH3OYqNrIYlvmUL1xAThxEo=; b=h7ySrIpQA025PNR5hoYAi65XHB21Rz5ynTAkpG5F5oo22kRiFdNTVf+JHvHG0uHmwfQyIA nUpODFsjBt52sinYo1MqwhOhhM+9Y3HA+EttI49lLtr48J02MNJ0U8rnniT1takaovOvKa Y9eYRRruPBvsgRXtD8bl9Ukgf/kaPy4WVkuX7MZHRrxo55MVl+/fNa5oBkrVxQDsJ4Mp0C xt7VIvw4JVpdHfQGz+HG02oobU07n0+GkAOVPW0duxQPn5IIYvsT+SCvkLl3EWNtX3V5kO WwJ4Sx53LfxhvBQQ+oBCxs4SwuRHfG35HNY7mDzQe7cEdoke28N5ayOEZF1I1g== 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 4S1Rjt35Ckz1FV8; Thu, 5 Oct 2023 09:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3959sgtU043479; Thu, 5 Oct 2023 09:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3959sg2p043476; Thu, 5 Oct 2023 09:54:42 GMT (envelope-from git) Date: Thu, 5 Oct 2023 09:54:42 GMT Message-Id: <202310050954.3959sg2p043476@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: 956a46311462 - main - if_ovpn tests: fix ra test 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: 956a46311462423f97b2410065f8caff2c630701 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=956a46311462423f97b2410065f8caff2c630701 commit 956a46311462423f97b2410065f8caff2c630701 Author: Kristof Provost AuthorDate: 2023-10-05 07:41:25 +0000 Commit: Kristof Provost CommitDate: 2023-10-05 07:48:49 +0000 if_ovpn tests: fix ra test Client one is supposed to be assigend 198.51.100.2, but sometimes it loses the race and the address ends up assigned to client two. When this happened one would try to ping itself, which failed because the loopback interface isn't up. Ideally we'd generate static address assignments, but that would complicate the test. Activate loopback interfaces so the test always passes, and just try to ping both possible addresses. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/net/if_ovpn/if_ovpn.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index c052a6d7eb47..bbaffa0bce73 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -805,14 +805,18 @@ ra_body() ifconfig ${bridge} addm ${two}a vnet_mkjail srv ${srv}b ${lan}a + jexec srv ifconfig lo0 inet 127.0.0.1/8 up jexec srv ifconfig ${srv}b 192.0.2.1/24 up jexec srv ifconfig ${lan}a 203.0.113.1/24 up vnet_mkjail lan ${lan}b + jexec lan ifconfig lo0 inet 127.0.0.1/8 up jexec lan ifconfig ${lan}b 203.0.113.2/24 up jexec lan route add default 203.0.113.1 vnet_mkjail one ${one}b + jexec one ifconfig lo0 inet 127.0.0.1/8 up jexec one ifconfig ${one}b 192.0.2.2/24 up vnet_mkjail two ${two}b + jexec two ifconfig lo0 inet 127.0.0.1/8 up jexec two ifconfig ${two}b 192.0.2.3/24 up # Sanity checks @@ -890,7 +894,9 @@ ra_body() # Client-to-client communication atf_check -s exit:0 -o ignore jexec one ping -c 1 198.51.100.3 + atf_check -s exit:0 -o ignore jexec one ping -c 1 198.51.100.2 atf_check -s exit:0 -o ignore jexec two ping -c 1 198.51.100.2 + atf_check -s exit:0 -o ignore jexec two ping -c 1 198.51.100.3 # RA test atf_check -s exit:0 -o ignore jexec one ping -c 1 203.0.113.1