From patchwork Fri Feb 3 19:14:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3043 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1375693dyk; Fri, 3 Feb 2023 11:15:21 -0800 (PST) X-Google-Smtp-Source: AK7set+FYCR1u2YWyEARKTD/n9DedJqN8+mLQiY+RbTIlVQTl70eu70Tl0chU31NDs6P5ZfQzcQH X-Received: by 2002:a17:903:246:b0:198:a715:d26d with SMTP id j6-20020a170903024600b00198a715d26dmr13592462plh.8.1675451721595; Fri, 03 Feb 2023 11:15:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675451721; cv=none; d=google.com; s=arc-20160816; b=OSIoyZTbT2Yv09MBNQ9h5F4wL1nhwUZ9xf5d6eXwaQk0LhVfj4NpdfTqi3EwhlfwUE DTenIRSZNS3UvLEYot67Iu/SZm63+CCZYFmnb/fq4F0B2gEW+vCNSuTAFAy+uMYzyo/p KFLaMp3xDjSb/t8Ni/0CQ3tb9NBF1aY+CIsQar6072N7bOWcyXpUAuaFZDARPzsgJ1m9 YDRqoBnUq8L8Yti8QaP2w8ufZu/DDH1uq/57E7oBgZrdBA+YstzOEkXvA+r16WweXJ6i IJYZW01z6wA6eIuEeL35FV8uZTpEThmvMv0WakWCh3oHNZle5XfEIR5MEagZGw5Nz3vf N29Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=AG3I1lcOV7WcaUfYhJUTWoPmXIs7GEFhq1fRnsIOlKE=; b=EsTK8EngyD2HbvVaSpu5Z9B6M2jfttv9uQT48sj7q2LJ64S8xBrfsc8OCeUNGNEbVx wukpEFjMV6cQGfqFC68TxQKM4HX1PcdCcfsRQQIMBXD0tE+3L5dn8+rxMQqtoJCJkJ0C qBxROU5XUEJ0bU8aiSX/GwHnfWESEVLwEFp9IPmbbhCpv00d9tmSrBOdI+DHV0BUKikX 6NtM/SzgPo34z5dxJsF2xC0/H0maMJposxl+Y0aSdnU+qSrSD270G36GL1yGnTX6iqXU sNvQvZEpUDfgTuxUfIreqDNYni773E3fujurr9jUnEbtaoY2nohzaMgS7IHynngpdI3m KpUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HvaAMoIg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=X2dInAb2; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id k18-20020a170902761200b00198ee9e1397si230318pll.406.2023.02.03.11.15.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 11:15:21 -0800 (PST) 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=HvaAMoIg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=X2dInAb2; 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 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 1pO1WY-0007r4-7n; Fri, 03 Feb 2023 19:15:01 +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.95) (envelope-from ) id 1pO1WW-0007qr-CT for openvpn-devel@lists.sourceforge.net; Fri, 03 Feb 2023 19:14:59 +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=LVekO2S9gaNwk+swxuHxAqHZg2PE85anb7FMe9ipl7E=; b=HvaAMoIgeZUg1qVuUkZ8BZ/+bW Q26HwTBU74tkorcEauS1dITF57mgzpTV59fxTbgqcrb9XDiRQ7k91DuwgDbxjbYMC8IXWUVI8wz3C gW7rGogTwBsQ5VClqsPI6HoXzA4L0d6/SzZPz8+40l8KqrFg3lIi1Cpq2UMhskDapGyE=; 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=LVekO2S9gaNwk+swxuHxAqHZg2PE85anb7FMe9ipl7E=; b=X2dInAb2+Xhf0MmUUlukTD9YSj c4bJUkqEGB1f7mN2HEVVZLRm/39m5G3PNejoXnxrkR+aEm/pKU1PIQhmPQIK+KKtHtdjl4cxW954W BBkXeuob4yeNKPnVCwtNFHOMXFeK2eUnB9CyphA9jtPvco3Sri7ZVKDkqbfO35rPrmJA=; Received: from mout-p-102.mailbox.org ([80.241.56.152]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pO1WP-00015A-9P for openvpn-devel@lists.sourceforge.net; Fri, 03 Feb 2023 19:14:59 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4P7lhg1d36z9swr for ; Fri, 3 Feb 2023 20:14:43 +0100 (CET) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Feb 2023 20:14:38 +0100 Message-Id: <20230203191440.136050-4-frank@lichtenheld.com> In-Reply-To: <20230203191440.136050-1-frank@lichtenheld.com> References: <20230203191440.136050-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Spam-Score: -0.7 (/) 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: Signed-off-by: Frank Lichtenheld --- src/openvpn/error.c | 4 ++-- src/openvpn/syshead.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openvpn/error.c b/src/openvpn/error.c index 89a08cec..a2c9aa4c 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -695,14 +695,14 @@ x_check_status(int status, { if (extend [...] Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.152 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pO1WP-00015A-9P Subject: [Openvpn-devel] [PATCH 3/5] Windows: fix wrong printf format in x_check_status 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 X-GMAIL-THRID: =?utf-8?q?1756838464263155759?= X-GMAIL-MSGID: =?utf-8?q?1756838464263155759?= Signed-off-by: Frank Lichtenheld --- src/openvpn/error.c | 4 ++-- src/openvpn/syshead.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openvpn/error.c b/src/openvpn/error.c index 89a08cec..a2c9aa4c 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -695,14 +695,14 @@ x_check_status(int status, { if (extended_msg) { - msg(x_cs_info_level, "%s %s [%s]: %s (fd=%d,code=%d)", description, + msg(x_cs_info_level, "%s %s [%s]: %s (fd=" SOCKET_PRINTF ",code=%d)", description, sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "", extended_msg, openvpn_strerror(my_errno, crt_error, &gc), sock ? sock->sd : -1, my_errno); } else { - msg(x_cs_info_level, "%s %s: %s (fd=%d,code=%d)", description, + msg(x_cs_info_level, "%s %s: %s (fd=" SOCKET_PRINTF ",code=%d)", description, sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "", openvpn_strerror(my_errno, crt_error, &gc), sock ? sock->sd : -1, my_errno); diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index fe91bc11..58cdd6bd 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -442,9 +442,11 @@ typedef unsigned short sa_family_t; */ #ifdef _WIN32 #define SOCKET_UNDEFINED (INVALID_SOCKET) +#define SOCKET_PRINTF "%lld" typedef SOCKET socket_descriptor_t; #else #define SOCKET_UNDEFINED (-1) +#define SOCKET_PRINTF "%d" typedef int socket_descriptor_t; #endif