From patchwork Fri Sep 6 15:44:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ralf_lici (Code Review)" X-Patchwork-Id: 3805 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd4:b0:5b9:581e:f939 with SMTP id c20csp224798max; Fri, 6 Sep 2024 08:45:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEoI6OaZOWR07UA37wq4Pp8hckdzSUbLIehcie2UlvLNAQjqeEXPQTL6mxUfw5/KTXPyCzmYaDsJY=@openvpn.net X-Google-Smtp-Source: AGHT+IGP+fVQcgSIoGqB5KJWxavu/hdpnUK0hyXDGHft7Uxdyhm7HBoP0KYcKpSWR046Fuf8nSga X-Received: by 2002:a17:90b:1e4e:b0:2d3:b357:7857 with SMTP id 98e67ed59e1d1-2dad50f9e21mr3304082a91.16.1725637524628; Fri, 06 Sep 2024 08:45:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725637524; cv=none; d=google.com; s=arc-20240605; b=fgBjKBzSjO9A6YWas1m7k3Z7T1ZZD/UF7f+Vac+veW1cOYP7QJGLPTQmJ1b8TVENAa WSiIOS9QcsdBMAqKyvp7H8SDplV+OdMAxXaVUvx7a6djX4IJlhuEVht8joNST5WCkFuE crAZWr/rlFYoIfhuSjuchxuo/ox1SEBIoPwZZ2LO30J4belOmgo2zMi+ruuUp4gssxVI leCxGjTDBEJVWgVMgDJb90NhwIvLw9OmCZlCjWNOtalxU5to8Ml59YnUIYGCEYE0L/i2 0Y7N7kld+t8ASJ8mnWp5pTVn4qoNlL2EmuO2W6jIU6rAveA70P437dfZC2jkEaq2dw87 TuKw== 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=tLrxaVOmc2bdGTfOjzUcchbqFQtiRGvFOuC21fVlQUo=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=f/scpbWphtkDFEG3UTivI2/YhZg65eaBXssYWbQcRvda+HpVsYNNE2SZRlDuQApdv+ ItfF2jaTC5ubEQTVggu4miKMaHXai3qJ8AoMjkIj9lDrisRVJ6mye5kVk4RQNKRa+2Fw O8O08Tf7X7UREsyL4uHkMMMDxCmVhNWI1thrsOV4LosjuEP8uBMXCuvnsR8MJSQVUZ/E DN4NKFzpC8IplpUp+LVQ41usfUaM4RgLvf+M0ZGKUG9P+pBkZ3+fj7Bam/sMz0gpSeWp tfDXSswqg94G/IsOjqnifEIRtSja0av0o9nTnmAzyjI5eSt/jobjBMvKtpG7RmjTOjxd ZHPA==; 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=Mbf1yny4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="lCRCswn/"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Hbojj7nE; 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 98e67ed59e1d1-2dadc11ae22si1866817a91.163.2024.09.06.08.45.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Sep 2024 08:45:24 -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=Mbf1yny4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="lCRCswn/"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Hbojj7nE; 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 1smb8x-0003oS-Cq; Fri, 06 Sep 2024 15:45:04 +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 1smb8w-0003oM-9z for openvpn-devel@lists.sourceforge.net; Fri, 06 Sep 2024 15:45:03 +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=HHf7o0SzZJXpL8XKOW0wW6OaNg4Q74Q1+h4LlLFfz1o=; b=Mbf1yny4Wi5RgzcWpVfhYDwZTS S2HmQUnbfUNACajSttiiagoysvoK15W1mz1ahqxpWscx9fE1XjDDdUBy71VnWgj0mpwiYCyTaRsHr MJfj4HJe/+JidnlrxessVgUFMibzm3wXoBIuQqgLUmPJoahJybupIRJegvx2C433w+PU=; 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=HHf7o0SzZJXpL8XKOW0wW6OaNg4Q74Q1+h4LlLFfz1o=; b=l CRCswn/kr0VxgmpoecKWRsh2OTcVO9/D3EKUTBgL5pubMwyRdu/0Rlvr14B5fZoDAdPDIBWu1TgXh /bKYuhC4d5A2atbMUOXo/j03ZoFyYzPJrDsoiHEKw3G9kmdYuUgowPEGoQIS5tEyaI72wCyWJNqcb 2ptczdGO9g3nC/h4=; Received: from mail-wm1-f45.google.com ([209.85.128.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1smb8v-0005p2-Vw for openvpn-devel@lists.sourceforge.net; Fri, 06 Sep 2024 15:45:02 +0000 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-42bb8c6e250so17330055e9.1 for ; Fri, 06 Sep 2024 08:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1725637490; x=1726242290; 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=HHf7o0SzZJXpL8XKOW0wW6OaNg4Q74Q1+h4LlLFfz1o=; b=Hbojj7nEjgRYzk6PCjZWhfqxnqehZ3JobvpB2J6MPT51hylCRTCeZD9Sv+vqpOFnE7 ZMr3m99pSdulO1PWQ6P+jAchH8+13Qn3HXBQW9DXvIQkcyLgJ7tEXGCCMIelsa0tLWL9 JJ7vg7gUxhWXiQqnlGEgcrErpI2zp6mwlPPjLEGu3OKJNsTJGwz0ahG8fe3/ZJXdshPI Oo5TuMpr4kATGh2h0kDPf9TkwoUabdCJQeHD89KaH+bq6khjmuj0yoKk8afHLru7DQsJ 3nclQZftOGcC7vMq28/usjET8v/c89o7LcgMDZvLt5TvcbF1WKKbxNMZG0hdCHCVzgni TjMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725637490; x=1726242290; 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=HHf7o0SzZJXpL8XKOW0wW6OaNg4Q74Q1+h4LlLFfz1o=; b=EyN/sq2kn1JLawiLvTtsSdC/kDqfoXyAeVppXYuwc3feUmPFeWxAjMCduI16kbyYvQ GQ2gSkADc8oTbDHhPegvuY0XZ4tEUaG/08jfcfkbP/zhX2d51978Olp6bmD3GhoHpz+Y O0PXrY6L/99gfXAhZS+xzOgufxqzAlw1T16sSKDYP/+JCMQY8o9VRsyzKnoUhfNsXZ1o F0+r9OF6Y8bCF+Fh5DmlDR5nNuAhIvDJgduGB8UTDi60cvXY2Y1U5tWNP3L3n3D0t5e/ gPYlUnk/J4KYvF/rsePvSAeQk54n3kOAFH4AHew4nLfl5IjhbNdpHL5Sev0/iyVU4xOO cXKA== X-Gm-Message-State: AOJu0YxinIzYkLzA0ip1HTcSVDXIy58esUokcOBy8ZXENdy6z9GurOBA uW70YUKL0UxqfYSH4PXCHKFLapW7z0ELvbYvhcz+dLJUVnNG/SIZ+i8i8lVeXxeCLGcQ7m/b3Fh u X-Received: by 2002:a05:600c:3483:b0:426:5440:854a with SMTP id 5b1f17b1804b1-42c9f97b8abmr22922235e9.1.1725637489276; Fri, 06 Sep 2024 08:44:49 -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-42ca05ccf01sm23764645e9.20.2024.09.06.08.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 08:44:49 -0700 (PDT) From: "ralf_lici (Code Review)" X-Google-Original-From: "ralf_lici (Code Review)" X-Gerrit-PatchSet: 1 Date: Fri, 6 Sep 2024 15:44:48 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I2f55eabd0e950edc3fbcd08b257257cf9ed9c8d8 X-Gerrit-Change-Number: 736 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 4db3fbc527712dfe914dd4a3b70308bf8e521f82 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.128.45 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.45 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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_EF Message has a valid DKIM or DK signature from envelope-from domain -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.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1smb8v-0005p2-Vw Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Minor fix on ifconfig parameter warning 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?1809462093182441137?= X-GMAIL-MSGID: =?utf-8?q?1809462093182441137?= 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/+/736?usp=email to review the following change. Change subject: Minor fix on ifconfig parameter warning ...................................................................... Minor fix on ifconfig parameter warning Handle the case of tun device and subnet topology in ifconfig_sanity_check(). Emit a warning if the second parameter of ifconfig doesn't look like a netmask. Change-Id: I2f55eabd0e950edc3fbcd08b257257cf9ed9c8d8 Signed-off-by: Ralf Lici --- M src/openvpn/tun.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/736/1 diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index ce3d882..875f558 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -510,20 +510,21 @@ { struct gc_arena gc = gc_new(); const bool looks_like_netmask = ((addr & 0xFF000000) == 0xFF000000); - if (tun) + if (tun && (topology == TOP_NET30 || topology == TOP_P2P)) { - if (looks_like_netmask && (topology == TOP_NET30 || topology == TOP_P2P)) + if (looks_like_netmask) { msg(M_WARN, "WARNING: Since you are using --dev tun with a point-to-point topology, the second argument to --ifconfig must be an IP address. You are using something (%s) that looks more like a netmask. %s", print_in_addr_t(addr, 0, &gc), ifconfig_warn_how_to_silence); } } - else /* tap */ + else /* tap or tun with subnet topology */ { if (!looks_like_netmask) { - msg(M_WARN, "WARNING: Since you are using --dev tap, the second argument to --ifconfig must be a netmask, for example something like 255.255.255.0. %s", + msg(M_WARN, "WARNING: Since you are using --dev %s, the second argument to --ifconfig must be a netmask, for example something like 255.255.255.0. %s", + tun ? "tun with a subnet topology" : "tap", ifconfig_warn_how_to_silence); } }