From nobody Tue Nov 19 00:26:47 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 4Xslfv5JWLz5dlJM; Tue, 19 Nov 2024 00:26:47 +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 4Xslfv3BQWz4dPP; Tue, 19 Nov 2024 00:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976007; 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=w93Tl6Fl7fiK2kxQxmGyPsIJMZqZcHCrTEFGwbjhUaQ=; b=wIkfpvZ/H8VR+NM47VWuMNtQDmPeadbSQHxqFC8RHjU5mKHRvElkCvnH69Lj/h6VlBi+uC KytXyLUxgU9r02SJ4mM08Ztnj7pUP6AE3bJaqkIrC/eX4AUHm3tTVwJBOXPpuPmrorJbtj ytwXg3dFCvHLBzQFFx2bYIIdhHaWM8kWoPi1mg+xXBrmektFpqOnpMzk73vU/c4nT91BQq WABV+VRcTa2hpM+ryYA2whqzaUCanEZW/tSopUWngUi7MbHOUTY8CkBcIYkJGhM6+hWIFD SKK5xokZstoq78vec6Q4+za9+CXOpxvruQFYZZXqSLH5m+2lkKmzK8+a7bUlMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976007; 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=w93Tl6Fl7fiK2kxQxmGyPsIJMZqZcHCrTEFGwbjhUaQ=; b=PyNOiWPWt4DDiOOAS8DB2JXYrWA3eJGzF3iTrkc/SVXR2eFW/0sY/gwoHtEgN/4Ts/Vg6R wCHQRtlB3DmeLNn9+oB7ppm2DgDvCYiBdiqG+GF/zXjeYT/p/a0KRHnyWa1EUWLLzP8y3P DjyTJ8gKmpv1ctr2pMrTEWG57yDW++m79itF+K6VVbcV+TQqpEzkMXwaUeoYwQ7U8Fwp3Q 6Ad1ZfTjVksDsSHDya4PXqslcyzqe9hz0nMAGTl3BkXNfe1wfjOyrV2AEeuExlk2dQWgVV SA+xIDT/at7asTB1hgca9Cp+mh/TGN6OdGVostinhOEEg/pfWdkz2+D8lWNgMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731976007; a=rsa-sha256; cv=none; b=vSwZUzC2ZB5xm6DBBnbj95ep3WGQL6W+SUc+xxyL5U9RtZsOq4ifgpQ6/CyWiUDl+l08Vo qRV+RlgYdkzQsWl+qwkNT8rAEOQ2mcEwqQLsR1VSDjP9HhEmSG9oIRL+ISizFeuZ/pxtCQ c/oThUBd7xQev20KAhuw1PIRlXyfYFYgT0dRG9iiGxFNQr9mVXEkQu8/JbACufwd11fNyq 94RLMGltF1e4jcFA0Hpi4t6+DZRIBU4mDANvYqcvV+GAgbgUSnRXzyfGbXBXl0aVkghKyv ZGJAD5nyImXeZDRX4MoIgK22heQyqPXCxfHYXftMi8198VH2qTl0mo+ydfbXSg== 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 4Xslfv2nzfz12qQ; Tue, 19 Nov 2024 00:26:47 +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 4AJ0Ql2o063694; Tue, 19 Nov 2024 00:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ0Ql4C063691; Tue, 19 Nov 2024 00:26:47 GMT (envelope-from git) Date: Tue, 19 Nov 2024 00:26:47 GMT Message-Id: <202411190026.4AJ0Ql4C063691@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: c6385ba2c9ff - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c6385ba2c9ff20d6cdc4ff673ff993a1adbd49a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c6385ba2c9ff20d6cdc4ff673ff993a1adbd49a2 commit c6385ba2c9ff20d6cdc4ff673ff993a1adbd49a2 Author: Cy Schubert AuthorDate: 2024-11-07 01:26:37 +0000 Commit: Cy Schubert CommitDate: 2024-11-19 00:26:04 +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)); }