From nobody Tue Dec 21 23:37:58 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 45C991902BEF; Tue, 21 Dec 2021 23:38:00 +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 4JJXvB5kJCz3rD3; Tue, 21 Dec 2021 23:37:58 +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 23065130C0; Tue, 21 Dec 2021 23:37:58 +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 1BLNbw7e050148; Tue, 21 Dec 2021 23:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLNbwGE050147; Tue, 21 Dec 2021 23:37:58 GMT (envelope-from git) Date: Tue, 21 Dec 2021 23:37:58 GMT Message-Id: <202112212337.1BLNbwGE050147@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: 5b44879e7727 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 5b44879e772740db85c377bde046a4be6034c465 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640129879; 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=c5LW42icv2oSFbz9MnqUzkbC6SksFfNRZEDomO/HctA=; b=RDmguCjxt8vsCwg0GvT9Tk2O/bV2WEnXjksPp9UovUkkChv63tsrVwcL02XIjatjU8rB00 wR6AiyARs7aUrzmIE2yT+it97mBifeAAvjVzv+3SEk1fb2GzXTiVzjOLoeK9jPJIgSNfzR uEph5Pz0TdyosNCxh65IV4I1X8k/z64RuKt2Akrd9msPaIPFFGXF96xUPCTqwyjgllWl9n rZQ4S7qoX06q7roLPWYM+Cejf8BtJVEPgPJzSJn6pvGf5/JAHhM0pjdzGRfozdkzXf5UXM kmAPEdpSXuBvCw+So9V0HsSpyDGyAOwG7+foaeFa6dJOdflIaPAPLmG+PpB9fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640129879; a=rsa-sha256; cv=none; b=gpq16k78sod5ZpUfRN8Pw/gNReClSQWsBUdC0N+f4kVJ2lhjFatpLsHB9qVkr1ubCDVF0A sasghZgoWqrnT6oSNYUjQTXzKgfhXM7uTLeE7t+l4Smdm/fz8SuIPTpkiRPxdDf2Go68DE XocDoiG/VJO+2l9B/PDRZaYdrqs7tgn7NsuJQppmct7XBeVV5WMdlcJPGV71ay2bF6hAw3 d3KJXUoUktYjTEM6vPcKAUhHoywhfcs/NrfY9HEoP8N4KOgsFXEvRBIFgb5ufvHVdirkZy oz+NWv0RdZ+5iJsQfk/LRF12DI56DQ8uqSWsKmgSCX56lL5K6bIQhhbAvdoo+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5b44879e772740db85c377bde046a4be6034c465 commit 5b44879e772740db85c377bde046a4be6034c465 Author: Cy Schubert AuthorDate: 2021-12-13 21:18:04 +0000 Commit: Cy Schubert CommitDate: 2021-12-21 23:37:24 +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); }