From patchwork Mon Sep 9 13:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3811 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd4:b0:5b9:581e:f939 with SMTP id c20csp1531925max; Mon, 9 Sep 2024 06:55:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlUUuXk7+eiJoWedaw+7lIwqZ+QarruRp+P/qFV/7sXHPyIHVErtxyLdEiYsdT87ckFWR74i/etl8=@openvpn.net X-Google-Smtp-Source: AGHT+IGIwhtLcX4v9hZmibG9o6o+WINmmn8eJHZoEhx/Ks4tYdih/mgm7ISNwnzlgnaktrvLtj5L X-Received: by 2002:a05:6602:6c01:b0:806:31ee:13b with SMTP id ca18e2360f4ac-82a9a222063mr989365639f.4.1725890121059; Mon, 09 Sep 2024 06:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725890121; cv=none; d=google.com; s=arc-20240605; b=NqHZc9lBEw+/5qA0dGu/98Aw8sBYWcw1u76UBFBVSDQbLB4lZai9fcv1v2rYRQax0v mh+DnQ1gUCHy3HusPY/gHzn94SNZqW6kyCH/otUFaRUwx9aNhRljBUNOc6jjXwI5xZmU KzzT0XKGVwzf6YGwpCjaONS+cOzm0wDgodfItGki6hgaIUC9MRoRtFv0nbnFT5XlYHSs d9iUIgaRe/ia3vVgbXleNPERM7cEYNBSfc6dW59z6cr6w9nQS/JJEYqUUb3RP03wJFjx iVoMIVCsGwQFmLQyvy6p6E6j/pZOaQDVQHqgSPki9YxvNvBILEmQ2EHhBcq5gvzWkwuT Y4WA== 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=kEHOfgZcNz4I7j7scpfvx8JODKRdEMxwdf4mGDNJxLo=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=KSqEq24cMZL5TgLu2+x3j1FT9ww8HofPRCNav/GyS84tzYHjCP93CERngC5iSvWOpS RyD7A1b+5HpZuzPR3thF0F4WaXc7G60aL6TGtqgtAUfa4OTsLxvB65CRDygLJJOb1xnE Wm2b/0loZNBSsdYC8/5WePWQ0boJldweRFO3Eqq2ljp2QPAmfwbR5pbF5WmtcVupSgI2 cy2DGxTFt9iLtR4/HF8Ru47bvVB+kZiKfp8jnC/65aiRoPkaSWyC3A4MjEIVkYveMChy ikJxxExYFyfUe83gtSR04PLTqoymUqHU/egjiN7A3XSie1UNaBFBo6INOhsvnmRy7Wnu oo/g==; 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=d9GNSBeZ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=O4aqY1U2; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=TY8Cgi03; 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 ca18e2360f4ac-82aa736e207si220915639f.62.2024.09.09.06.55.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Sep 2024 06:55:20 -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=d9GNSBeZ; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=O4aqY1U2; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=TY8Cgi03; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1snerB-0006Fr-VJ; Mon, 09 Sep 2024 13:55:05 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1snerA-0006Fi-Am for openvpn-devel@lists.sourceforge.net; Mon, 09 Sep 2024 13:55:04 +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=ugPgxUP9tUrtvsDRQBCVfvPjg699ppi1WdbULsdMv3w=; b=d9GNSBeZln+jsJIvKeql9lZMo0 tI1u4hiUQZLMW6E5mMywPwav7STyIkqFqMyCkK0B7PL8q85sIG0cPdo5JzTTUVyDlGsgrZFTQ+XcP 1yNlhRyMF7vmRhvGwlS33Yx4zX+WjEVqrS5qMuIX2EjQ6evBTE01b1d9KmDFzh3Ys1bw=; 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=ugPgxUP9tUrtvsDRQBCVfvPjg699ppi1WdbULsdMv3w=; b=O 4aqY1U2KkCfO2GuLyheRHDXKjFK6lD3B6ubxQq7jg+pfA0A/n2WF52oAyxBarMsf01ppGN52wxPSg J+7LCbpLEfnVJ/8GZjnxc+2sRv+Y7AmOTUsqNKgCWeZg+gl96vzrzb/5CSeHDsSspIOCKhwsrdQ7A 8mdd0Ee4HwwiNk2M=; Received: from mail-wr1-f42.google.com ([209.85.221.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1sner9-0002Ea-C1 for openvpn-devel@lists.sourceforge.net; Mon, 09 Sep 2024 13:55:04 +0000 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-374c962e5adso2432452f8f.1 for ; Mon, 09 Sep 2024 06:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1725890092; x=1726494892; 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=ugPgxUP9tUrtvsDRQBCVfvPjg699ppi1WdbULsdMv3w=; b=TY8Cgi03v9uvvNMu8N+ZpSPgUyOXEOGw26dkfkWuJyidvqgJIzGu3kongEAuUwJ6E4 HmrFDDyOLYN9bEVFs42VSQr4nZCsBVxuuxPwNtebwjwdqD/H6Bvgt+Clxrm478r3QLxN r6fvhH1mC4g0RhFxI4eTc3AZpt0vgNS9wTXMy7eRbNCgYZ5cP4UxV+saPJPhqFYlWKp4 Hil71q/umfg5SqHUt+KQdRJ9vaiTGblfzdu71EkaLoeN2aBd3WGP96bTnWLZSG4s8+cs aKz24gwXt6Am30l4dV+5LR1NB+oIEVL7x8NGIETXzYJolQ/9YzLBBOehJ9vgT3Jd7zOf 3wqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725890092; x=1726494892; 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=ugPgxUP9tUrtvsDRQBCVfvPjg699ppi1WdbULsdMv3w=; b=AL1/hv3GNBXau/4sM1vT2UGszSJnlhQCxpS6hj8mhfZn88tShqj6155/nF7VMtpaXP kK2Gdrt+rlJap44/RrBUSYct+QVPvwygVpmyNvozLa0iAvofZk8DPNdr4MuJAV5+ZdTF 1iAteZiQXMK07VI/fUM+CEZw4N+DCFuQMhvCwysdikaVbbxmGqx+Wa4CiO2FDLj3hOO0 lWZLDOTXBqYDkFVVwBxs02B/xXRqtNwDSiXzg3JeJO7kbqzRDNx4OYLbxAZZmswvi1jC C96/mEsHdsoiw/NswT7PNvAx/KShjy0o1B8XvkL0R1GpIQTnF+Rrp5BE5u2G6USK54yo 3RvQ== X-Gm-Message-State: AOJu0YzKkaB2YUYUXoJFSzr09996MCjxWZ4Ct+2yHwP8zaEudpmPnnYW oGFQ6mutPMyEXBM3zWy+YfFMUc+GAJSXzPGB1jUig2MGHnGx0w1oVxQBend8lvngqPk0IcwY5dp e X-Received: by 2002:a5d:6a07:0:b0:374:be24:a81b with SMTP id ffacd0b85a97d-37799e69a84mr11322000f8f.7.1725890091764; Mon, 09 Sep 2024 06:54:51 -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-42caeb218d7sm78537835e9.9.2024.09.09.06.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 06:54:51 -0700 (PDT) From: "ralf_lici (Code Review)" X-Google-Original-From: "ralf_lici (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 9 Sep 2024 13:54:50 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I5adbe0a79f078221c4bb5f3d39391a81b4d8adce X-Gerrit-Change-Number: 737 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: cee1303c6e0a7a11a6563541397cfb5dfabceec2 References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: (-0.2 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.221.42 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.42 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 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_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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: 1sner9-0002Ea-C1 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix check_addr_clash argument order 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: ralf@mandelbit.com, 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?1809726959697946057?= X-GMAIL-MSGID: =?utf-8?q?1809726959697946057?= 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/+/737?usp=email to review the following change. Change subject: Fix check_addr_clash argument order ...................................................................... Fix check_addr_clash argument order In init_tun() make sure to pass the --local and --remote addresses in the host order so that they can be compared to the --ifconfig addresses. Change-Id: I5adbe0a79f078221c4bb5f3d39391a81b4d8adce Signed-off-by: Ralf Lici --- M src/openvpn/tun.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/37/737/1 diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 739e008..1cd6ad2 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -877,9 +877,10 @@ { if (curele->ai_family == AF_INET) { + const in_addr_t local = ntohl(((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr); check_addr_clash("local", tt->type, - ((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr, + local, tt->local, tt->remote_netmask); } @@ -889,9 +890,10 @@ { if (curele->ai_family == AF_INET) { + const in_addr_t remote = ntohl(((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr); check_addr_clash("remote", tt->type, - ((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr, + remote, tt->local, tt->remote_netmask); }