From nobody Sat Feb 22 02:12:46 2025 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 4Z09WL6cy1z5nqVP; Sat, 22 Feb 2025 02:12:46 +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 4Z09WL2sQZz3hrq; Sat, 22 Feb 2025 02:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740190366; 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=gB9mvnPi5R4SwtZ3srXpVE/YpejIgfrQUZeG2f2OI6o=; b=Haqk3HyP6zTmClQ6r9ETdzwtXTsADEl2uks11kk47lXeB7Pm4Fdc4wlj8fky64Qlwb65lU f1zBbjbgHPAejyenfqvk7uULoqVBTEB5c7gmmWaRWsueNLfUD1OJeY8Z/t/PZYmWPUjNRm 1Dt2S3KBq0pNST7aWIgkRw6aNGigoSrf5K2W72LDk9BDzhpKCJkLCDO9WJiYUdZLdXBsX6 ABC+yfrPKKpi4PDJr8bf2XgljeTJ8PLPoBdFybEHegDjgtiqvu/g+K8poLh5hsHHcwXEul Oq5hyFWKT93SoBXYMLYWG59gXvzuanfwd6mw0qnIpMjXtNl34dIyM2i+FCEYfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740190366; a=rsa-sha256; cv=none; b=AXYh6zPRjoOywnl1e3ndSFCBNL5qT1jjw7SBrfTYQiAJkvlolwNTk1KJr2d4Nw81fqStp/ gLrD4eB0YVjh+a/rV0N99ba/O5CMU9pGD4bEW01DY8CghxZXF3vVTd3EqvCafFJBTh/Clz DKGtGKG8EweoYFAv2SRJ0L8LeSCrMrXhUjJjNn5L2It3zJLu3DQZJ6Jar8PmSIF1dncmL4 8jyxAl+Q0/9ErE2zM+Gn3/9ml6gmOOx1/P/j0A3yVU20sHAoH7wh5NXvbxlCpOBQkDB9IM hbRE6P5PV3l9okR25xrfcoPYKpWX0jicGyeSdrNe962th35Xqj0QGmcldsYt/g== 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=1740190366; 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=gB9mvnPi5R4SwtZ3srXpVE/YpejIgfrQUZeG2f2OI6o=; b=PyBNv9lTMEKR1oXtDxCKTZphtBh5liV32JfljQDZFYEq3lcOLI+qUOBkXvxVmlJXxwOYTI 8dTvum5HP92aK4HJXiBn2v3zFdTcKQl/QTRAEt4dVLAmEOk8xtLUhgXFpCSjpkRMe1RS4K 90+AyBovyl3q9F/ZlAQazjMXdJu8DcY5SFF2f3EpIaryCoBv2/nyGBHOTbgEmB18vC71je RdI9u5kTD+1oSzn9J/Y/wHKqmOKMTqPfxaJMq7wjd0X1sfBgmeyEcyoLuQohX4QMZuwzTd d0BGNA1YbMG9iM0JQc620BRvuVgWEr36eS2h2KeyUT2dVjMb0Yrqxlnrdm/Sdw== 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 4Z09WL2Q3nzp77; Sat, 22 Feb 2025 02:12:46 +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 51M2Cka6099287; Sat, 22 Feb 2025 02:12:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51M2CktR099284; Sat, 22 Feb 2025 02:12:46 GMT (envelope-from git) Date: Sat, 22 Feb 2025 02:12:46 GMT Message-Id: <202502220212.51M2CktR099284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 532106f7aa29 - main - netinet: use in_broadcast() inline 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 532106f7aa29a5879a168030ec43119d47ee2bd5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=532106f7aa29a5879a168030ec43119d47ee2bd5 commit 532106f7aa29a5879a168030ec43119d47ee2bd5 Author: Gleb Smirnoff AuthorDate: 2025-02-22 02:11:06 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-22 02:11:06 +0000 netinet: use in_broadcast() inline There should be no functional change. Reviewed by: rrs, markj Differential Revision: https://reviews.freebsd.org/D49088 --- sys/netinet/in.c | 2 +- sys/netinet/in_jail.c | 8 +------- sys/netinet/ip_fastfwd.c | 8 +++----- sys/netinet/ip_icmp.c | 9 ++------- sys/netinet/ip_input.c | 4 +--- sys/netinet/sctp_output.c | 6 ++---- sys/netinet/sctp_pcb.c | 6 ++---- sys/netinet/sctputil.c | 3 +-- 8 files changed, 13 insertions(+), 33 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 7d8cbc6725ad..7196eabc123e 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1299,7 +1299,7 @@ in_ifnet_broadcast(struct in_addr in, struct ifnet *ifp) NET_EPOCH_ASSERT(); - if (in.s_addr == INADDR_BROADCAST || in.s_addr == INADDR_ANY) + if (in_broadcast(in)) return (true); if ((ifp->if_flags & IFF_BROADCAST) == 0) return (false); diff --git a/sys/netinet/in_jail.c b/sys/netinet/in_jail.c index 9b6b8f670df1..7b2120f575ca 100644 --- a/sys/netinet/in_jail.c +++ b/sys/netinet/in_jail.c @@ -97,13 +97,7 @@ prison_qcmp_v4(const void *ip1, const void *ip2) bool prison_valid_v4(const void *ip) { - in_addr_t ia = ((const struct in_addr *)ip)->s_addr; - - /* - * We do not have to care about byte order for these - * checks so we will do them in NBO. - */ - return (ia != INADDR_ANY && ia != INADDR_BROADCAST); + return (!in_broadcast(*(const struct in_addr *)ip)); } /* diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 7a80cce908c1..9b81760e58f3 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -278,14 +278,12 @@ ip_tryforward(struct mbuf *m) */ if ((m->m_flags & (M_BCAST|M_MCAST)) || (m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) || - ntohl(ip->ip_src.s_addr) == (u_long)INADDR_BROADCAST || - ntohl(ip->ip_dst.s_addr) == (u_long)INADDR_BROADCAST || + in_broadcast(ip->ip_src) || + in_broadcast(ip->ip_dst) || IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || IN_LINKLOCAL(ntohl(ip->ip_src.s_addr)) || - IN_LINKLOCAL(ntohl(ip->ip_dst.s_addr)) || - ip->ip_src.s_addr == INADDR_ANY || - ip->ip_dst.s_addr == INADDR_ANY ) + IN_LINKLOCAL(ntohl(ip->ip_dst.s_addr)) ) return m; /* diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 2b61820cdaa8..936f76e7fbe3 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -635,15 +635,10 @@ icmp_input(struct mbuf **mp, int *offp, int proto) */ if (icmplen < ICMP_MASKLEN) break; - switch (ip->ip_dst.s_addr) { - case INADDR_BROADCAST: - case INADDR_ANY: + if (in_broadcast(ip->ip_dst)) icmpdst.sin_addr = ip->ip_src; - break; - - default: + else icmpdst.sin_addr = ip->ip_dst; - } ia = (struct in_ifaddr *)ifaof_ifpforaddr( (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif); if (ia == NULL) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 3c340b376433..08c48996a798 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -789,9 +789,7 @@ passin: */ goto ours; } - if (ip->ip_dst.s_addr == (u_long)INADDR_BROADCAST) - goto ours; - if (ip->ip_dst.s_addr == INADDR_ANY) + if (in_broadcast(ip->ip_dst)) goto ours; /* RFC 3927 2.7: Do not forward packets to or from IN_LINKLOCAL. */ if (IN_LINKLOCAL(ntohl(ip->ip_dst.s_addr)) || diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 2a3c0248be60..02ad901259f4 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -3655,8 +3655,7 @@ sctp_process_cmsgs_for_init(struct sctp_tcb *stcb, struct mbuf *control, int *er sin.sin_len = sizeof(struct sockaddr_in); sin.sin_port = stcb->rport; m_copydata(control, cmsg_data_off, sizeof(struct in_addr), (caddr_t)&sin.sin_addr); - if ((sin.sin_addr.s_addr == INADDR_ANY) || - (sin.sin_addr.s_addr == INADDR_BROADCAST) || + if (in_broadcast(sin.sin_addr) || IN_MULTICAST(ntohl(sin.sin_addr.s_addr))) { *error = EINVAL; return (1); @@ -3687,8 +3686,7 @@ sctp_process_cmsgs_for_init(struct sctp_tcb *stcb, struct mbuf *control, int *er #ifdef INET if (IN6_IS_ADDR_V4MAPPED(&sin6.sin6_addr)) { in6_sin6_2_sin(&sin, &sin6); - if ((sin.sin_addr.s_addr == INADDR_ANY) || - (sin.sin_addr.s_addr == INADDR_BROADCAST) || + if (in_broadcast(sin.sin_addr) || IN_MULTICAST(ntohl(sin.sin_addr.s_addr))) { *error = EINVAL; return (1); diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 6bbbacfa761e..185530e3bc5e 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4130,8 +4130,7 @@ sctp_aloc_assoc_locked(struct sctp_inpcb *inp, struct sockaddr *firstaddr, sin = (struct sockaddr_in *)firstaddr; if ((ntohs(sin->sin_port) == 0) || - (sin->sin_addr.s_addr == INADDR_ANY) || - (sin->sin_addr.s_addr == INADDR_BROADCAST) || + in_broadcast(sin->sin_addr) || IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) || ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) && (SCTP_IPV6_V6ONLY(inp) != 0))) { @@ -6009,8 +6008,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m, /* Skip multi-cast addresses */ goto next_param; } - if ((sin.sin_addr.s_addr == INADDR_BROADCAST) || - (sin.sin_addr.s_addr == INADDR_ANY)) { + if (in_broadcast(sin.sin_addr)) { goto next_param; } sa = (struct sockaddr *)&sin; diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 17e49b413464..ddfa71d5c7ed 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -6634,8 +6634,7 @@ sctp_connectx_helper_add(struct sctp_tcb *stcb, struct sockaddr *addr, case AF_INET: incr = sizeof(struct sockaddr_in); sin = (struct sockaddr_in *)sa; - if ((sin->sin_addr.s_addr == INADDR_ANY) || - (sin->sin_addr.s_addr == INADDR_BROADCAST) || + if (in_broadcast(sin->sin_addr) || IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) { SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTPUTIL, EINVAL); (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC,