From nobody Tue Nov 19 00:28:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xslhb2gWzz5dGbV; Tue, 19 Nov 2024 00:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xslhb0J2xz4gML; Tue, 19 Nov 2024 00:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T0quof4F9oTxIhqvpfU0/V9P9SzzLqFjBEIg4S9n3c=; b=gyXyeTh8hJXOoJB1blfVH2Ocb+PB1tfvneIaSA3nzEypgqmj4rlcaEC+cVrEDToW9dvlzn gow26jnfkxaTYth7KDxALs6bb6/j9gr0r5SnJbRRtAYtOac6JSmtFlgmQqu04K/8J76WU2 RouxYacbfbctOJjKtROoa+6z6AFBew7uVSYegx8kGIMtw9q2d4hcYc9foApXCBSBYbvVGJ 5YfsavamONN1nflqyGGIDcQRf+Gbemzsxm2a1buQRHwFHXxV1DiiwPkxTnbhkWDjwmJiCQ jZVb5L/+wmEKRYIGL/H7N0U3I8XHimQGvOXJguXSUV/Jm2dKVCyN3Pz1czlw/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T0quof4F9oTxIhqvpfU0/V9P9SzzLqFjBEIg4S9n3c=; b=spXwTwd+C9pAEQhS/9X+L08RT1eqSDQsRdbd6G35jXSVwLNhjYeTTz+amJl2w/6BNm17s2 jgMuMcCzAy3GAOiKraiARJB5ZUh47ELts3nHdcSc2ShtOYAArmbUN7btDF9ioTfCl6qB4X 554UsuQqdPtR0OOYbUPcMLw1OY6Dujb3Bpb9peYHpRMecGgnmZ2sAc9MPCMpPGP6YQK/MU 9I0LCDOyZbFrDMbKBQCOguECrPD+qq4SId553xYDRUwb7wTKF93/bRCZd93ONpZZTvtASV eHod6EVh7GkEXhFgOOPs4yalMSzDlrFw6sWZY0lLon+4Fa8hVYHr4bAyoAESUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731976095; a=rsa-sha256; cv=none; b=ns9qz4e/63H4DOz7eVhqjYzgFhT1D+jAtPwC4V55GO4zXK/nrb4W0xHvvAKdZWyOZG3A7n 4kzGmsjI/5m+3Qk/wpVeiXNoDjcsH27w+bi//WKO396SVrtEDgGME/dW6SSQzPH6x0Z03d cLf2HRHLLbaqdnIvMEXMrtWzuzBh7eyEDL5/wcdUB0nh4WyRJhOVLDdaBMMK8C2FQ0WKWq J4jcbAlEmHmuS/TcJXaGyAVhGfbd6aTSFGfzkZLCrUS4d8PrKF1QUI+R41w4khWUloWISX zcny3aknuuaNE7KO57zjM7V+P7Fnjf3R3ENlE97Saj/CdJFVUhEcx2JQqyr+AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XslhZ71fDz12t6; Tue, 19 Nov 2024 00:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJ0SEqp064660; Tue, 19 Nov 2024 00:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ0SE26064657; Tue, 19 Nov 2024 00:28:14 GMT (envelope-from git) Date: Tue, 19 Nov 2024 00:28:14 GMT Message-Id: <202411190028.4AJ0SE26064657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: ed2ecba890e5 - stable/13 - ipfilter: Print the pool name when adding a poolnode fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed2ecba890e58c6164fb5f21a89119bb8347c088 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ed2ecba890e58c6164fb5f21a89119bb8347c088 commit ed2ecba890e58c6164fb5f21a89119bb8347c088 Author: Cy Schubert AuthorDate: 2024-11-07 01:26:37 +0000 Commit: Cy Schubert CommitDate: 2024-11-19 00:27:07 +0000 ipfilter: Print the pool name when adding a poolnode fails Printing the pool node (IP address) only leads to speculation which pool the failed add occurred. This is especially useful when the same IP address is listed in multiple pools. (cherry picked from commit 470c680cfbf5f6cd9ac392b210b97b41d02cd969) --- sbin/ipf/libipf/load_poolnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/load_poolnode.c b/sbin/ipf/libipf/load_poolnode.c index 8d65f019da43..7a01da9df94b 100644 --- a/sbin/ipf/libipf/load_poolnode.c +++ b/sbin/ipf/libipf/load_poolnode.c @@ -54,8 +54,8 @@ load_poolnode(int role, char *name, ip_pool_node_t *node, int ttl, if ((opts & OPT_DONOTHING) == 0) { char msg[255]; - snprintf(msg, sizeof(msg), "%s pool node(%s/", what, - inet_ntoa(pn.ipn_addr.adf_addr.in4)); + snprintf(msg, sizeof(msg), "%s pool(%s) node(%s/", what, + name, inet_ntoa(pn.ipn_addr.adf_addr.in4)); strlcat(msg, inet_ntoa(pn.ipn_mask.adf_addr.in4), sizeof(msg)); return (ipf_perror_fd(pool_fd(), iocfunc, msg)); }