From patchwork Tue Sep 2 11:59:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4388 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:2a1c:b0:671:5a2c:6455 with SMTP id k28csp1851826maz; Tue, 2 Sep 2025 07:36:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGkdnV57srO9dEWU3NCS/M8fmWj4oOwlsfsl0wqTxRqrv9nVZC9XHNisv0vEmR5ZsE7cKscSKTXn8=@openvpn.net X-Google-Smtp-Source: AGHT+IHwXnitdeV5xo5bUpg6rQgwtA7qizFMbv5ndlpCE80mUpZoNXkDbaSn7AYaHNMT/uDY0sPv X-Received: by 2002:a05:6871:2210:b0:314:b635:d7a7 with SMTP id 586e51a60fabf-319633cba75mr5872568fac.41.1756823759793; Tue, 02 Sep 2025 07:35:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1756823759; cv=none; d=google.com; s=arc-20240605; b=M8Jds4Kj3/KeHqR0T6THBibpn5r4eivTXdPqRHMsB9lOhDsisTNUBVfqCLyg0xDz/5 7AzxDVpPeww+7aF4Siv64i/3Q4KJvXUZOKgLLrlnyKRnREozPFiB35atP/61qbaxRgbL PgPyjzykKFlHV3M+XcevpQTHGu4u7FKvnMv6MKImFHvgf92V9QZ9k1t+E5O7LBuoqOOO 1X3z4tRGjAV076r0ggIx9iPsW9g20viZwi/u+ONYlxt8H2dqK5J/AkF43zPB8Dpuq6yv 5q8m2ko2+/rvNEjQ2zbiiWE4WxmLfYzEfbXAxU8I8RV35nFqIgblyisjCQbTM9+G7boK OgzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature; bh=KpU+pNH1dqJYAWnV2ZYgGqs6WL1G5V+EfpBiQLlhrmc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=ZK3jQBckQ6dFSDmYE4rCl5IDrFC5Pdrz/iivHQrXwgjtefZVMIauwASUflNsKPhEcE YV3t2Gt28gLPfelXTKrSmwCsOoUhnhsOteVJL+xiafOA4nUR1Po6RP+80BeXGJp08hJ4 wIu/farv0W9XzPOm0ryaImRTGuIxZilehZ3K8/CxfYXWx/hG64r2GFU0uOMwkeDslGSW nAv92gGFr0KHabVBBa4dHxHQSCALY1gTOG9Biv9dEI4Sha8AOs8u8tcrIZGJc6NAxuJj f4mlsXlS2fn7pBnNUg/teQDqTX1Qj4QtFhKw9AYv1lPTXsL1pST4njZvt3cKGWuSZEIg +X2g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=IfU49ABV; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KEnHkzmH; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=gQxGrJP3; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-319b6127b33si438029fac.400.2025.09.02.07.35.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2025 07:35:58 -0700 (PDT) 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=pass header.i=@lists.sourceforge.net header.s=beta header.b=IfU49ABV; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KEnHkzmH; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=gQxGrJP3; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KpU+pNH1dqJYAWnV2ZYgGqs6WL1G5V+EfpBiQLlhrmc=; b=IfU49ABVrlq98Pq3SCG4dk3eWW UfaKT7zC/jG8aozNEha5DdbfFg0MmCA3JaSuwh+OJxO3HyhBk1Gg9WWG9e9LZAMml/TpEprXHjDT9 O3V186apMMM46oVp19jEryoc0OM7g2slrJPWV88vAGOOMtqKiVqrk9o/5MvrLAx9NZLM=; 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.95) (envelope-from ) id 1utS6z-00035Q-7z; Tue, 02 Sep 2025 14:35:53 +0000 Received: from [172.30.29.66] (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.95) (envelope-from ) id 1utS6w-00034D-Nm for openvpn-devel@lists.sourceforge.net; Tue, 02 Sep 2025 14:35:50 +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=dtAN83aT5oijBMCEyMRq5FG50/EII798p0Jkt/2szkc=; b=KEnHkzmHxnsNVNXtNXTsiqObu9 bD/7LGTZWueTibE/0vW5s4G9QOp5crvz0CTWTLysp9kLFqqA5iiNJIe1WYA48o38U2WwAmvMO49zS VXmqNc3Ixg6FcWGgcrXf+zT5xHpVSoq0hsvetynS7tIbH2xbSsWK3kOD/f2JaFdyy5jE=; 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=dtAN83aT5oijBMCEyMRq5FG50/EII798p0Jkt/2szkc=; b=gQxGrJP3Fbgd1PhHPVhiE/2w8m +n/InREjwXgoM+ZjUgo5KzwMoUnWGqU2FbVmx92rrg1FMCmg44MY7ygovQD+haRRTTjaq5b3japTE CLifxt7GWhVVYXSyHyU9eU34TtJ3CItcvJi842DKnxisjQJWE4Vh7gd/lOLTMWo4yG6g=; Received: from [193.149.48.143] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1utS6v-00085W-US for openvpn-devel@lists.sourceforge.net; Tue, 02 Sep 2025 14:35:50 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 582BxtJ3029038 for ; Tue, 2 Sep 2025 13:59:55 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 582BxtxT029037 for openvpn-devel@lists.sourceforge.net; Tue, 2 Sep 2025 13:59:55 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 2 Sep 2025 13:59:49 +0200 Message-ID: <20250902115954.29021-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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: Gianmarco De Gregori On float, a new prefix is generated which leads to a mismatch between the current and previous peer-id being logged. To avoid this, the M_NOIPREFIX flag is now used along with msglevel. Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1utS6v-00085W-US Subject: [Openvpn-devel] [PATCH v1] dco: avoid printing mi prefix on float 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?1842163229519395873?= X-GMAIL-MSGID: =?utf-8?q?1842163229519395873?= From: Gianmarco De Gregori On float, a new prefix is generated which leads to a mismatch between the current and previous peer-id being logged. To avoid this, the M_NOIPREFIX flag is now used along with msglevel. Change-Id: I84a73d625c79d6a6a19122e48c91960dbe01ec49 Signed-off-by: Gianmarco De Gregori Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1158 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index a3907fe..6115d51 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -548,7 +548,7 @@ int dco_del_peer(dco_context_t *dco, unsigned int peerid) { - msg(D_DCO_DEBUG, "%s: peer-id %d", __func__, peerid); + msg(D_DCO_DEBUG | M_NOIPREFIX, "%s: peer-id %d", __func__, peerid); struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_DEL); if (!nl_msg) @@ -868,7 +868,7 @@ uint32_t peer_id = nla_get_u32(tb_peer[OVPN_A_PEER_ID]); struct context_2 *c2; - msg(D_DCO_DEBUG, "%s: parsing message for peer %u...", __func__, peer_id); + msg(D_DCO_DEBUG | M_NOIPREFIX, "%s: parsing message for peer %u...", __func__, peer_id); if (dco->ifmode == OVPN_MODE_P2P) { @@ -890,7 +890,7 @@ struct multi_instance *mi = dco->c->multi->instances[peer_id]; if (!mi) { - msg(M_WARN, "%s: received data for a non-existing peer %u", __func__, peer_id); + msg(M_WARN | M_NOIPREFIX, "%s: received data for a non-existing peer %u", __func__, peer_id); return NL_SKIP; } @@ -934,32 +934,32 @@ if (!attrs[OVPN_A_PEER]) { - msg(D_DCO, "ovpn-dco: no peer in PEER_DEL_NTF message"); + msg(D_DCO | M_NOIPREFIX, "ovpn-dco: no peer in PEER_DEL_NTF message"); return NL_STOP; } struct nlattr *dp_attrs[OVPN_A_PEER_MAX + 1]; if (nla_parse_nested(dp_attrs, OVPN_A_PEER_MAX, attrs[OVPN_A_PEER], NULL)) { - msg(D_DCO, "ovpn-dco: can't parse peer in PEER_DEL_NTF messsage"); + msg(D_DCO | M_NOIPREFIX, "ovpn-dco: can't parse peer in PEER_DEL_NTF messsage"); return NL_STOP; } if (!dp_attrs[OVPN_A_PEER_DEL_REASON]) { - msg(D_DCO, "ovpn-dco: no reason in PEER_DEL_NTF message"); + msg(D_DCO | M_NOIPREFIX, "ovpn-dco: no reason in PEER_DEL_NTF message"); return NL_STOP; } if (!dp_attrs[OVPN_A_PEER_ID]) { - msg(D_DCO, "ovpn-dco: no peer-id in PEER_DEL_NTF message"); + msg(D_DCO | M_NOIPREFIX, "ovpn-dco: no peer-id in PEER_DEL_NTF message"); return NL_STOP; } int reason = nla_get_u32(dp_attrs[OVPN_A_PEER_DEL_REASON]); unsigned int peerid = nla_get_u32(dp_attrs[OVPN_A_PEER_ID]); - msg(D_DCO_DEBUG, "ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, peer-id %u, reason: %d", + msg(D_DCO_DEBUG | M_NOIPREFIX, "ovpn-dco: received CMD_PEER_DEL_NTF, ifindex: %d, peer-id %u, reason: %d", dco->ifindex, peerid, reason); dco->dco_message_peer_id = peerid; dco->dco_del_peer_reason = reason; @@ -1065,7 +1065,7 @@ struct nlmsghdr *nlh = nlmsg_hdr(msg); struct genlmsghdr *gnlh = genlmsg_hdr(nlh); - msg(D_DCO_DEBUG, "ovpn-dco: received netlink message type=%u cmd=%u flags=%#.4x", + msg(D_DCO_DEBUG | M_NOIPREFIX, "ovpn-dco: received netlink message type=%u cmd=%u flags=%#.4x", nlh->nlmsg_type, gnlh->cmd, nlh->nlmsg_flags); /* if we get a message from the NLCTRL family, it means @@ -1148,7 +1148,7 @@ return 0; } - msg(D_DCO_DEBUG, "%s: peer-id %d", __func__, peer_id); + msg(D_DCO_DEBUG | M_NOIPREFIX, "%s: peer-id %d", __func__, peer_id); struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET); struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER); diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c index 5f5a808..ecea635 100644 --- a/src/openvpn/sig.c +++ b/src/openvpn/sig.c @@ -239,7 +239,7 @@ { si->source = SIG_SOURCE_CONNECTION_FAILED; } - msg(D_SIGNAL_DEBUG, "register signal: %s (%s)", signal_name(signum, true), signal_text); + msg(D_SIGNAL_DEBUG | M_NOIPREFIX, "register signal: %s (%s)", signal_name(signum, true), signal_text); } else {