From patchwork Tue Sep 24 14:01:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "flichtenheld (Code Review)" X-Patchwork-Id: 3870 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:10cd:b0:5b9:581e:f939 with SMTP id j13csp2766059mae; Tue, 24 Sep 2024 07:01:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRaaKET9PH7tjcj3z5IBxXi2CZ81Pq/Gs84XvcdOx+VZRitN/LpBmUQljqqJkUzkUxUi1p896ZitU=@openvpn.net X-Google-Smtp-Source: AGHT+IFiTwmTdSYw7/9hkSCmWt6AK/QsiSFBFr6y4jJFf8oN8BY/qF7YY44dYDAyGa0Tn+x7VVM2 X-Received: by 2002:a05:6871:b13:b0:261:39d:afa1 with SMTP id 586e51a60fabf-2803a6553bbmr8865037fac.22.1727186507954; Tue, 24 Sep 2024 07:01:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727186507; cv=none; d=google.com; s=arc-20240605; b=Uo8M/horCtJvjgcza8HeWwxpQDAYiXYoIcsSIpnQIN5NZP0crVH/eU/wJmSlJxDiFf deOzRuULq412RyMfqlM8Xk9d4C97YNnjaemRVDEry1nYD1apZVOdJaAyfsBNVUCjiLiM Dh/lijL835OiGKlpXoUKCWVY4IGUWqBRKrt1SNSPHsyh9ENP8lXLbC8vmcvnXBD14WFk V7Go4OaSl7ue0DBMcjyeYLlz/b2ujY1TlJtC8axAnxdOEzs9evY47m9Q0R1d6bovyezt HCzC5VCo2UKBGfwhzi8RgSm65uYaR/8kQ/oWKb6aI7URa8JzkriRM5DRGCUEm0oriVyR Klmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=XwULrvdTe8+uRiwsuj1sdDYCcRlGZ2HCkpg0vQ74BZ0=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=fRz8wnFZmFLBn0L8ezVo9mZsOB/WgQ/LNOe/Gbve5s2Zi0s+JmKK3BS552sgBMnq2D EKH1q5zb+EF19UkjhfPb8VZ2T2G9pdSXYE6slmqui+13bxOLhFXxKZkzK3tjZcd9PmPK NGelTFG5YbCrRMGL0qb3OyDs+Abhz7Bf5+xi5TyfoTD2Ay4O6StU1oFP+2n45xyCRiJL tCq+XS0BaiTQX7oTZp2ZQqJB03PjVAsYV3dlgVwqQD3DEDjCSNZAUuQCHIYdDXFVdnOq OhxYZMqV/HtPxPzouGDsf+DBFI8T06HkmNIybV5Y1leTLD9qKZt/z0kF2Xw70HCwjKpd mF7Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=YTzz11Zd; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=QPu5692X; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Eo7dvr8k; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-713beb6e5ffsi700814a34.239.2024.09.24.07.01.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Sep 2024 07:01:47 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=YTzz11Zd; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=QPu5692X; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Eo7dvr8k; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1st66f-0006NV-T5; Tue, 24 Sep 2024 14:01:34 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1st66e-0006NM-6x for openvpn-devel@lists.sourceforge.net; Tue, 24 Sep 2024 14:01:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=q6YjZLhNBRDDGjbgyw43Q73VK9AssFsHrcMKMd+4i24=; b=YTzz11Zd09ZJBB2WXUkGd505Ti stuczaOKH246/GqWPylaYp27tkdpYVOIh+L3n0ICClIK1PlolESMPXw6lsKq71W86Tfr/HpeQGyxJ 1Temkclhw6N5BaO3uGVPtymuWc6nKCFatLjHHce7O31LigjIyaKM1dqgzkbPT8pXtC1M=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=q6YjZLhNBRDDGjbgyw43Q73VK9AssFsHrcMKMd+4i24=; b=Q Pu5692XDM0irVgSb3idRdMk0FnF28vDE3keZPsSGPZZjk1B2DfX83vqSTj8FsJU+4Dnk4JdGmfNUi 3ctMO6v2638q1eslc/GwMjmcpjz7uPaiQ8bbs/XOulrZCKROXX3B2BEK08Vt/j2bGK3DkHZXKAJ20 VBowNytlbwU9CLQQ=; Received: from mail-wm1-f42.google.com ([209.85.128.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1st66e-0004nR-0v for openvpn-devel@lists.sourceforge.net; Tue, 24 Sep 2024 14:01:32 +0000 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42cde6b5094so51681845e9.3 for ; Tue, 24 Sep 2024 07:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1727186485; x=1727791285; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=q6YjZLhNBRDDGjbgyw43Q73VK9AssFsHrcMKMd+4i24=; b=Eo7dvr8kq4Pc30GsW3h69lirQOS4htY7XW5UijPrP8gW22jJSEsyirf/DXSVaNQIeb 4Si3yzgVRqUwALosHY4v6GiEtKAzkg3OND2DEz4E74nnAFYvmdk9Dxqb9NJJ5xBGTDXi qFpH+n3dLiC0RFjFagPrXhZItsIPuJtCBToUWm6A8PTXvm4uytT7pNgUdqTmNtLz+eSg ZtWrpsZVWBZKr4Yc4zsPdw6xKfbr6ISGqF4NtWZRWomV3Es+9dmOTKTtBCo5TGsri899 Gb+7uKn1jDevlH1U/cMx2KVwruQEajYv77bwyyr6OPjEmWhAVgg+KvOe2tLgq/cj4YiR HmOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727186485; x=1727791285; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q6YjZLhNBRDDGjbgyw43Q73VK9AssFsHrcMKMd+4i24=; b=xENLD/EGBRBfkkUdx+MtV09crS1kYou531XUas9Cf92JmCy/p2E+N0jPlvbe9PMYwW 2wr+1sU3Nt5ZmlKdvtU3tgWvbqyFRB5SlnrjaKZlUlZ8eodSRa+YdiQmggVfLHnM0rAx nvAhRLVxKhye+oLdcw/Df+wkqvIeRkC29XduVnFxiO+E9E8cZQlEPhuFtaeYD40V7m/s wptUNRkZM/EnMRTesfPvz1La/Z1+579TzelArhcSXnPHIObQpL+9Wu5ys9A5xE7VIagb gK572C0ANPxnuUem5hKIFRbXfxm/rHV8MqilZRC1DlhnncehfvEE+q6c6Vqt/ctRq0B8 9UbQ== X-Gm-Message-State: AOJu0YwW1ho1J1ez4f5Nh9SvdbbtUoWApbuKxU/lpXBwWQU3ZEFDErww oQDojHmFGoREX4feB3+2WwTk9cyWajNK3oLVxGwt59FB9g4XbzV4I+l3CcHYKWkN1/uC18+PDoV r X-Received: by 2002:a05:600c:3b82:b0:42c:b80e:5e50 with SMTP id 5b1f17b1804b1-42e7ab4073fmr114652205e9.0.1727186485208; Tue, 24 Sep 2024 07:01:25 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e9029857fsm23474795e9.13.2024.09.24.07.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 07:01:24 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 1 Date: Tue, 24 Sep 2024 14:01:23 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Iec1953415afb53755488dd44407568e72d28e854 X-Gerrit-Change-Number: 768 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 04f674582cf71e4efe2d9638c94fdb6edc8cf32e References: Message-ID: <895ac5ec02bd118c17a83f048bd9d02bf81846c7-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -1.1 (-) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-1.1 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.9 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.42 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1st66e-0004nR-0v Subject: [Openvpn-devel] [S] Change in openvpn[master]: t_client.sh: conditionally skip ifconfig+route check X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: gert@greenie.muc.de, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1811086319992252765?= X-GMAIL-MSGID: =?utf-8?q?1811086319992252765?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/768?usp=email to review the following change. Change subject: t_client.sh: conditionally skip ifconfig+route check ...................................................................... t_client.sh: conditionally skip ifconfig+route check For --dev null or --dev-type af_unix:lwipopenvn tests, there will be no visible change to ifconfig or route output, so tests will fail ("how can this be?"). Set EXPECT_IFCONFIG4_=- to skip this check. (Simply leaving both EXPECT_IFCONFIG* vars empty and using that as trigger would interfere with the magic from commit df0b00c25) Change-Id: Iec1953415afb53755488dd44407568e72d28e854 Signed-off-by: Gert Doering --- M tests/t_client.sh.in 1 file changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/768/1 diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in index f6654dd..3b9209d 100755 --- a/tests/t_client.sh.in +++ b/tests/t_client.sh.in @@ -225,6 +225,7 @@ expect_list="$@" if [ -z "$expect_list" ] ; then return ; fi + if [ "$expect_list" = "-" ] ; then return ; fi for expect in $expect_list do @@ -404,13 +405,17 @@ output "save ifconfig+route" get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route.txt - output -n "compare pre-openvpn ifconfig+route with current values..." - if diff $LOGDIR/$SUF:ifconfig_route_pre.txt \ - $LOGDIR/$SUF:ifconfig_route.txt >/dev/null - then - fail "no differences between ifconfig/route before OpenVPN start and now." + if [ "$expect_ifconfig4" == "-" ] ; then + output "skip ifconfig+route check" else - output " OK!\n" + output -n "compare pre-openvpn ifconfig+route with current values..." + if diff $LOGDIR/$SUF:ifconfig_route_pre.txt \ + $LOGDIR/$SUF:ifconfig_route.txt >/dev/null + then + fail "no differences between ifconfig/route before OpenVPN start and now." + else + output " OK!\n" + fi fi # post init script needed?