From nobody Tue Nov 12 03:28:15 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 4XnX1X25Vmz5d3vX; Tue, 12 Nov 2024 03:28:16 +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 4XnX1X1Hwyz45cQ; Tue, 12 Nov 2024 03:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731382096; 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=UU0Lg9yY9OucJsI07CVoMGHxpkO/rytDOmoaiH9+LOM=; b=i1pauqMmmr105iSIVYzilFR58ZPpulPmw/UQEEEGQ4xD+Cuesg20Lf7TXGdSPY1mEEGzOS 9AHO/4uKrYCpxOd1rq7QupZnFkuUO4C4WGbw0HjNH8F7WhYnOr4NR98k/UN7bd4Lgg83V5 OWtP0o1dMBdfW4q0r6A9+pAhaGYCaMjn1pHjYC8eOjNVZOc9C95+XUgoVw8L0tnovs6G1y LlXRHLDkzee2MfKEGqbMckduFAmY1Q6byJ3llcwoClnxkFdTsVB+eaqDVbv8/kpHIt9EYq ErcN+kr5fQd7y7BFpp3l5P52p5xQ8n8c2kCrN1HG4ornIu/l7k5N4tdR5uQxZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731382096; 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=UU0Lg9yY9OucJsI07CVoMGHxpkO/rytDOmoaiH9+LOM=; b=lKfWVxNOnb8TTIEP1pZLecfDGPSSE6DEuVDe8achTRqgnuraffmTmST202z+5rc524Tsny BimtTgWyqTokTVXO/bKkAiykEFpWzn5700p0cyu7UdTxtHv4YI5lrESWPJkcUqOLTitaVX ExTiorgSz3CHO6aAwXUP867H6QoZ7zS7wctgUHqKUaIAdCVSk6BevuRcYxfeP2u7TD2DKX RHf8nd49lMVx9dlCjIXTIWaZ3UXfNmtZUN0XzkolJxwe3r9KadXAEgoZWhHIsBdzRFkRqt Feo/WH4rhjtD1SIjEZwr1BsDpimSzc2ShlCLbdk7x8lvsHBVU1ENkvssrThiIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731382096; a=rsa-sha256; cv=none; b=wGvdWK5T12ieWVAaSjaLMxIOVAF22gWpMmb9kyOWKvV+C2SvWbtumuk0AZFZZykYPoFkYl +cYrJFgFsyj6XOj7zkNy6v8TPZc+QA3EDwlHJ2SvKKd8I0Zo8HDUOj6qR5z2X3wkHEaJVE IPZ06VPf1kB6D7f0lWgzJ8VpMcVHXPyDv8WmKRcP104w41IiWaFXfMBkEJHGw01WDgchXH b50dGfIUCEDGeywnedy+16QnbUP6zDGO06SelBxBKxBwpnRUXJtgTbmudJ5kYzTaxVky0l I439/tB6gIjd5jmjExRCfCUIXZ/fY4bfoFdzBBcywzjUxtkRnwYCKz+ycHkSiA== 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 4XnX1X0N7Hzt9S; Tue, 12 Nov 2024 03:28:16 +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 4AC3SFH6077978; Tue, 12 Nov 2024 03:28:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AC3SFs1077975; Tue, 12 Nov 2024 03:28:15 GMT (envelope-from git) Date: Tue, 12 Nov 2024 03:28:15 GMT Message-Id: <202411120328.4AC3SFs1077975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 470c680cfbf5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 470c680cfbf5f6cd9ac392b210b97b41d02cd969 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=470c680cfbf5f6cd9ac392b210b97b41d02cd969 commit 470c680cfbf5f6cd9ac392b210b97b41d02cd969 Author: Cy Schubert AuthorDate: 2024-11-07 01:26:37 +0000 Commit: Cy Schubert CommitDate: 2024-11-12 03:15:45 +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. MFC after: 1 week --- 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)); }