From patchwork Tue Dec 13 22:01:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2903 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:622a:418d:b0:3a5:7962:c21f with SMTP id cd13csp3004731qtb; Tue, 13 Dec 2022 14:02:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf5N1/Ilxp53yIiQ+KUCDk75GQJ8/sSkqO3g5hO1535CRDZ+8FwJAb1y+YqKUKuaiVhrZu+s X-Received: by 2002:a17:90b:2752:b0:212:e5f8:524e with SMTP id qi18-20020a17090b275200b00212e5f8524emr22720458pjb.25.1670968939140; Tue, 13 Dec 2022 14:02:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670968939; cv=none; d=google.com; s=arc-20160816; b=m2lmNJumLwksJ1pH+eGqkO9zZmXz7eBEETsZqy0UqnruLJKRsL9Rn5J+xgGzjI2XA3 n9ollDzVW6gRtjcOw9VyQPb5CbHdbxOUAgrMW2d97cNRGxn25Hw4agSCn8m0ygSgQ+rE BzlKszKARbI2yerXf2p9zKj1OU2Oea5nJpMv9JNni9EbsyjFrFDVwC/zgRT/1i5fGlSg cnW4S8/h+7ys/wVGcl9ewvOaj6aYY1Q92+9x/GQXB4+kQI3o4tteKwPoG7xMkT8/2nxq i74I/pjEAXMReN8eiib+Nx6gGslED+FiV88Lc/Sw3PhP7buBsevM+vg+dLQAm/qBIFjg 6tvA== 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=5PbJ4Dca+WtFijA5cPtO0ZXz3P4047a/sFRVuj6ZNdc=; b=MCBY+x3bIPCsQiNV56zEUk5XMCO5qsHDpj4hj++Or134YEMObNV70S7Eh/BYBiPFzf Xq72FzfZn5Iu8CWWgYJboASenutlvOGu4/Kg68vjZpkgKYYssI7xEIL0ra7r9X9dSCVx zi7Tcc2Wq1LGwEnQWyiQe/K3Pk9u7vU3ID8K2ddDI4ZqFv30t/9puseDLjpvhzQx4duO pV6SVAYsjog/wsK3O2sskAH14jhbjO3OqoNxYDI1j4e3jFapGB0q/yiir+HLUpJnbJDe sTey7MpCy7a1fPCnProJjFJVdOm7bXuRVpANe/2CsTAGebIwPS967+PPTFeKSoIUboqw FQdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=FMHdBkZp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OVriuZsi; 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 np9-20020a17090b4c4900b0020af2b9dd80si82215pjb.69.2022.12.13.14.02.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 14:02:19 -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=FMHdBkZp; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OVriuZsi; 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1p5DLX-0004dw-JK; Tue, 13 Dec 2022 22:01:55 +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.95) (envelope-from ) id 1p5DLV-0004dq-41 for openvpn-devel@lists.sourceforge.net; Tue, 13 Dec 2022 22:01: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=W1CHK+qZAVGKXY73GmtWQlwV4oxE4YUdDJXCAVCwLkA=; b=FMHdBkZpfQ3W7npW4MoSzvwv5S UbNhkz415xSPsBeoEuOFx0UzZOcJRUCb4/vcE6bsH6wmXtj+NN8I9AifhJypu7JjOOkEx4PICJOTf ZVkSx6QRYgkWRJQ028hCR89gE5wiNgUKqD3trUcPTblpOhAOuZYE8e3FcoE/louH2gYU=; 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=W1CHK+qZAVGKXY73GmtWQlwV4oxE4YUdDJXCAVCwLkA=; b=OVriuZsiq++meDBh3oifu70Ywo OLnKY6Fu8yDu4F7Bmw73/hNBVdQ/RPOmacSMdrkjR6bjmlurfikpxn8ph2g8wsPKx2qWh19hYMmnZ zh0ejT/2XmcRKOqAUZCbVe11N4HrzKDju/Tiy3hYY1B81OsS+2t/VQGe7Wm34zlWSFIU=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1p5DLR-00GGce-Pt for openvpn-devel@lists.sourceforge.net; Tue, 13 Dec 2022 22:01:53 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1p5DLF-0009c5-4F for openvpn-devel@lists.sourceforge.net; Tue, 13 Dec 2022 23:01:37 +0100 Received: (nullmailer pid 1888536 invoked by uid 10006); Tue, 13 Dec 2022 22:01:37 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 13 Dec 2022 23:01:37 +0100 Message-Id: <20221213220137.1888490-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220909195902.2011798-1-arne@rfc2549.org> References: <20220909195902.2011798-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Score: 0.3 (/) 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: Signed-off-by: Arne Schwabe --- src/openvpn/dco.c | 7 ++++--- src/openvpn/dco_linux.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index feb38cd02..5cce3f641 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -55,8 +55,8 @@ dco_install_key(struct tls_multi *multi, struct k [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1p5DLR-00GGce-Pt Subject: [Openvpn-devel] [PATCH] Improve debug logging of DCO on Linux 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?1752137926643480928?= X-GMAIL-MSGID: =?utf-8?q?1752137926643480928?= Signed-off-by: Arne Schwabe --- src/openvpn/dco.c | 7 ++++--- src/openvpn/dco_linux.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index feb38cd02..5cce3f641 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -55,8 +55,8 @@ dco_install_key(struct tls_multi *multi, struct key_state *ks, const char *ciphername) { - msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d", __func__, multi->dco_peer_id, - ks->key_id); + msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d, currently installed %d", + __func__, multi->dco_peer_id, ks->key_id, multi->dco_keys_installed); /* Install a key in the PRIMARY slot only when no other key exist. * From that moment on, any new key will be installed in the SECONDARY @@ -181,7 +181,8 @@ dco_update_keys(dco_context_t *dco, struct tls_multi *multi) */ if (primary->dco_status == DCO_INSTALLED_SECONDARY) { - msg(D_DCO_DEBUG, "Swapping primary and secondary keys, now: id1=%d id2=%d", + msg(D_DCO_DEBUG, "Swapping primary and secondary keys, pre swap: " + "key-id1=%d key-id2=%d", primary->key_id, secondary ? secondary->key_id : -1); int ret = dco_swap_keys(dco, multi->dco_peer_id); diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 109358205..fbd940c28 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -216,9 +216,15 @@ dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd, struct sockaddr *localaddr, struct sockaddr *remoteaddr, struct in_addr *remote_in4, struct in6_addr *remote_in6) { - msg(D_DCO_DEBUG, "%s: peer-id %d, fd %d", __func__, peerid, sd); - struct gc_arena gc = gc_new(); + const char *remotestr = "[undefined]"; + if (remoteaddr) + { + remotestr = print_sockaddr(remoteaddr, &gc); + } + msg(D_DCO_DEBUG, "%s: peer-id %d, fd %d, remote addr: %s", __func__, + peerid, sd, remotestr); + struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_NEW_PEER); struct nlattr *attr = nla_nest_start(nl_msg, OVPN_ATTR_NEW_PEER); int ret = -EMSGSIZE;