From patchwork Tue Feb 22 02:16:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost via Openvpn-devel X-Patchwork-Id: 2315 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.27.255.7]) by backend41.mail.ord1d.rsapps.net with LMTP id gN3WDELpFGJAHQAAqwncew (envelope-from ) for ; Tue, 22 Feb 2022 08:46:42 -0500 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.7]) by director15.mail.ord1d.rsapps.net with LMTP id 6LpCJELpFGL3UQAAIcMcQg (envelope-from ) for ; Tue, 22 Feb 2022 08:46:42 -0500 Received: from smtp50.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTPS id yEnmG0LpFGKzWgAAYaqY3Q (envelope-from ) for ; Tue, 22 Feb 2022 08:46:42 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp50.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=netgate.com; dmarc=pass (p=none; dis=none) header.from=lists.sourceforge.net X-Suspicious-Flag: YES X-Classification-ID: dd5865c0-93e5-11ec-bc6a-525400c2fb51-1-1 Received: from [216.105.38.7] ([216.105.38.7:41268] helo=lists.sourceforge.net) by smtp50.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1B/4B-32285-149E4126; Tue, 22 Feb 2022 08:46:42 -0500 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.94.2) (envelope-from ) id 1nMVUJ-0005A8-VR; Tue, 22 Feb 2022 13:45:54 +0000 Received: from [172.30.20.202] (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.94.2) (envelope-from ) id 1nMVUI-00059t-VG for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:45:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hP+fZFO6ROYV1qCtbHfno64N8vsXEh6PaoJuzPMLtyc=; b=Ypn0YrnzVP6xa6BoMoGVjcS/xl 6BGjANl9W0waRgsV5qDRu30yFkr95duC5L+JsOFqsfaaa4NdfnhhNYykLF7TZ8wTsb8EgP9EScq4k dxkS+T13OcYboMaPtVJYGbsrFmgfMt9nJU5TXbojMlL/JemkqF44xiH7jWKJNkm7NdJk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hP+fZFO6ROYV1qCtbHfno64N8vsXEh6PaoJuzPMLtyc=; b=OS8OyJCv42Ex8twjLrnQfada0h XwYXjEKvVyqXiiaHxWb5+mvORgG8AyWlVJxhyMC80/joaGSBCD3D8Ra8wEJCMFNfNHnlXO+DwjBTG piPLM049oKywrzL+Iut5OwCT1q17kLpfnzA3KFVICzyeEQvqtCkKMqFHoHwcDIC3pd7U=; Received: from mail-lj1-f180.google.com ([209.85.208.180]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nMVUG-0008M6-Ih for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:45:53 +0000 Received: by mail-lj1-f180.google.com with SMTP id p20so11242449ljo.0 for ; Tue, 22 Feb 2022 05:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hP+fZFO6ROYV1qCtbHfno64N8vsXEh6PaoJuzPMLtyc=; b=QsJh8zkIr7EYd1spC3Gw8us2QOKT0/3zdD0aWIWB0oCK5Y8xOo5u0e7poR0SJQNx36 CGXI4UN2aqIid4INmWoNlu4/6L6WQMoGujqGLnsC5RygZwA/BGXtOEV2MGOXGpPSapAS 1XWKmQw5CPjK+GLrd1t0+scDsUOpyMgf6hTH4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hP+fZFO6ROYV1qCtbHfno64N8vsXEh6PaoJuzPMLtyc=; b=g/m418jQ9wOI22kuOuQRLlWj6snrwsfVJiHP9Ulfy5gvXkHQvyOPXb9hjv37+sXGK+ ei9jRRiOwK7Hhuf7sXHnv1qlzS3iM5aU2xkS9+lKnE83mlnuCYbk7Wb0X6+zdgnxjOsw 2gNhmgi+C8L2a6vr4bU1EK9I+Oy0BQN9B0wimlhjHaz8FW3fkgd7ihHjhNvpnIBi+eAC tinZNRBoxzzSOevZpGznJPlesntl+zUcKm7eX1bIyqrSeoGSnHAoSCjN6fxWA0WL0vAf ZfiS6nHv1An/dpJvbCiQ0RgZLqu8jCt11hjDpkdHG7cdqBYSFQpFax6MCGTANOOA3QIN g2eg== X-Gm-Message-State: AOAM531Wki8XwjUpzU6J34eU4b/BSN4fGIu/z2Fo/TY//ifbzZv/Cm/6 KwSsqw5OM3OcI0V+bsRPXuBdvobEsQSZP8wf X-Google-Smtp-Source: ABdhPJxK6qVvJO8itPf0FPyfoqIB3vd38b3WMLgsGA4uQF+U27kIbh11euLYy0Qz05iK4h29ssi97w== X-Received: by 2002:a05:6402:42c9:b0:407:f86c:44e7 with SMTP id i9-20020a05640242c900b00407f86c44e7mr26497929edc.230.1645535823200; Tue, 22 Feb 2022 05:17:03 -0800 (PST) Received: from nut.jupiter.sigsegv.be (ptr-8rgvk5277arubwggeqg.18120a2.ip6.access.telenet.be. [2a02:1811:240d:2900:f602:70ff:feae:6e98]) by smtp.googlemail.com with ESMTPSA id z6sm6302170ejd.96.2022.02.22.05.17.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:17:02 -0800 (PST) To: openvpn-devel Date: Tue, 22 Feb 2022 14:16:57 +0100 Message-Id: <20220222131657.6616-4-kprovost@netgate.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222131657.6616-1-kprovost@netgate.com> References: <20220222131657.6616-1-kprovost@netgate.com> MIME-Version: 1.0 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: From: Kristof Provost If IP_RECVDSTADDR exists we'll define ENABLE_IP_PKTINFO, but that doesn't actually mean we have struct in_pktinfo. We need to check HAVE_IN_PKTINFO for that. This fixes DCO builds on FreeBSD. 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.208.180 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.180 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -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 X-Headers-End: 1nMVUG-0008M6-Ih Subject: [Openvpn-devel] [PATCH 3/3] dco: Check for ipi_addr before using it 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: , X-Patchwork-Original-From: Kristof Provost via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Kristof Provost Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Kristof Provost If IP_RECVDSTADDR exists we'll define ENABLE_IP_PKTINFO, but that doesn't actually mean we have struct in_pktinfo. We need to check HAVE_IN_PKTINFO for that. This fixes DCO builds on FreeBSD. Signed-off-by: Kristof Provost --- src/openvpn/dco.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 0ce03664..4234bb22 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -44,7 +44,7 @@ static bool dco_multi_get_localaddr(struct multi_context *m, struct multi_instance *mi, struct sockaddr_storage *local) { -#if ENABLE_IP_PKTINFO +#if ENABLE_IP_PKTINFO && defined(HAVE_IN_PKTINFO) struct context *c = &mi->context; if (!(c->options.sockflags & SF_USE_IP_PKTINFO))