Date: Fri, 1 Sep 2023 18:18:12 GMT From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b2a48c3cf86d - main - pf: retire pf_krule_to_rule and pf_kpool_to_pool Message-ID: <202309011818.381IICVO005373@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b2a48c3cf86d8593f42072c3df74f2f708fbd93b commit b2a48c3cf86d8593f42072c3df74f2f708fbd93b Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2023-09-01 18:12:41 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2023-09-01 18:18:02 +0000 pf: retire pf_krule_to_rule and pf_kpool_to_pool Discussed with: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 115 ---------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 44ede3dea6a3..8dbc8986e7d3 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1877,20 +1877,6 @@ pf_pooladdr_to_kpooladdr(const struct pf_pooladdr *pool, return (ret); } -static void -pf_kpool_to_pool(const struct pf_kpool *kpool, struct pf_pool *pool) -{ - bzero(pool, sizeof(*pool)); - - bcopy(&kpool->key, &pool->key, sizeof(pool->key)); - bcopy(&kpool->counter, &pool->counter, sizeof(pool->counter)); - - pool->tblidx = kpool->tblidx; - pool->proxy_port[0] = kpool->proxy_port[0]; - pool->proxy_port[1] = kpool->proxy_port[1]; - pool->opts = kpool->opts; -} - static void pf_pool_to_kpool(const struct pf_pool *pool, struct pf_kpool *kpool) { @@ -1906,107 +1892,6 @@ pf_pool_to_kpool(const struct pf_pool *pool, struct pf_kpool *kpool) kpool->opts = pool->opts; } -static void -pf_krule_to_rule(const struct pf_krule *krule, struct pf_rule *rule) -{ - - bzero(rule, sizeof(*rule)); - - bcopy(&krule->src, &rule->src, sizeof(rule->src)); - bcopy(&krule->dst, &rule->dst, sizeof(rule->dst)); - - for (int i = 0; i < PF_SKIP_COUNT; ++i) { - if (rule->skip[i].ptr == NULL) - rule->skip[i].nr = -1; - else - rule->skip[i].nr = krule->skip[i].ptr->nr; - } - - strlcpy(rule->label, krule->label[0], sizeof(rule->label)); - strlcpy(rule->ifname, krule->ifname, sizeof(rule->ifname)); - strlcpy(rule->qname, krule->qname, sizeof(rule->qname)); - strlcpy(rule->pqname, krule->pqname, sizeof(rule->pqname)); - strlcpy(rule->tagname, krule->tagname, sizeof(rule->tagname)); - strlcpy(rule->match_tagname, krule->match_tagname, - sizeof(rule->match_tagname)); - strlcpy(rule->overload_tblname, krule->overload_tblname, - sizeof(rule->overload_tblname)); - - pf_kpool_to_pool(&krule->rpool, &rule->rpool); - - rule->evaluations = pf_counter_u64_fetch(&krule->evaluations); - for (int i = 0; i < 2; i++) { - rule->packets[i] = pf_counter_u64_fetch(&krule->packets[i]); - rule->bytes[i] = pf_counter_u64_fetch(&krule->bytes[i]); - } - - /* kif, anchor, overload_tbl are not copied over. */ - - rule->os_fingerprint = krule->os_fingerprint; - - rule->rtableid = krule->rtableid; - bcopy(krule->timeout, rule->timeout, sizeof(krule->timeout)); - rule->max_states = krule->max_states; - rule->max_src_nodes = krule->max_src_nodes; - rule->max_src_states = krule->max_src_states; - rule->max_src_conn = krule->max_src_conn; - rule->max_src_conn_rate.limit = krule->max_src_conn_rate.limit; - rule->max_src_conn_rate.seconds = krule->max_src_conn_rate.seconds; - rule->qid = krule->qid; - rule->pqid = krule->pqid; - rule->nr = krule->nr; - rule->prob = krule->prob; - rule->cuid = krule->cuid; - rule->cpid = krule->cpid; - - rule->return_icmp = krule->return_icmp; - rule->return_icmp6 = krule->return_icmp6; - rule->max_mss = krule->max_mss; - rule->tag = krule->tag; - rule->match_tag = krule->match_tag; - rule->scrub_flags = krule->scrub_flags; - - bcopy(&krule->uid, &rule->uid, sizeof(krule->uid)); - bcopy(&krule->gid, &rule->gid, sizeof(krule->gid)); - - rule->rule_flag = krule->rule_flag; - rule->action = krule->action; - rule->direction = krule->direction; - rule->log = krule->log; - rule->logif = krule->logif; - rule->quick = krule->quick; - rule->ifnot = krule->ifnot; - rule->match_tag_not = krule->match_tag_not; - rule->natpass = krule->natpass; - - rule->keep_state = krule->keep_state; - rule->af = krule->af; - rule->proto = krule->proto; - rule->type = krule->type; - rule->code = krule->code; - rule->flags = krule->flags; - rule->flagset = krule->flagset; - rule->min_ttl = krule->min_ttl; - rule->allow_opts = krule->allow_opts; - rule->rt = krule->rt; - rule->return_ttl = krule->return_ttl; - rule->tos = krule->tos; - rule->set_tos = krule->set_tos; - rule->anchor_relative = krule->anchor_relative; - rule->anchor_wildcard = krule->anchor_wildcard; - - rule->flush = krule->flush; - rule->prio = krule->prio; - rule->set_prio[0] = krule->set_prio[0]; - rule->set_prio[1] = krule->set_prio[1]; - - bcopy(&krule->divert, &rule->divert, sizeof(krule->divert)); - - rule->u_states_cur = counter_u64_fetch(krule->states_cur); - rule->u_states_tot = counter_u64_fetch(krule->states_tot); - rule->u_src_nodes = counter_u64_fetch(krule->src_nodes); -} - static int pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309011818.381IICVO005373>