From patchwork Tue Feb 22 02:16:55 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: 2316 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id KOS5ArXpFGKlHwAAqwncew (envelope-from ) for ; Tue, 22 Feb 2022 08:48:37 -0500 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id UNkBG7XpFGLPSwAA91zNiA (envelope-from ) for ; Tue, 22 Feb 2022 08:48:37 -0500 Received: from smtp24.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTPS id ENGVGrXpFGLZLwAATCaURg (envelope-from ) for ; Tue, 22 Feb 2022 08:48:37 -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: smtp24.gate.ord1c.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: 1ed164fc-93e6-11ec-aab2-b8ca3a674470-1-1 Received: from [216.105.38.7] ([216.105.38.7:35150] helo=lists.sourceforge.net) by smtp24.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 39/7E-36340-FA9E4126; Tue, 22 Feb 2022 08:48:31 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nMVW7-0000Th-Oa; Tue, 22 Feb 2022 13:47:46 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nMVW6-0000Tb-80 for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:47:45 +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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=MLvCzSSc/MLLdkNo12Tm69bpiO zBux47VaD9LaffjtCPy0DUZuj0RsOWHYZEjEiPdgOVAvrMwQM792AVDu2bggs9icyIefHicmCjhV9 I7khaR+t/5aOI0Dri4KIPop7cFgWMHQsOzRCeHmdu3qDHLECeBlZkA6O72rn70btJ7O4=; 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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=hqx/ewYDloaCTBZE/QBC8VR8YF bmhbpZqBD70h3hBCyUR1zz/5zDodQ5ynPJqO/rYQZ5yn7GCCTsyHrYuS38p78LSteoYyuQeyABG4D OtcGefh0EdLapjx6NuI17CDlp+xXaUKQg/rh0/X1HbMyj67agxV5z7Za3dGoS1tF1jZc=; Received: from mail-ej1-f52.google.com ([209.85.218.52]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nMVW4-0008Sz-6q for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:47:44 +0000 Received: by mail-ej1-f52.google.com with SMTP id hw13so42887631ejc.9 for ; Tue, 22 Feb 2022 05:47:44 -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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=VzhZ43H+V9+FKySs69NFn0kjoEST6GWPE9vqTGBTH01Kuesr9wlrtzcGm1LItHZU+K 4HVKhUHqXyHO/T2VV95nOdfQf3jNmKaL9p5zPqOpnUCvL1dKsy3pAPSfQXY5GdCFn6JG pQpt74WYlzFZflpsPfQXF2TPF7wmkqDVvyJug= 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=74M2B/wGHTq8ACsqjXMwt0oClAO+2MgNhSjW1zajAj4=; b=2ixiosX6+wWQC31BHTjVoSeiVhpvmTxrurjcJ5nXf2TuuSTQAOjQwh+vJeRIVMUTJr tx4b+nllGDB0v7SEWS9pdbwr6BdG2S3byWXdsh0DWERaGKjDmalyUZ1lvFdag4QlBoxt qXGBMRQr/QrD8kArFoaQR67ysU7ASpgKlkafbpyVXkkXaPflFQReU636Jrr/LmiOdCSq j1Dcl44YcF4RzgMhLV9kWFW8LlS2JrYkdsjcxw7do8dy5X3zbz9oBiTI1ugbVIIo4GS0 igP3+LbqPFM9a6f1xmleE8PHhPZDz8dN9ey3+OnYM5nJKmJWZaGWK+YSYAxm4avtOTpK M9ww== X-Gm-Message-State: AOAM5303NK8BKgzhtQcYwAiIC9P0JkntlFz9pKpx5LWewGoQylbMhyF+ kW011J84t9FiqvIucBfyebP96iQZ1CofZL3t X-Google-Smtp-Source: ABdhPJxZsfgmMN7J179RNxeqY5whCNvZLWMKxDjcfiK+Lt1VwW7EaxbBBCgfoO+sF82GFKChxELhww== X-Received: by 2002:a17:906:e244:b0:6cd:24e3:ab8b with SMTP id gq4-20020a170906e24400b006cd24e3ab8bmr18877881ejb.633.1645535821744; Tue, 22 Feb 2022 05:17:01 -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.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:17:01 -0800 (PST) To: openvpn-devel Date: Tue, 22 Feb 2022 14:16:55 +0100 Message-Id: <20220222131657.6616-2-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-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: From: Kristof Provost Fix typo in variable name. Signed-off-by: Kristof Provost --- src/openvpn/dco_linux.c | 6 +++--- src/openvpn/dco_linux.h | 2 +- src/openvpn/multi.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.52 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.52 listed in wl.mailspike.net] -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_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.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nMVW4-0008Sz-6q Subject: [Openvpn-devel] [PATCH 1/3] dco: dco_meesage_peer_id -> dco_message_peer_id 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 Fix typo in variable name. Signed-off-by: Kristof Provost --- src/openvpn/dco_linux.c | 6 +++--- src/openvpn/dco_linux.h | 2 +- src/openvpn/multi.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 9fddb788..341e9ae7 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -436,7 +436,7 @@ open_tun_dco(struct tuntap *tt, openvpn_net_ctx_t *ctx, const char *dev) tt->actual_name = string_alloc(dev, NULL); uint8_t *dcobuf = malloc(65536); buf_set_write(&tt->dco.dco_packet_in, dcobuf, 65536); - tt->dco.dco_meesage_peer_id = -1; + tt->dco.dco_message_peer_id = -1; ovpn_dco_register(&tt->dco); @@ -742,7 +742,7 @@ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) msg(D_DCO_DEBUG, "ovpn-dco: received CMD_DEL_PEER, ifindex: %d, peer-id %d, reason: %d", ifindex, peerid, reason); - dco->dco_meesage_peer_id = peerid; + dco->dco_message_peer_id = peerid; dco->dco_del_peer_reason = reason; dco->dco_message_type = OVPN_CMD_DEL_PEER; @@ -788,7 +788,7 @@ static int ovpn_handle_msg(struct nl_msg *msg, void *arg) } buf_init(&dco->dco_packet_in, 0); buf_write(&dco->dco_packet_in, data, len); - dco->dco_meesage_peer_id = peerid; + dco->dco_message_peer_id = peerid; dco->dco_message_type = OVPN_CMD_PACKET; break; } diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 94e1a522..61d07a55 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -51,7 +51,7 @@ typedef struct struct buffer dco_packet_in; int dco_message_type; - int dco_meesage_peer_id; + int dco_message_peer_id; int dco_del_peer_reason; } dco_context_t; diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index cf44dd58..30489038 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3124,7 +3124,7 @@ static void process_incoming_dco_packet(struct multi_context *m, struct multi_instance *mi, dco_context_t *dco) { struct buffer orig_buf = mi->context.c2.buf; - int peer_id = dco->dco_meesage_peer_id; + int peer_id = dco->dco_message_peer_id; mi->context.c2.buf = dco->dco_packet_in; @@ -3184,7 +3184,7 @@ multi_process_incoming_dco(struct multi_context *m) int ret = dco_do_read(&m->top.c1.tuntap->dco); - int peer_id = dco->dco_meesage_peer_id; + int peer_id = dco->dco_message_peer_id; if ((peer_id >= 0) && (peer_id < m->max_clients) && (m->instances[peer_id])) { @@ -3204,7 +3204,7 @@ multi_process_incoming_dco(struct multi_context *m) } dco->dco_message_type = 0; - dco->dco_meesage_peer_id = -1; + dco->dco_message_peer_id = -1; return ret > 0; } #endif From patchwork Tue Feb 22 02:16:56 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: 2314 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.27.255.55]) by backend41.mail.ord1d.rsapps.net with LMTP id SEtAJ0DpFGJUHQAAqwncew (envelope-from ) for ; Tue, 22 Feb 2022 08:46:40 -0500 Received: from proxy12.mail.iad3a.rsapps.net ([172.27.255.55]) by director11.mail.ord1d.rsapps.net with LMTP id iL0lA0HpFGL5eAAAvGGmqA (envelope-from ) for ; Tue, 22 Feb 2022 08:46:41 -0500 Received: from smtp49.gate.iad3a ([172.27.255.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.iad3a.rsapps.net with LMTPS id YDp6NkDpFGKRUAAAh9K5Vw (envelope-from ) for ; Tue, 22 Feb 2022 08:46:40 -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: smtp49.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: dc95efb8-93e5-11ec-a8a2-525400fffce0-1-1 Received: from [216.105.38.7] ([216.105.38.7:41256] helo=lists.sourceforge.net) by smtp49.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 2E/AF-11802-049E4126; Tue, 22 Feb 2022 08:46:40 -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 1nMVUI-00059n-S8; Tue, 22 Feb 2022 13:45:53 +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-00059c-39 for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:45:52 +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=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=WEEfZBeznBLTz3ovJvzRMG5o4W MkgnkGJVQ6g4NEPcYMvNG+N8ZgsiCyhVZfWVh7YWu9gs858DG74Kx3bHOjWNEojyzy/JGls7PIQeM IRgfPYyCa8pallKmKtYlbCBk/8lu32LE31aji4A8zx2vdcgEygjZZVPdFnhZlAtbr8Cs=; 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=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=flkHyjKwDZPTa5huMiZSlhplKr ydYne4LZlgtQZo1UonChiI0CsQNcLuEKDe/Coi3MgKMZ2wBFQiU2hWyp4bsF+VwuPp1a2XWdx4yiN udcPoJPOwhbGUUyN44gwMem2wBdw0kCdjnSdD16mv6i4Aj56CNMTsM7vkZaRGj6TFEMU=; 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 1nMVUF-0008M0-ST for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:45:52 +0000 Received: by mail-lj1-f180.google.com with SMTP id p20so11242360ljo.0 for ; Tue, 22 Feb 2022 05:45:51 -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=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=TWCrNArj6yMj7nWYdLmLS0RRe/ryvZpyYansKhTTzAKy5TLjKpI6kzNMn+P58g8LP3 3l2mIBYm5KjDM4fFE9aMLpv+zAUgH1Fp5vspZs02qKckbcESw3K2TN6vafpsajl2uIsH z9eiko/GsTZuhdRhe8yrEjCC1Qf+J1TJWd2SE= 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=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=jNSA44uRTji3qWW3/O1myRZXZFKjl2/ZAeJoOyXHG2CH9neBNgc9UIgJgJZh83Htcd fWbwVwt1bBtbbkNqQ1SdzIjFrSrQlUdLnjHAQ3Z0xa7rWPXtDJvNUNeASrOhMZzGsdFq yoaB91djyDl4jfHIuFEIfHAJArRBQp8/JwJ5d5oYY3MFj5/htdiqJqT5iVPex+LKLBM8 BxSZNdVIvKKhZjvGOJJnyMDXFrZNqfClYInWdu4RfMOhwdHzkl0xFAwmCC09mXSH40gP +pih4gz0gOqOnTlybRoow/Nvn7OI1p++6c1tQBsMoc+GEqGzXz2uSxJXyVOHH4hJhJ6v xzHQ== X-Gm-Message-State: AOAM531jq93k/hzwgDrnNg50pLFU721V3MNSvtF6B+BUXUNWo/EGfo7e YFPa5/XaeMeA5JTxhG6nSDY1bi8b9dou+u9G X-Google-Smtp-Source: ABdhPJzUHgQmBuk+4f3ahXFzeVDIGAcvYIGFN3J49QNj2MYIFU+eUS6psdSpc/hSo485LSViON1xAQ== X-Received: by 2002:a50:fc09:0:b0:40f:e199:b266 with SMTP id i9-20020a50fc09000000b0040fe199b266mr25826493edr.350.1645535822464; Tue, 22 Feb 2022 05:17:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:17:01 -0800 (PST) To: openvpn-devel Date: Tue, 22 Feb 2022 14:16:56 +0100 Message-Id: <20220222131657.6616-3-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-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: From: Kristof Provost It seems clear that the intent here is to special case the EEXIST error, not the consider anything else (i.e. 0) to also be an error. Signed-off-by: Kristof Provost --- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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_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.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nMVUF-0008M0-ST Subject: [Openvpn-devel] [PATCH 2/3] open_tun_generic(): Do not consider open_tun_dco() returning 0 to be an error 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 It seems clear that the intent here is to special case the EEXIST error, not the consider anything else (i.e. 0) to also be an error. Signed-off-by: Kristof Provost --- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index f9ba3858..d8f2dea7 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1841,7 +1841,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node, dynamic_name); tt->persistent_if = true; } - else + else if (ret != 0) { msg(M_ERR, "Cannot open TUN/TAP dev %s: %d", dynamic_name, ret); } 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))