From nobody Thu Oct 12 16:11:47 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 4S5vlm0pr8z4wZqp; Thu, 12 Oct 2023 16:11:48 +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 4S5vlm0L48z3DNp; Thu, 12 Oct 2023 16:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697127108; 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=5eSIFUZogy3F+TfU0WDRjfsXuY0iir18QV00/G256QY=; b=U0fioWqEEdysOGJnvIS7f8f9TIS+Ha3zfXLb6EXd9YIJDsgclkIeg1PZIZvO8onmOeHxQH PJjxhhpedLLkYA7pz9np3bp8ELdZEePcRaOsFeO9q2GLPO14ET1pNkkMGrtjCfL/OsZyp8 oMRnB8St3cCz9cviBVFuLKOitZkPCK7hZSNORPqgntsYYzNaQCCyzyWci8i20ti3+ppNWT gnRYtTyBFDi9UOBE7cbDnTAlES2pSEMz6WcmbdugVLh2swOkcRABPthtTjjeFxFzxpvV2L 8d5xZjcDTDbM/9Xt7yhdnLZi8myTMyoD8R7xE8T6q3SF+6Bq0I+D5TKJX/CsOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697127108; a=rsa-sha256; cv=none; b=FFOfy3nBrs4IR1vWgRhs7se9zkhsBUChecdUpFDbfhG7rP5u+FyXKIpznMExFUu9Xnn8Cm yHG677eOzXze65s5AMxkb+aw3t4U6D5rvpZ/l/BfR6mXO41q7WF8Q1NcD4N+mjfXCu8tp3 Ht4lVXXvCrGF9CIaieGap+4rpc04hks1yReff87DU6ApgUsyZ3vvHQF9+g+x8A1QXMAa/B sC8iWefbp+CkEmr9XRj1N951qmoOl6VlrCbdDBe4EiCnfxtZnZXBO09lKgx+tPKsaYlM9w eMW6AIsC6rYumNiMfCwrI9SxxxshKg9I2oSRFrm1RRgr5Fvr+XKIY/9pDsjwjg== 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=1697127108; 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=5eSIFUZogy3F+TfU0WDRjfsXuY0iir18QV00/G256QY=; b=SAneZvpVNkUCGru2dUAu7G3acNF33iJ4Dvkfm85HHehWAJKaZ4G7FZu7c7hyfScuohy/Nq sKLEdKMnDGTpFDl7pvV/7XUA7EHGcN5Qx4IlvWJbk+InBHMPiYHyQquCOZv05iN7xKBl1M U2dZLYtgrsgYrLq+8nJLNYnSmV+njIaQlzv0jsXSHb1UVKJLDGKBNYYhJvXzqoGgPQ9HCV ectUUXX1vqMQXrlqyi/liJ8WodOvi/lv++uiFPDe2jwsg2dx2K+IU4Ch5O+wVU61ldgZtJ 9KoQQVEd+oseALe7qj7XxmuVW8OC/F/TqVYOqJ6nDV5ypX+iJZjw+EODBVoAKg== 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 4S5vll6Vrmz19Cw; Thu, 12 Oct 2023 16:11:47 +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 39CGBlZi072729; Thu, 12 Oct 2023 16:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CGBlLw072725; Thu, 12 Oct 2023 16:11:47 GMT (envelope-from git) Date: Thu, 12 Oct 2023 16:11:47 GMT Message-Id: <202310121611.39CGBlLw072725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e06428cfcaec - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e06428cfcaec314dae9e88102548250f2fb1fa0c Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e06428cfcaec314dae9e88102548250f2fb1fa0c commit e06428cfcaec314dae9e88102548250f2fb1fa0c Author: Kristof Provost AuthorDate: 2023-10-05 07:41:25 +0000 Commit: Kristof Provost CommitDate: 2023-10-12 07:47:06 +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") (cherry picked from commit 956a46311462423f97b2410065f8caff2c630701) --- 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