Page MenuHomeFreeBSD
Files F148427574

D49042.diff
No OneTemporary
Actions

D49042.diff
View Options

diff --git a/sys/netinet/in.h b/sys/netinet/in.h
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -686,6 +686,13 @@
int inet_pton(int af, const char *, void *); /* in libkern */
void in_ifdetach(struct ifnet *);
+static inline bool
+in_broadcast(struct in_addr in)
+{
+ return (in.s_addr == htonl(INADDR_BROADCAST) ||
+ in.s_addr == htonl(INADDR_ANY));
+}
+
#define in_hosteq(s, t) ((s).s_addr == (t).s_addr)
#define in_nullhost(x) ((x).s_addr == INADDR_ANY)
#define in_allhosts(x) ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP))
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -449,7 +449,8 @@
mtu = ifp->if_mtu;
ip->ip_ttl = 1;
isbroadcast = ifp->if_flags & IFF_BROADCAST ?
- in_ifaddr_broadcast(dst->sin_addr, ia) : 0;
+ (in_broadcast(ip->ip_dst) ||
+ in_ifaddr_broadcast(dst->sin_addr, ia)) : 0;
src = IA_SIN(ia)->sin_addr;
} else if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) &&
imo != NULL && imo->imo_multicast_ifp != NULL) {
@@ -502,8 +503,11 @@
gw = &nh->gw_sa;
if (nh->nh_flags & NHF_HOST)
isbroadcast = (nh->nh_flags & NHF_BROADCAST);
- else if ((ifp->if_flags & IFF_BROADCAST) && (gw->sa_family == AF_INET))
- isbroadcast = in_ifaddr_broadcast(((const struct sockaddr_in *)gw)->sin_addr, ia);
+ else if ((ifp->if_flags & IFF_BROADCAST) &&
+ (gw->sa_family == AF_INET))
+ isbroadcast = in_broadcast(ip->ip_dst) ||
+ in_ifaddr_broadcast(
+ ((const struct sockaddr_in *)gw)->sin_addr, ia);
else
isbroadcast = false;
mtu = nh->nh_mtu;
@@ -533,11 +537,12 @@
gw = &nh->gw_sa;
ia = ifatoia(nh->nh_ifa);
src = IA_SIN(ia)->sin_addr;
- isbroadcast = (((nh->nh_flags & (NHF_HOST | NHF_BROADCAST)) ==
+ isbroadcast = ((nh->nh_flags & (NHF_HOST | NHF_BROADCAST)) ==
(NHF_HOST | NHF_BROADCAST)) ||
((ifp->if_flags & IFF_BROADCAST) &&
(gw->sa_family == AF_INET) &&
- in_ifaddr_broadcast(((const struct sockaddr_in *)gw)->sin_addr, ia)));
+ (in_broadcast(ip->ip_dst) || in_ifaddr_broadcast(
+ ((const struct sockaddr_in *)gw)->sin_addr, ia)));
}
/* Catch a possible divide by zero later. */

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 7:28 PM (16 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29922463
Default Alt Text
D49042.diff (2 KB)

Event Timeline