From patchwork Thu Jun 16 18:13:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Ponetayev X-Patchwork-Id: 2512 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.31.255.6]) by backend41.mail.ord1d.rsapps.net with LMTP id WIBtLTkHrGIxNQAAqwncew (envelope-from ) for ; Fri, 17 Jun 2022 00:46:49 -0400 Received: from proxy4.mail.iad3b.rsapps.net ([172.31.255.6]) by director7.mail.ord1d.rsapps.net with LMTP id UKxYLTkHrGLffAAAovjBpQ (envelope-from ) for ; Fri, 17 Jun 2022 00:46:49 -0400 Received: from smtp31.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.iad3b.rsapps.net with LMTPS id QKEeKDkHrGLhUwAA9crAow (envelope-from ) for ; Fri, 17 Jun 2022 00:46:49 -0400 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: smtp31.gate.iad3b.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=ndmsystems.com; dmarc=fail (p=none; dis=none) header.from=ndmsystems.com X-Suspicious-Flag: YES X-Classification-ID: 7f60f26c-edf8-11ec-963d-52540005277f-1-1 Received: from [216.105.38.7] ([216.105.38.7:40784] helo=lists.sourceforge.net) by smtp31.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 78/4F-26534-9370CA26; Fri, 17 Jun 2022 00:46:49 -0400 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.94.2) (envelope-from ) id 1o23qT-0005fR-Lt; Fri, 17 Jun 2022 04:44:32 +0000 Received: from [172.30.20.202] (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.94.2) (envelope-from ) id 1o23qS-0005fL-Qy for openvpn-devel@lists.sourceforge.net; Fri, 17 Jun 2022 04:44:31 +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:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=lAeiIGWGxuVkAgwBNEmWkm/8Ox9LPeSisOKMbWkJHRw=; b=AO3qwLTesNFFgC8yVCeuciZIIe bcYcktM9or9OfUzXkku7UmnJ1TNfD7enqmvNzA5rQCmkq6TcOnnt4Zb7Y1MSJGhCB5mqb46ME26+F fnTaeinXgFd8iJI1VUlbrAM3rAY8OJeSNF8FvKRtSUm29RU10899VXm8r03//w95+TfY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=lAeiIGWGxuVkAgwBNEmWkm/8Ox9LPeSisOKMbWkJHRw=; b=j a0WdlgVDIiYHpqoMncA+VKrR/YaAALk+q9T9YOUTHNgxS/Ufx0PSrX3W/allL3cwC8I91TMLz5os9 u68hOB9ATPWbEOV0kRKkGTTqrgeZ0VlVlbvCv26j79dhG1xFef5ODVAUa01cFuLQdrAB8xFQadiyS ij+pXrooPVPcPeSQ=; Received: from mail-wm1-f54.google.com ([209.85.128.54]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1o23qC-0007zh-Tq for openvpn-devel@lists.sourceforge.net; Fri, 17 Jun 2022 04:44:28 +0000 Received: by mail-wm1-f54.google.com with SMTP id c130-20020a1c3588000000b0039c6fd897b4so3750410wma.4 for ; Thu, 16 Jun 2022 21:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndmsystems.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lAeiIGWGxuVkAgwBNEmWkm/8Ox9LPeSisOKMbWkJHRw=; b=eAVihgb2R/I07I39Uop0RlF15fI7O3XzJ9Tx9+ex2QWkJBk9/5jROK4NDlxEK2HlBs fSYv6uQQPag0SnttqmuIXCe5OznQfPnB0yhUu6d+pjvthlXw008jrnoENflxt+Om0Ock BB6DZ/ViIJNV1qssmk2O5n4nAlF0cp/2ryzdA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lAeiIGWGxuVkAgwBNEmWkm/8Ox9LPeSisOKMbWkJHRw=; b=Y/IwOpdoGFNYoeqP0wcWZCK+chIU9drQ17DdxbHnPTFD98GfmeDV+LvBDVDC3D2wGo HMk3op3lXAj0NtiVpro6wPbWU9XMcIvf7l9z94ogvLvGFbEVTHI3GEUj6BjDM74GvJEh m5kkwhUit2CKFigE+EKMJT+YFA25uMIBjAGuK1tMfmsCrVTUEsZWjN9hV19coiVQXckl ZDCDMgA2B5uqcIZPxwVc7bMKB1usLhr++BfsbjxDuWimH0yuWW2WYZMCMGYfA+ViTnWW MEckT9S493MbvDTlqNct2+oFyOxXYSCvApKOcfdSNqGa8Hyxmk24R51Ctak+MLKQWF0n VMZQ== X-Gm-Message-State: AOAM530VnQxGMoYyCngKx7afEnl27wp5u0pm4CZEPiNWDMgEFuhVKJvP xL9gIekWFyECDPJhnofy+yTfS2Kw4vxIxYEz X-Google-Smtp-Source: ABdhPJw/cjYXz7hUaoWgtf+pYAhtwjuaMvAJ0y9yg8YRFUXBvkx4BX3jcSAgIWwL4HZewZkeSNxfXA== X-Received: by 2002:a05:600c:228d:b0:39c:63ff:5f2 with SMTP id 13-20020a05600c228d00b0039c63ff05f2mr18916525wmf.22.1655439218498; Thu, 16 Jun 2022 21:13:38 -0700 (PDT) Received: from ilya-HP-Laptop-15s-fq2xxx.. ([178.134.109.162]) by smtp.gmail.com with ESMTPSA id d3-20020adffbc3000000b0020e6ce4dabdsm3463823wrs.103.2022.06.16.21.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 21:13:38 -0700 (PDT) From: Ilya Ponetayev To: openvpn-devel@lists.sourceforge.net Date: Fri, 17 Jun 2022 07:13:26 +0300 Message-Id: <20220617041326.2744668-1-i.ponetaev@ndmsystems.com> X-Mailer: git-send-email 2.34.1 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: --- src/openvpn/init.c | 2 +- src/openvpn/mtcp.c | 2 ++ src/openvpn/packet_id.c | 2 ++ src/openvpn/reliable.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b0c62a85..f06afc29 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2491,7 +2491,7 @@ frame_finalize_options(struct context *c, c [...] 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.54 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.54 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 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.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 X-Headers-End: 1o23qC-0007zh-Tq Subject: [Openvpn-devel] [PATCH] fix compilation issues with small and w/o debug 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox --- src/openvpn/init.c | 2 +- src/openvpn/mtcp.c | 2 ++ src/openvpn/packet_id.c | 2 ++ src/openvpn/reliable.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) Acked-By: Frank Lichtenheld diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b0c62a85..f06afc29 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2491,7 +2491,7 @@ frame_finalize_options(struct context *c, const struct options *o) size_t tailroom = headroom; #ifdef USE_COMP - msg(D_MTU_DEBUG, "MTU: adding %lu buffer tailroom for compression for %lu " + msg(D_MTU_DEBUG, "MTU: adding %zu buffer tailroom for compression for %zu " "bytes of payload", COMP_EXTRA_BUFFER(payload_size), payload_size); tailroom += COMP_EXTRA_BUFFER(payload_size); diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index b725bebb..b3c153fe 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -72,6 +72,7 @@ struct ta_iow_flags unsigned int sock; }; +#ifdef ENABLE_DEBUG static const char * pract(int action) { @@ -114,6 +115,7 @@ pract(int action) return "?"; } } +#endif /* ENABLE_DEBUG */ static struct multi_instance * multi_create_instance_tcp(struct multi_context *m) diff --git a/src/openvpn/packet_id.c b/src/openvpn/packet_id.c index e357909d..851b506c 100644 --- a/src/openvpn/packet_id.c +++ b/src/openvpn/packet_id.c @@ -53,11 +53,13 @@ #define SEQ_UNSEEN ((time_t)0) #define SEQ_EXPIRED ((time_t)1) +#ifdef ENABLE_DEBUG static void packet_id_debug_print(int msglevel, const struct packet_id_rec *p, const struct packet_id_net *pin, const char *message, int value); +#endif /* ENABLE_DEBUG */ static inline void packet_id_debug(int msglevel, diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c index 37244435..73473625 100644 --- a/src/openvpn/reliable.c +++ b/src/openvpn/reliable.c @@ -394,6 +394,7 @@ reliable_send_purge(struct reliable *rel, const struct reliable_ack *ack) } } +#ifdef ENABLE_DEBUG /* print the current sequence of active packet IDs */ static const char * reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) @@ -412,6 +413,7 @@ reliable_print_ids(const struct reliable *rel, struct gc_arena *gc) } return BSTR(&out); } +#endif /* ENABLE_DEBUG */ /* true if at least one free buffer available */ bool