From nobody Mon Jun 30 15:00:49 2025 X-Original-To: dev-commits-src-main@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 4bW8VV3t3Kz60ZMX; Mon, 30 Jun 2025 15:00:50 +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 4bW8VV00H6z3DX0; Mon, 30 Jun 2025 15:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295650; 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=zxkAjRZB19nRQJpu4LBvLHTqMNCPZZRxTbyYKPMflac=; b=jJcUimTGwM5uIYd9PlZS7dlh08i+bkCglY6KoR7bX4Bi1f6vffpw64wmFBq6FyD6o4QG/n pQSbFgLYOA9pfgauMnibMToutT1vxfJbo3uzbnqvbWwcCQAwjXePQP75V66Fcm7ou1R1q7 15FK2Rl4FiMp7enyo9rdXwBnOJj3Ji05LUPOrNpifR3pyOMaFjigYPlaWPUdi3tq9WlT9F LSOFvJKeuW+IFF57ceF0UAJ4L14gZLVYSry6G1QXLfkwy2b6B8F0J74kaAN86J0U5Jb9nE 3baEYKnnEnbsxJRuiGaG0rx05m6eK+la94gKPu9Z4QIq5Eljpf02ydkjgJ7scw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295650; 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=zxkAjRZB19nRQJpu4LBvLHTqMNCPZZRxTbyYKPMflac=; b=gnXfg8U7hm1ArN+kxSUAH9IvO0fC9+ZUJgwBQLKJ1oPgtJKVYvhikxMtGpYhdfqQ4V0vpJ MgVX7lJjxuLsxl+qk6uxD2lZ45zIF/caPNO+DR81BNT/71ysfoRLre4Yhc3j0zx4v/fWS5 7rAFfDxg1v188YBKs8r4lQycxlLekOF7vPAiysYsfgjs2MZp3PsHvBkNAOU3JGiif52xxs gfWQ5a/CzxZ3UH+L4Lvie00n9i4jvVUYBurN27dMsmEpwdVx1MoLM8lSDLCCthQX0WmVjt 6k6vFj/nJAJY1725mm41+JSpZ3IPNM8ckDPz3Fguhbr3UHCExj9oHXEx65KV+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751295650; a=rsa-sha256; cv=none; b=gPaaqXCdzeJLm/3Toc+GjLyeocbitudZ4T8ijHbnRVWL6i8ZYkeeK0DrwYFmpDDjdMP3Km VTvvsg6a0LCq2uc7qFfCQ/p8aaUEd1TeX48OZzy6wk7BAwp8Kw0sjDmCnVei8wTmWFvbnC rbRBvsS6irfUNz/EDl1JIfQz2iagjD2nEm+s5XAna/+Rn36eP3QjUyGo38c2McOaPjgGq+ GfMESqsf2sYNMcabaQTfKrnxeZJNHIHOZ9Ebji0ZiB+U7XfkeKt65dU1oTndqBRt5r/bl8 NTclwAc4zYOQuy77MULUezUiTXAaxj71V7XZceOVMG7TasAdjwLJj0uJEFaqew== 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 4bW8VT6hrWz17Nj; Mon, 30 Jun 2025 15:00:49 +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 55UF0nqa047474; Mon, 30 Jun 2025 15:00:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UF0nuL047471; Mon, 30 Jun 2025 15:00:49 GMT (envelope-from git) Date: Mon, 30 Jun 2025 15:00:49 GMT Message-Id: <202506301500.55UF0nuL047471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 466ac79e47fe - main - pfctl: Move duplicate code into new helper print_addr_str() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 466ac79e47fe6d486956096ae6724fdfd5776c39 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=466ac79e47fe6d486956096ae6724fdfd5776c39 commit 466ac79e47fe6d486956096ae6724fdfd5776c39 Author: Kristof Provost AuthorDate: 2025-06-27 09:40:31 +0000 Commit: Kristof Provost CommitDate: 2025-06-30 15:00:27 +0000 pfctl: Move duplicate code into new helper print_addr_str() This simply puts the wiggle around inet_ntop() from four into one location. OK benno Obtained from: OpenBSD, kn , 88d4e2f324 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pf_print_state.c | 34 ++++++++++++++++------------------ sbin/pfctl/pfctl.h | 1 + sbin/pfctl/pfctl_parser.c | 9 +-------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 1d2fa45cd9d7..821c0745748a 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -85,31 +85,18 @@ print_addr(struct pf_addr_wrap *addr, sa_family_t af, int verbose) printf("<%s>", addr->v.tblname); return; case PF_ADDR_RANGE: { - char buf[48]; + print_addr_str(af, &addr->v.a.addr); + printf(" - "); + print_addr_str(af, &addr->v.a.mask); - if (inet_ntop(af, &addr->v.a.addr, buf, sizeof(buf)) == NULL) - printf("?"); - else - printf("%s", buf); - if (inet_ntop(af, &addr->v.a.mask, buf, sizeof(buf)) == NULL) - printf(" - ?"); - else - printf(" - %s", buf); break; } case PF_ADDR_ADDRMASK: if (PF_AZERO(&addr->v.a.addr, AF_INET6) && PF_AZERO(&addr->v.a.mask, AF_INET6)) printf("any"); - else { - char buf[48]; - - if (inet_ntop(af, &addr->v.a.addr, buf, - sizeof(buf)) == NULL) - printf("?"); - else - printf("%s", buf); - } + else + print_addr_str(af, &addr->v.a.addr); break; case PF_ADDR_NOROUTE: printf("no-route"); @@ -133,6 +120,17 @@ print_addr(struct pf_addr_wrap *addr, sa_family_t af, int verbose) } } +void +print_addr_str(sa_family_t af, struct pf_addr *addr) +{ + static char buf[48]; + + if (inet_ntop(af, addr, buf, sizeof(buf)) == NULL) + printf("?"); + else + printf("%s", buf); +} + void print_name(struct pf_addr *addr, sa_family_t af) { diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index f4a033971865..ab24ec7174ec 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -120,6 +120,7 @@ void pfaltq_store(struct pf_altq *); char *rate2str(double); void print_addr(struct pf_addr_wrap *, sa_family_t, int); +void print_addr_str(sa_family_t, struct pf_addr *); void print_host(struct pf_addr *, u_int16_t p, sa_family_t, int); void print_seq(struct pfctl_state_peer *); void print_state(struct pfctl_state *, int); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index c475eab0de91..89960efa3ca1 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1233,15 +1233,8 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer if (PF_AZERO(&r->divert.addr, r->af)) { printf(" divert-reply"); } else { - /* XXX cut&paste from print_addr */ - char buf[48]; - printf(" divert-to "); - if (inet_ntop(r->af, &r->divert.addr, buf, - sizeof(buf)) == NULL) - printf("?"); - else - printf("%s", buf); + print_addr_str(r->af, &r->divert.addr); printf(" port %u", ntohs(r->divert.port)); } #endif