git: 841c38b5a028 - stable/14 - netinet: Make in_ifhasaddr() return bool

[Zhenlei Huang]

The branch stable/14 has been updated by zlei:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=841c38b5a028cd812a056092a410c0028d010761

commit 841c38b5a028cd812a056092a410c0028d010761
Author:     Zhenlei Huang <z...@freebsd.org>
AuthorDate: 2025-02-27 15:58:20 +0000
Commit:     Zhenlei Huang <z...@freebsd.org>
CommitDate: 2025-03-07 04:02:40 +0000

    netinet: Make in_ifhasaddr() return bool
    
    No functional change intended.
    
    MFC after:      1 week
    
    (cherry picked from commit 97309cec6f31f1f4f7a76f9ec5c7dd359c56de02)
---
 sys/netinet/in.c         | 8 ++++----
 sys/netinet/in.h         | 2 +-
 sys/netinet/udp_usrreq.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 664dffb4e6cc..e30f63e5bec9 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -187,9 +187,9 @@ in_localip_fib(struct in_addr in, uint16_t fib)
 }
 
 /*
- * Return 1 if an internet address is configured on an interface.
+ * Return true if an internet address is configured on an interface.
  */
-int
+bool
 in_ifhasaddr(struct ifnet *ifp, struct in_addr in)
 {
        struct ifaddr *ifa;
@@ -202,10 +202,10 @@ in_ifhasaddr(struct ifnet *ifp, struct in_addr in)
                        continue;
                ia = (struct in_ifaddr *)ifa;
                if (ia->ia_addr.sin_addr.s_addr == in.s_addr)
-                       return (1);
+                       return (true);
        }
 
-       return (0);
+       return (false);
 }
 
 /*
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index db36962aadb1..8e7e3548c6ad 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -680,7 +680,7 @@ int  in_canforward(struct in_addr);
 bool    in_localaddr(struct in_addr);
 bool    in_localip(struct in_addr);
 bool    in_localip_fib(struct in_addr, uint16_t);
-int     in_ifhasaddr(struct ifnet *, struct in_addr);
+bool    in_ifhasaddr(struct ifnet *, struct in_addr);
 struct in_ifaddr *in_findlocal(uint32_t, bool);
 int     inet_aton(const char *, struct in_addr *); /* in libkern */
 char   *inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 9a3d9a810481..0ea065f15ce4 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1048,7 +1048,7 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct 
sockaddr_in * src,
                ifp = NULL;
        if (ifp != NULL && !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) {
                ia.s_addr = pktinfo->ipi6_addr.s6_addr32[3];
-               if (in_ifhasaddr(ifp, ia) == 0)
+               if (!in_ifhasaddr(ifp, ia))
                        return (EADDRNOTAVAIL);
        }