From nobody Wed Apr 16 18:02:59 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 4Zd85J0vdKz5t24s; Wed, 16 Apr 2025 18:03: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zd85H4dqyz3RNH; Wed, 16 Apr 2025 18:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744826579; 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=f9/Ucao1Apoh6oXkCy4/wdYMuYxnmNm9ObSAEVxcm7o=; b=xj6Mnb1kR+YcH5M6He0DsPjqWx+i/YeQyuEXmCELvuYTvQAhjLZu2t2qdrGrB0NNe6GDaj J+ngS2zJHK7IRfhR/zmeRi511yXizYi4iSImX05GJScrrKv1NDdSzKWh3QaqWA2usD4wd+ 4RD9txL7kiOZ1PzpQadfc/zq7tsch6D7wBQ4qFm+Uon9dMX3WrxnXcxZVvizkgtOnHBdMv vgMJ9NPFCBgHpX5ylEYjevfLo56DdUTVadGc5+51IQX3E5sASyYUfAtkK9C/eUEp8Hbulr pyim1xQsSbxdJ7U/0TFadl03WuWrEaGJG8tEV8aPsGK8R1INM9IYzF2x0jDI3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744826579; a=rsa-sha256; cv=none; b=hy5wH8USmc5U1YhUqY9z1XYgBWDVEpag1VhqPpH00lXoLUOZdcFOgHT1I1dVw7aH0zQLQT dh2j3szhZqiw0uYmBg1bOCFvaJI2Zrucs8h6lnBP6OBN97w+/ZgAKKZiDcSrlLbeDlLrCy mTx87nsFq9/dg6X7SLBkB4H5ed/V9OICJzcSeojVal6VuzgiZmNbHnUthPfXEzBKYotORY 2IrYpdtfA8MYyBdVCaClj+2pK42sJDcOE8aNOOMYUaiy7KYV/8C9IArDjONDuExSrMFVEt yyccrv1wP1Ld3f9R/jb2NHBeZkY+Wi2II+qsxpLccD2zczrSQ7qNiZUTp8ItSA== 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=1744826579; 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=f9/Ucao1Apoh6oXkCy4/wdYMuYxnmNm9ObSAEVxcm7o=; b=p5mBxwiDvj+uLSJthMLLEycrCNuIwL92Rb9USeRexd00/0EKfSox3Jy7/ewaXO9eqcp+8G GsQeRYd1XESOKySm8n3iaujUfhJ+98LuzM7BOjRMkV2aagD+/6wa4cogh/r8yNe9UQo0eP m6gAaaZwMrIShB/ogaBb13GIpJurj77/xggMDr1RxX7Eg/+7TNCis+vur+imkGInY4yma8 YJ4wcb97od4OMDZgN+jf65nz6RxSa82bx9v4wAn8GRA3Fe3iNgM7fDTOIM5Ahx/ZfER4Sm SnWobkTnTUIk653dm08KhO1oxALOUw5sy4d9eWYsDUFjZjSkNSbGOhMyUg4nmg== 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 4Zd85H3y54z1SKd; Wed, 16 Apr 2025 18:02:59 +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 53GI2x7C075967; Wed, 16 Apr 2025 18:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53GI2x15075964; Wed, 16 Apr 2025 18:02:59 GMT (envelope-from git) Date: Wed, 16 Apr 2025 18:02:59 GMT Message-Id: <202504161802.53GI2x15075964@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: 435e9214478c - main - pf: remove _unaligned from pf_patch_(16|32)_unaligned() 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: 435e9214478cdc120fff555e51e6b334dbc64857 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=435e9214478cdc120fff555e51e6b334dbc64857 commit 435e9214478cdc120fff555e51e6b334dbc64857 Author: Kristof Provost AuthorDate: 2025-04-16 12:21:16 +0000 Commit: Kristof Provost CommitDate: 2025-04-16 14:23:49 +0000 pf: remove _unaligned from pf_patch_(16|32)_unaligned() This is the only variant of the function, appending _unaligned does not clarify anything. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ++-- sys/netpfil/pf/pf.c | 8 ++++---- sys/netpfil/pf/pf_norm.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b216b888832f..c7a2bde63184 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2453,8 +2453,8 @@ void pf_change_a(void *, u_int16_t *, u_int32_t, u_int8_t); void pf_change_proto_a(struct mbuf *, void *, u_int16_t *, u_int32_t, u_int8_t); void pf_change_tcp_a(struct mbuf *, void *, u_int16_t *, u_int32_t); -void pf_patch_16_unaligned(struct pf_pdesc *, void *, u_int16_t, bool); -void pf_patch_32_unaligned(struct pf_pdesc *, void *, u_int32_t, bool); +void pf_patch_16(struct pf_pdesc *, void *, u_int16_t, bool); +void pf_patch_32(struct pf_pdesc *, void *, u_int32_t, bool); void pf_send_deferred_syn(struct pf_kstate *); int pf_match_addr(u_int8_t, const struct pf_addr *, const struct pf_addr *, const struct pf_addr *, sa_family_t); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 24963d010e04..5d16af6c6d4b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3234,7 +3234,7 @@ pf_patch_8(struct pf_pdesc *pd, u_int8_t *f, u_int8_t v, bool hi) } void -pf_patch_16_unaligned(struct pf_pdesc *pd, void *f, u_int16_t v, bool hi) +pf_patch_16(struct pf_pdesc *pd, void *f, u_int16_t v, bool hi) { u_int8_t *fb = (u_int8_t *)f; u_int8_t *vb = (u_int8_t *)&v; @@ -3244,7 +3244,7 @@ pf_patch_16_unaligned(struct pf_pdesc *pd, void *f, u_int16_t v, bool hi) } void -pf_patch_32_unaligned(struct pf_pdesc *pd, void *f, u_int32_t v, bool hi) +pf_patch_32(struct pf_pdesc *pd, void *f, u_int32_t v, bool hi) { u_int8_t *fb = (u_int8_t *)f; u_int8_t *vb = (u_int8_t *)&v; @@ -3950,11 +3950,11 @@ pf_modulate_sack(struct pf_pdesc *pd, struct tcphdr *th, for (i = 2; i + TCPOLEN_SACK <= olen; i += TCPOLEN_SACK) { memcpy(&sack, &opt[i], sizeof(sack)); - pf_patch_32_unaligned(pd, + pf_patch_32(pd, &sack.start, htonl(ntohl(sack.start) - dst->seqdiff), PF_ALGNMNT(startoff)); - pf_patch_32_unaligned(pd, + pf_patch_32(pd, &sack.end, htonl(ntohl(sack.end) - dst->seqdiff), PF_ALGNMNT(startoff)); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 10e740d33b0d..783e48627c0f 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1633,7 +1633,7 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, (src->scrub->pfss_flags & PFSS_TIMESTAMP)) { tsval = ntohl(tsval); - pf_patch_32_unaligned(pd, + pf_patch_32(pd, &opt[2], htonl(tsval + src->scrub->pfss_ts_mod), @@ -1649,7 +1649,7 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, PFSS_TIMESTAMP)) { tsecr = ntohl(tsecr) - dst->scrub->pfss_ts_mod; - pf_patch_32_unaligned(pd, + pf_patch_32(pd, &opt[6], htonl(tsecr), PF_ALGNMNT(startoff)); @@ -1974,7 +1974,7 @@ pf_normalize_mss(struct pf_pdesc *pd) case TCPOPT_MAXSEG: mss = (u_int16_t *)(optp + 2); if ((ntohs(*mss)) > pd->act.max_mss) { - pf_patch_16_unaligned(pd, + pf_patch_16(pd, mss, htons(pd->act.max_mss), PF_ALGNMNT(startoff)); m_copyback(pd->m, pd->off + sizeof(*th),