From nobody Thu May 29 09:05:16 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 4b7L722bfMz5xynW; Thu, 29 May 2025 09:05:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7L714Z1pz40Bx; Thu, 29 May 2025 09:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509517; 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=moME/v3ATcyNX8wwA3O5rA/of6BbexybI/xffOXj7F4=; b=EP6ULxyHJLr4+hEDpiMdqkQ9isJ7nhRfhmZAboM59TzmS+TFrEGRqVTdhiuzwxlPUtCfH/ BIx6aAMCoi6UlJhp7aVuQ4yu+1YJMtrsYPpYrLe4jIOaiMqpuiekFUnCob0GrexLQhlzbp DKkrPiefTr37IYjNFyVXWpv1dkm3lwzp1cc1c0ej2iYFcI3dAAZ8lNDfKEIZ2aUxgpluAo 30jBrKg8rQhzXJPyv4OFbQAfsdUtkukknopP9qL9p74C6WXHGt2mxUTJBFI6pKDYyswY62 GPnetN6tMZkOPaRFWrBpYZKgaNdG42okUCxHcKfyiFgBEksjWw2hRbuTH+VkWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748509517; a=rsa-sha256; cv=none; b=f0LnvU5NpC09xIhchKwSKt5VEHTd3BBEDjrBrBcPzGKGhxAq2xZEiO6rwY/SdrfQ3IWeEV Pv9IZRxlICf4ZLDL6kgjxRckGGQ+9Uq0uGlxEFL8dmhPpthCXKxgjpEoJ8At7fqfd1u5HE mTakO71EoBo4U2p7p2gXRdVvs2VT/USC6BEM0+9fPWo+bWDGoUsGj3XTp2SX9CCN2BJPqw C+SL7MMzm3GARAHFYDQ6NxbpFRRNO1SqSZlZ2Lb/q8Tx6eN2UsMzgW7xmFCWXQuXvReFBY ld5OlSe/ba7/IzVoDbrevbQpCTIjBOkbULd1EltGc6+SM5PqIf5AL/VFi8vB1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509517; 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=moME/v3ATcyNX8wwA3O5rA/of6BbexybI/xffOXj7F4=; b=cL5p6NL2TGGxicHyaERBE6IRN2ilWUA+lYGWymIAUJKIDtM1Fl+CRCa5DvvE6FH49LWPOp AN4g5tKXHr/OdsFJDHQ5/TaClJGGLS9VOXMYgGiDwKGsIEwIY0q9aMSNz26BTBC2BhLZ8c LJvEiVe35aTujKCCfCZQi4YLeAzJ0RTtiUv7J3CKV8Mtn3fb2aMJbPiZC95oUczUf2GryL qqJD+W68fpJJXKnyquMlVA1y3GZhEhbpl866Pa5OZkEuOtzvMUozTebicamU5mLmCNXZGe T5jDQPkt0XS0XGPwcLsql9HBiiGO73HCnKlty6kVmda3PCqyv/PC/VffE/rF9g== 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 4b7L710HmNz1FDq; Thu, 29 May 2025 09:05:17 +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 54T95GTv011456; Thu, 29 May 2025 09:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54T95GKN011453; Thu, 29 May 2025 09:05:16 GMT (envelope-from git) Date: Thu, 29 May 2025 09:05:16 GMT Message-Id: <202505290905.54T95GKN011453@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: dd06ff741938 - main - pfctl: void functions discarding ret values 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: dd06ff7419387513a7436fafb41db75ab54d7707 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dd06ff7419387513a7436fafb41db75ab54d7707 commit dd06ff7419387513a7436fafb41db75ab54d7707 Author: Kristof Provost AuthorDate: 2025-05-28 13:04:12 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 07:15:22 +0000 pfctl: void functions discarding ret values Transform the following functions (which never return anything other than 0, and whose return value is never used) to void: pfctl_clear_stats, pfctl_get_skip_ifaces, pfctl_check_skip_ifaces, pfctl_adjust_skip_ifaces, pfctl_clear_interface_flags, pfctl_flush_eth_rules, pfctl_flush_rules, pfctl_flush_nat, pfctl_clear_src_nodes, pfctl_clear_iface_states, pfctl_kill_src_nodes, pfctl_net_kill_states, pfctl_gateway_kill_states, pfctl_label_kill_states, pfctl_id_kill_states and pfctl_key_kill_states Submitted by rain1 (thanks!) with additional credit to: - mikeb@ for pointing out we can void all _clear_ functions - ghostyy for pointing out all _kill_ functions can be voided OK tb@, mikeb@ Obtained from: OpenBSD, awolk , 7363dae4f9 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 88 ++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 55 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 9320ca1aba03..32b957cbc889 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -66,24 +66,24 @@ void usage(void); int pfctl_enable(int, int); int pfctl_disable(int, int); -int pfctl_clear_stats(struct pfctl_handle *, int); -int pfctl_get_skip_ifaces(void); -int pfctl_check_skip_ifaces(char *); -int pfctl_adjust_skip_ifaces(struct pfctl *); -int pfctl_clear_interface_flags(int, int); -int pfctl_flush_eth_rules(int, int, char *); -int pfctl_flush_rules(int, int, char *); -int pfctl_flush_nat(int, int, char *); +void pfctl_clear_stats(struct pfctl_handle *, int); +void pfctl_get_skip_ifaces(void); +void pfctl_check_skip_ifaces(char *); +void pfctl_adjust_skip_ifaces(struct pfctl *); +void pfctl_clear_interface_flags(int, int); +void pfctl_flush_eth_rules(int, int, char *); +void pfctl_flush_rules(int, int, char *); +void pfctl_flush_nat(int, int, char *); int pfctl_clear_altq(int, int); -int pfctl_clear_src_nodes(int, int); -int pfctl_clear_iface_states(int, const char *, int); +void pfctl_clear_src_nodes(int, int); +void pfctl_clear_iface_states(int, const char *, int); void pfctl_addrprefix(char *, struct pf_addr *); -int pfctl_kill_src_nodes(int, const char *, int); -int pfctl_net_kill_states(int, const char *, int); -int pfctl_gateway_kill_states(int, const char *, int); -int pfctl_label_kill_states(int, const char *, int); -int pfctl_id_kill_states(int, const char *, int); -int pfctl_key_kill_states(int, const char *, int); +void pfctl_kill_src_nodes(int, const char *, int); +void pfctl_net_kill_states(int, const char *, int); +void pfctl_gateway_kill_states(int, const char *, int); +void pfctl_label_kill_states(int, const char *, int); +void pfctl_id_kill_states(int, const char *, int); +void pfctl_key_kill_states(int, const char *, int); int pfctl_parse_host(char *, struct pf_rule_addr *); void pfctl_init_options(struct pfctl *); int pfctl_load_options(struct pfctl *); @@ -354,7 +354,7 @@ pfctl_disable(int dev, int opts) return (0); } -int +void pfctl_clear_stats(struct pfctl_handle *h, int opts) { int ret; @@ -362,10 +362,9 @@ pfctl_clear_stats(struct pfctl_handle *h, int opts) errc(1, ret, "DIOCCLRSTATUS"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "pf: statistics cleared\n"); - return (0); } -int +void pfctl_get_skip_ifaces(void) { bzero(&skip_b, sizeof(skip_b)); @@ -378,10 +377,9 @@ pfctl_get_skip_ifaces(void) if (skip_b.pfrb_size <= skip_b.pfrb_msize) break; } - return (0); } -int +void pfctl_check_skip_ifaces(char *ifname) { struct pfi_kif *p; @@ -403,10 +401,9 @@ pfctl_check_skip_ifaces(char *ifname) } } } - return (0); } -int +void pfctl_adjust_skip_ifaces(struct pfctl *pf) { struct pfi_kif *p, *pp; @@ -439,11 +436,9 @@ pfctl_adjust_skip_ifaces(struct pfctl *pf) pfctl_set_interface_flags(pf, p->pfik_name, PFI_IFLAG_SKIP, 0); } - - return (0); } -int +void pfctl_clear_interface_flags(int dev, int opts) { struct pfioc_iface pi; @@ -457,10 +452,9 @@ pfctl_clear_interface_flags(int dev, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "pf: interface flags reset\n"); } - return (0); } -int +void pfctl_flush_eth_rules(int dev, int opts, char *anchorname) { int ret; @@ -471,11 +465,9 @@ pfctl_flush_eth_rules(int dev, int opts, char *anchorname) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "Ethernet rules cleared\n"); - - return (ret); } -int +void pfctl_flush_rules(int dev, int opts, char *anchorname) { int ret; @@ -485,10 +477,9 @@ pfctl_flush_rules(int dev, int opts, char *anchorname) err(1, "pfctl_clear_rules"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "rules cleared\n"); - return (0); } -int +void pfctl_flush_nat(int dev, int opts, char *anchorname) { int ret; @@ -498,7 +489,6 @@ pfctl_flush_nat(int dev, int opts, char *anchorname) err(1, "pfctl_clear_nat"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "nat cleared\n"); - return (0); } int @@ -519,17 +509,16 @@ pfctl_clear_altq(int dev, int opts) return (0); } -int +void pfctl_clear_src_nodes(int dev, int opts) { if (ioctl(dev, DIOCCLRSRCNODES)) err(1, "DIOCCLRSRCNODES"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "source tracking entries cleared\n"); - return (0); } -int +void pfctl_clear_iface_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -548,7 +537,6 @@ pfctl_clear_iface_states(int dev, const char *iface, int opts) errc(1, ret, "DIOCCLRSTATES"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "%d states cleared\n", killed); - return (0); } void @@ -601,7 +589,7 @@ pfctl_addrprefix(char *addr, struct pf_addr *mask) freeaddrinfo(res); } -int +void pfctl_kill_src_nodes(int dev, const char *iface, int opts) { struct pfioc_src_node_kill psnk; @@ -701,10 +689,9 @@ pfctl_kill_src_nodes(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d src nodes from %d sources and %d " "destinations\n", killed, sources, dests); - return (0); } -int +void pfctl_net_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -817,10 +804,9 @@ pfctl_net_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states from %d sources and %d " "destinations\n", killed, sources, dests); - return (0); } -int +void pfctl_gateway_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -881,10 +867,9 @@ pfctl_gateway_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - return (0); } -int +void pfctl_label_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -912,11 +897,9 @@ pfctl_label_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } -int +void pfctl_id_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -952,11 +935,9 @@ pfctl_id_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } -int +void pfctl_key_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -1014,8 +995,6 @@ pfctl_key_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } int @@ -3433,8 +3412,7 @@ main(int argc, char *argv[]) if ((rulesopt != NULL) && (loadopt & PFCTL_FLAG_OPTION) && !anchorname[0] && !(opts & PF_OPT_NOACTION)) - if (pfctl_get_skip_ifaces()) - error = 1; + pfctl_get_skip_ifaces(); if (rulesopt != NULL && !(opts & PF_OPT_MERGE) && !anchorname[0] && (loadopt & PFCTL_FLAG_OPTION))