From patchwork Fri Jan 5 13:57:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 3553 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:2791:b0:100:d2e5:60d with SMTP id hm17csp3813426dyb; Fri, 5 Jan 2024 06:57:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6pcwKQpg7xzvBg62cAezhhBbJAe+RrgaNRz/IgbgGiQvu6wayh12qAXi395puQCW91w+g X-Received: by 2002:a17:90a:d344:b0:28d:136c:8859 with SMTP id i4-20020a17090ad34400b0028d136c8859mr759907pjx.3.1704466642759; Fri, 05 Jan 2024 06:57:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704466642; cv=none; d=google.com; s=arc-20160816; b=OZQbdFpiYG8pOZXO4G3SbAIcDQMmIjOB6hzbMFD8WknLY8ZHJtlzQr+/vitRUGkgh4 hSv3xOxpUney/e+oHbHVobvCdtUeGh1e6o1/wnB1a/3gM+KVohza9DJMjIPbC8JkHGwJ xhZsXEAvIGPNkmBen3HqcQO/SqKbclngGvvOZktLqRUJG6uXMPvsVxolu8ORl5+1ANLI 7t8cizZ/LB0fBW9eomF/sTXV6mSa8VA5dXBsVOnJ/77EBj+tPGBZaJtuNIaRLBAEhztl 6vQ4bB/jYNb7eo6NotpdIuZtBVYByhizrhjrWKZXjFIhYj3Al8KEi9ZZoi/mjjXeGLoN Zvbg== 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:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=hGWG5N/XUKYK1KYNLWlYPTiQIM8Xexrs5IKlQjgtZHk=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=A7HRKsU7HNSWAEVcBxl7o5D666fINpd90ovF/Z0RE74hlfOQzNZap3j6Kr9iKryNfZ rnQkDDY/saUMi6Vwqet7YE64SiwbzExBghtlNF7Y7rK+h/umQMdYynliaFpWap3lATSc MPfZwFn7e6441x6IXrLepiCq1Wv6H3ety2esWk17shIqD59v4Dv4dFYxNBcdU4YuJ5br dLxQidkqyBVj6nTdw3MHbHy1XX54gpa5MaIzEpHc+y1shG/PPe0lL3w4WRzkvl3P9ewB 5Lm308l6jvL60Y+lA/o8d3gkVaxz5Ld2B9L1pLR2mvLi6PYokEyhXUqICvlxmA/9rLet tbLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="k3i4P//2"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=TXUnMaIF; dkim=neutral (body hash did not verify) header.i=@karger-me.20230601.gappssmtp.com header.s=20230601 header.b=AcHP5mxL; 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=karger.me Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id gq11-20020a17090b104b00b0028bd08246f2si927123pjb.49.2024.01.05.06.57.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2024 06:57:22 -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="k3i4P//2"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=TXUnMaIF; dkim=neutral (body hash did not verify) header.i=@karger-me.20230601.gappssmtp.com header.s=20230601 header.b=AcHP5mxL; 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=karger.me 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 1rLld7-0000Va-ID; Fri, 05 Jan 2024 14:57:01 +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.95) (envelope-from ) id 1rLld5-0000VM-R4 for openvpn-devel@lists.sourceforge.net; Fri, 05 Jan 2024 14:56: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: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=/fyXjtgzj7WKL2HYe6ui4bXRGSb4pupokYOuR2MMxZ4=; b=k3i4P//2RaE4F92wYZIR8j0B5k Si5vDY78r8FxfD97khnoGn3HX6zkM2Sv3CvhKf+W17eg2Jf4zRb3WrkuM3dt505ajrbJdCmEZ0mF1 djGnLbIlpdtlI30KGV0n73rcyJAY0SuBk8qW92FCDErXSj8n4T1NBVMIZSb7cnagStsA=; 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=/fyXjtgzj7WKL2HYe6ui4bXRGSb4pupokYOuR2MMxZ4=; b=T XUnMaIFeu+AVN2cgVSIjVd1z0rFdcVyoA3M/72KIuO1iJCRS36TshQ+xtbij3C0rBbV9QlwUElvEN BKFLLlhG0WxitvyDAHEE0jbPG5MYMoHNIs3vzS/o8MkLRcTrQXikVtZJiUAernDjPX5jahD4LinRV gOh5yorGg8Xf/ons=; 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.95) id 1rLld4-0004dW-Dk for openvpn-devel@lists.sourceforge.net; Fri, 05 Jan 2024 14:56:59 +0000 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40d8ccfe921so2632635e9.0 for ; Fri, 05 Jan 2024 06:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20230601.gappssmtp.com; s=20230601; t=1704466607; x=1705071407; darn=lists.sourceforge.net; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/fyXjtgzj7WKL2HYe6ui4bXRGSb4pupokYOuR2MMxZ4=; b=AcHP5mxLn1T+yLvqrusA1+XPDg8u2VHWUIQqqXKZvoPaTGV/kOo9943OLz+gSuc9Pn myVoy0tkxDTzCO6IoHApCMZB2+FWLLyPEFUE+F/bqma6Q1buXVyHkl/dO7OWFepBV+wO HKxMoXITWqjFHFX2JziR1nOEtl2XLc2IuLKvQoRIWJuYudyh6Yt5vmBl9usuDAViGXGC VYcUVgRJWMW9LaRsKhzYh1HXG3hPz+O7z0f/BmjgoPCHX9ZH3fX46vIdipstRugdnM2N JuozV3VStRYe7uCqG1ewc1+WfSTD5JHo5ujKrkkvo2jkqkgrVc3jk/5BHOHQKqTULI/P PW/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704466607; x=1705071407; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/fyXjtgzj7WKL2HYe6ui4bXRGSb4pupokYOuR2MMxZ4=; b=mgKRQCkgi1+dKaGav4Ci5j/bO97pOzBasB+zhkUFUV/vagfJysoiMzhwSqfMKgqOzE eNF9wPhyRasqw7o5ncgkbfKPwJAZMePqqx1o/uU7SqUnFyd0v8rN4bPwmo82TKB5TCns mMLpnJjX5DgmixBeH9qTVB2tPIFFrw6lXIXLZLHSfZBRoD4QrjJAFHvae3gFWb0Bf9Bt m5He0cFuueblcxywvzV3eyCeJQ74KqaKEfeEZqm03foAgQsVAJSjhF8PxdGrCU3idx1O jy4wKvcMVFza9H9+IfFEkUBATVxtqwTXFNejj7MzsCi286+0LGwtHnQokHQyi0bxMJzw ts0A== X-Gm-Message-State: AOJu0YzRLpIVcfeNOVHP2nhNJh4srSRHvkZ1YsaV+iAztB/EbVd9d3yn LguP737XFaE+grEs1LNH5zWt3xnK89Y8gohcDLO0O/cpP6M= X-Received: by 2002:a17:907:971c:b0:a23:704e:8bb0 with SMTP id jg28-20020a170907971c00b00a23704e8bb0mr2944728ejc.0.1704463066302; Fri, 05 Jan 2024 05:57:46 -0800 (PST) Received: from luna.fritz.box ([2a10:3781:b67:1:3b95:96c0:1e09:cef7]) by smtp.gmail.com with ESMTPSA id k16-20020a1709063fd000b00a28f3edc4bfsm905817ejj.42.2024.01.05.05.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 05:57:45 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Fri, 5 Jan 2024 14:57:42 +0100 Message-Id: <20240105135742.21174-1-steffan@karger.me> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Score: -0.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: We have D_ROUTE for route addition/deletion messages, which prints at loglevel 3. Use that for IPv6, like we do for IPv4 to reduce terminal spam for non-legacy-networking setups. Prvious code would pr [...] Content analysis details: (-0.0 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_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 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rLld4-0004dW-Dk Subject: [Openvpn-devel] [PATCH] Fix IPv6 route add/delete message log level 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?1787262814188843428?= X-GMAIL-MSGID: =?utf-8?q?1787262814188843428?= We have D_ROUTE for route addition/deletion messages, which prints at loglevel 3. Use that for IPv6, like we do for IPv4 to reduce terminal spam for non-legacy-networking setups. Prvious code would print the messages at --verb 1. Signed-off-by: Steffan Karger Acked-By: Gert Doering --- src/openvpn/route.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 2f472a1f..e784782b 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1940,10 +1940,10 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, #endif #ifndef _WIN32 - msg( M_INFO, "add_route_ipv6(%s/%d -> %s metric %d) dev %s", + msg(D_ROUTE, "add_route_ipv6(%s/%d -> %s metric %d) dev %s", network, r6->netbits, gateway, r6->metric, device ); #else - msg( M_INFO, "add_route_ipv6(%s/%d -> %s metric %d) IF %lu", + msg(D_ROUTE, "add_route_ipv6(%s/%d -> %s metric %d) IF %lu", network, r6->netbits, gateway, r6->metric, r6->adapter_index ? r6->adapter_index : tt->adapter_index); #endif @@ -2394,7 +2394,7 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt, } #endif - msg( M_INFO, "delete_route_ipv6(%s/%d)", network, r6->netbits ); + msg(D_ROUTE, "delete_route_ipv6(%s/%d)", network, r6->netbits ); #if defined(TARGET_LINUX) int metric = -1;