From nobody Sat Feb 22 02:12:43 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 4Z09WJ1lclz5nq8l; Sat, 22 Feb 2025 02:12:44 +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 4Z09WJ0v3yz3hrh; Sat, 22 Feb 2025 02:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740190364; 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=jdVIfSbkNf1WbsTCWWvTHQ2likCCgC6JcHRubXzeL/A=; b=BNN1FO1Xa80Jkuea2rrBpGO3FZ644AijATfrPLl8udmjbRNqXxLKDb4GsuKBiBs9weYRhJ Akms2J+XygrCD5ROsKBniGrPNkqdbeOgTu+pRipknLCfIkwRWvFsvmllgzfWNWta8s/fZR NdpT+hRJym3ooREBsAkWO+kB1QKz8YYC9KWU1gXNX3xiLt5ayudXJ+mzT8rYThpMH9sTV9 t/kkceZTOZ11aNlto4cfwfRPKJX5+XylXvM663tYOe6Wlm3CUWo2q6rsTAlbn1azbf1I69 NutE/q8zlnqSbjz5KsjLuJoDFcVaOYj8+YUm+rrm7FJspzcRdnblUZBqGWkRAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740190364; a=rsa-sha256; cv=none; b=XXDnY9i27sgmQ12r7aNim2RXuYV/kA9sz3pKzJ+yWOPYBteEPDfHnOKHJdqCRIaYNCNDY6 Iv40dMRVZn04wUzUwV9NG2Y5x4MDz75dlLnO4AjbxP0goHlRoJRVKl7zx/4iFGX+DFFd6g BU+XLhZG75+p+T83cOXF7WcM5ncoSZQr+FafHCzzVD4McvHN6c5kih0diCIctRRgEtodhZ xBxt+B233tMY/bED04lkhQJtzLGwIZ9uXaFQjU+VvDohNJkDKa3U8zGK+UdEcSEEx5VCwB h2EfnUkTpMfBRgZqTeZjz0QIYf2IFj5f/KkVWa1y78Wdu7UWmlR6YG0hzeW9gQ== 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=1740190364; 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=jdVIfSbkNf1WbsTCWWvTHQ2likCCgC6JcHRubXzeL/A=; b=lCGMft/nJFZF1xTWb8f5Ejz1hbReHRp6vPOBw4MHBxFLJ9g6aMJu38GQ78rSFDPDHs3G4I enaa7rYcy2a55SXnc2KU+ifl+tT01uPmHX0ci0mNJQOKoPEY5vEYt3JSsaowTKE0g9PJbr rrHV8EPV3KvuT46wqFbAsESE84kyz1Yd60bUi5DNJE97htrQ6SCR1JiIBz6K85v7AnO98p ZgKYEz4jgR6BNcVNS4oIQyF2odgKFM04g2ONA9d2rZ3C1cU0b694x1aK0IqKjTw4vMfjn8 8+3NIVc69AeC/8jYyQWbd7b/f5TvRrwahxYIxmO+RjnfGkF8bJTulI+hVHhUUQ== 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 4Z09WJ0D0LzpVk; Sat, 22 Feb 2025 02:12:44 +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 51M2ChNd099220; Sat, 22 Feb 2025 02:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51M2ChPs099217; Sat, 22 Feb 2025 02:12:43 GMT (envelope-from git) Date: Sat, 22 Feb 2025 02:12:43 GMT Message-Id: <202502220212.51M2ChPs099217@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: 197fc4cad097 - main - netinet: rename in_broadcast() to in_ifnet_broadcast() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 197fc4cad0973efa4bb2ab86ed537eafa3ae254e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=197fc4cad0973efa4bb2ab86ed537eafa3ae254e commit 197fc4cad0973efa4bb2ab86ed537eafa3ae254e Author: Gleb Smirnoff AuthorDate: 2025-02-22 02:10:53 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-22 02:10:53 +0000 netinet: rename in_broadcast() to in_ifnet_broadcast() This aligns with existing in_ifaddr_broadcast() and aligns with other simple functions or macros with bare "in_" prefix that operator just on struct in_addr and nothing else, e.g. in_nullhost(). No functional change. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49041 --- sys/netinet/in.c | 2 +- sys/netinet/in.h | 2 +- sys/netinet/in_rmx.c | 2 +- sys/netinet/ip_divert.c | 2 +- sys/netinet/sctp_os_bsd.h | 2 +- sys/netinet/tcp_input.c | 6 +++--- sys/netinet/udp_usrreq.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 0cf148c38575..7d8cbc6725ad 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1293,7 +1293,7 @@ in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia) * Return true if the address might be a local broadcast address. */ bool -in_broadcast(struct in_addr in, struct ifnet *ifp) +in_ifnet_broadcast(struct in_addr in, struct ifnet *ifp) { struct ifaddr *ifa; diff --git a/sys/netinet/in.h b/sys/netinet/in.h index e03fe3391388..0ee4200017b5 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -672,7 +672,7 @@ int getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, struct ifnet; struct mbuf; /* forward declarations for Standard C */ struct in_ifaddr; -bool in_broadcast(struct in_addr, struct ifnet *); +bool in_ifnet_broadcast(struct in_addr, struct ifnet *); bool in_ifaddr_broadcast(struct in_addr, struct in_ifaddr *); int in_canforward(struct in_addr); int in_localaddr(struct in_addr); diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index aedfd0bc08c7..b8599143b991 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -71,7 +71,7 @@ rib4_set_nh_pfxflags(u_int fibnum, const struct sockaddr *addr, const struct soc * add these routes to support some cases with active-active * load balancing. Given that, retain this support. */ - if (in_broadcast(addr4->sin_addr, nh->nh_ifp)) + if (in_ifnet_broadcast(addr4->sin_addr, nh->nh_ifp)) is_broadcast = true; } else if (mask4->sin_addr.s_addr == 0) nhop_set_pxtype_flag(nh, NHF_DEFAULT); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 6bc76e0be111..5a561814cdb5 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -538,7 +538,7 @@ div_output_inbound(int family, struct socket *so, struct mbuf *m, */ if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) m->m_flags |= M_MCAST; - else if (in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) + else if (in_ifnet_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) m->m_flags |= M_BCAST; netisr_queue_src(NETISR_IP, (uintptr_t)so, m); DIVSTAT_INC(inbound); diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index eb0caec942e9..9cec02aa6a07 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -342,7 +342,7 @@ typedef struct callout sctp_os_timer_t; } while(0) /* Other m_pkthdr type things */ -#define SCTP_IS_IT_BROADCAST(dst, m) ((m->m_flags & M_PKTHDR) ? in_broadcast(dst, m->m_pkthdr.rcvif) : 0) +#define SCTP_IS_IT_BROADCAST(dst, m) ((m->m_flags & M_PKTHDR) ? in_ifnet_broadcast(dst, m->m_pkthdr.rcvif) : 0) #define SCTP_IS_IT_LOOPBACK(m) ((m->m_flags & M_PKTHDR) && ((m->m_pkthdr.rcvif == NULL) || (m->m_pkthdr.rcvif->if_type == IFT_LOOP))) /* This converts any input packet header diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 12dc4670f531..e21043fac0cf 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1290,7 +1290,7 @@ tfo_socket_result: * global or subnet broad- or multicast address. * Note that it is quite possible to receive unicast * link-layer packets with a broadcast IP address. Use - * in_broadcast() to find them. + * in_ifnet_broadcast() to find them. */ if (m->m_flags & (M_BCAST|M_MCAST)) { if ((s = tcp_log_addrs(&inc, th, NULL, NULL))) @@ -1335,7 +1335,7 @@ tfo_socket_result: if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || ip->ip_src.s_addr == htonl(INADDR_BROADCAST) || - in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) { + in_ifnet_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) { if ((s = tcp_log_addrs(&inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Listen socket: " "Connection attempt from/to broad- " @@ -3522,7 +3522,7 @@ tcp_dropwithreset(struct mbuf *m, struct tcphdr *th, struct tcpcb *tp, if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || ip->ip_src.s_addr == htonl(INADDR_BROADCAST) || - in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) + in_ifnet_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) goto drop; } #endif diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 8278efcae60c..6c855e7a756b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -583,7 +583,7 @@ udp_input(struct mbuf **mp, int *offp, int proto) } if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || - in_broadcast(ip->ip_dst, ifp)) + in_ifnet_broadcast(ip->ip_dst, ifp)) return (udp_multi_input(m, proto, udp_in)); pcbinfo = udp_get_inpcbinfo(proto);