From nobody Tue Dec 21 23:35:21 2021 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 B88F81900CBC; Tue, 21 Dec 2021 23:35:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJXr92xtQz3pbV; Tue, 21 Dec 2021 23:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3A85412C75; Tue, 21 Dec 2021 23:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLNZLGR049557; Tue, 21 Dec 2021 23:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLNZLrx049556; Tue, 21 Dec 2021 23:35:21 GMT (envelope-from git) Date: Tue, 21 Dec 2021 23:35:21 GMT Message-Id: <202112212335.1BLNZLrx049556@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: 1a1f6850734b - stable/13 - ipfilter radix_ipf: name is only valid with RDX_DEBUG 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1a1f6850734b4bfe9ad8c04b483844441037bbe2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640129721; 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=kS40+Xt9XCgpmjCrOjIHVm7J2Lu8mOUODOvH4Nnrhi0=; b=i8AW+Av6tBdN/Ouf4Rtz13UaDSLRKtK2+jgWeAVqUHokKZUGol+AFSP5wB7JVDzLBqerMI gQj3XZTJFfJgAwUnpXLV178ZH4pKdNOEMUOSKXwCjd2c8+OgwC06RravHsgEWRtBKrTFSB rfIPbGL6Qp33/tCivtykmEIjZQXEqox4FVWGJ/Kt+u3UtiNvuS3ktU0UAUabkL2TCRg7gA maL/tzSeoowADzq6Y6F4rtzd+f/oNwNQY4lp78HEWh0ToKuT2mgxEMAYkcBSsWTx0H2DA5 qH5ZgPvsMYFA33WG0HvPEITAQjoaG24ZpLUrHTIm7H2MmVa7s5WCXpa18OWIWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640129721; a=rsa-sha256; cv=none; b=RE/8PO86e4kpKErmbOzFoIUCcJHIz2Qy6ZUWhGSfoHp+AotKIGhEa2Kz1/X1m1Dihjpt1h 3ll0UsVhRqKr+pc6yoyoCEGopdEOtfGbfrfZTRzsMOqRH/+oY2v7AmYlmLy8vJ5u/Iuach mNrt/StE8LryjQ5sH4xuwurrw3uOsZieENafxrBp85miDdoNeqz8NoqwZnfos+ut3kw/r/ 4FNU6yWFQzpxe2swsCHboUqPEM2GUeBv8PH50EwpRSkUuTz4hFEaarumAi+SmHpGimokwR mxB5SY/4aCFlBCq21nCSpA+mLH4+5lUlZs/j0t8VzzznGh2iHzqu2e7uf9+VLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1f6850734b4bfe9ad8c04b483844441037bbe2 commit 1a1f6850734b4bfe9ad8c04b483844441037bbe2 Author: Cy Schubert AuthorDate: 2021-12-13 21:18:04 +0000 Commit: Cy Schubert CommitDate: 2021-12-21 23:34:40 +0000 ipfilter radix_ipf: name is only valid with RDX_DEBUG ipf_rdx_node.name is only vaild when RDX_DEBUG is defined. (cherry picked from commit e263821feacf59a14e9d648d9631c64b579021d5) --- sys/contrib/ipfilter/netinet/radix_ipf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.c b/sys/contrib/ipfilter/netinet/radix_ipf.c index df0932de4181..9dc606bb8a11 100644 --- a/sys/contrib/ipfilter/netinet/radix_ipf.c +++ b/sys/contrib/ipfilter/netinet/radix_ipf.c @@ -1420,12 +1420,14 @@ add_addr(rnh, n, item) setmask(&stp->mask, ttable[item].mask); stp->next = myst_top; myst_top = stp; +#ifdef RDX_DEBUG (void) sprintf(rn[0].name, "_BORN.0"); (void) sprintf(rn[1].name, "_BORN.1"); rn = ipf_rx_addroute(rnh, &stp->dst, &stp->mask, stp->nodes); (void) sprintf(rn[0].name, "%d_NODE.0", item); (void) sprintf(rn[1].name, "%d_NODE.1", item); printf("ADD %d/%d %s/%s\n", n, item, rn[0].name, rn[1].name); +#endif nodecount++; checktree(rnh); }