[IPV4] net/ipv4: Use ipv4_is_<type>
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
21cf2253eb
commit
f97c1e0c6e
|
@ -777,7 +777,7 @@ static int arp_process(struct sk_buff *skb)
|
||||||
* Check for bad requests for 127.x.x.x and requests for multicast
|
* Check for bad requests for 127.x.x.x and requests for multicast
|
||||||
* addresses. If this is one such, delete it.
|
* addresses. If this is one such, delete it.
|
||||||
*/
|
*/
|
||||||
if (LOOPBACK(tip) || MULTICAST(tip))
|
if (ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -40,7 +40,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
||||||
|
|
||||||
oif = sk->sk_bound_dev_if;
|
oif = sk->sk_bound_dev_if;
|
||||||
saddr = inet->saddr;
|
saddr = inet->saddr;
|
||||||
if (MULTICAST(usin->sin_addr.s_addr)) {
|
if (ipv4_is_multicast(usin->sin_addr.s_addr)) {
|
||||||
if (!oif)
|
if (!oif)
|
||||||
oif = inet->mc_index;
|
oif = inet->mc_index;
|
||||||
if (!saddr)
|
if (!saddr)
|
||||||
|
|
|
@ -404,7 +404,7 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
|
||||||
in_dev_hold(in_dev);
|
in_dev_hold(in_dev);
|
||||||
ifa->ifa_dev = in_dev;
|
ifa->ifa_dev = in_dev;
|
||||||
}
|
}
|
||||||
if (LOOPBACK(ifa->ifa_local))
|
if (ipv4_is_loopback(ifa->ifa_local))
|
||||||
ifa->ifa_scope = RT_SCOPE_HOST;
|
ifa->ifa_scope = RT_SCOPE_HOST;
|
||||||
return inet_insert_ifa(ifa);
|
return inet_insert_ifa(ifa);
|
||||||
}
|
}
|
||||||
|
@ -583,7 +583,7 @@ static __inline__ int inet_abc_len(__be32 addr)
|
||||||
{
|
{
|
||||||
int rc = -1; /* Something else, probably a multicast. */
|
int rc = -1; /* Something else, probably a multicast. */
|
||||||
|
|
||||||
if (ZERONET(addr))
|
if (ipv4_is_zeronet(addr))
|
||||||
rc = 0;
|
rc = 0;
|
||||||
else {
|
else {
|
||||||
__u32 haddr = ntohl(addr);
|
__u32 haddr = ntohl(addr);
|
||||||
|
|
|
@ -167,9 +167,9 @@ static inline unsigned __inet_dev_addr_type(const struct net_device *dev,
|
||||||
unsigned ret = RTN_BROADCAST;
|
unsigned ret = RTN_BROADCAST;
|
||||||
struct fib_table *local_table;
|
struct fib_table *local_table;
|
||||||
|
|
||||||
if (ZERONET(addr) || BADCLASS(addr))
|
if (ipv4_is_zeronet(addr) || ipv4_is_badclass(addr))
|
||||||
return RTN_BROADCAST;
|
return RTN_BROADCAST;
|
||||||
if (MULTICAST(addr))
|
if (ipv4_is_multicast(addr))
|
||||||
return RTN_MULTICAST;
|
return RTN_MULTICAST;
|
||||||
|
|
||||||
#ifdef CONFIG_IP_MULTIPLE_TABLES
|
#ifdef CONFIG_IP_MULTIPLE_TABLES
|
||||||
|
@ -710,7 +710,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
|
||||||
if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF))
|
if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF))
|
||||||
fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, prim);
|
fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, prim);
|
||||||
|
|
||||||
if (!ZERONET(prefix) && !(ifa->ifa_flags&IFA_F_SECONDARY) &&
|
if (!ipv4_is_zeronet(prefix) && !(ifa->ifa_flags&IFA_F_SECONDARY) &&
|
||||||
(prefix != addr || ifa->ifa_prefixlen < 32)) {
|
(prefix != addr || ifa->ifa_prefixlen < 32)) {
|
||||||
fib_magic(RTM_NEWROUTE, dev->flags&IFF_LOOPBACK ? RTN_LOCAL :
|
fib_magic(RTM_NEWROUTE, dev->flags&IFF_LOOPBACK ? RTN_LOCAL :
|
||||||
RTN_UNICAST, prefix, ifa->ifa_prefixlen, prim);
|
RTN_UNICAST, prefix, ifa->ifa_prefixlen, prim);
|
||||||
|
|
|
@ -1742,7 +1742,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
|
||||||
int ifindex;
|
int ifindex;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
if (!MULTICAST(addr))
|
if (!ipv4_is_multicast(addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
|
@ -1855,7 +1855,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
|
||||||
int leavegroup = 0;
|
int leavegroup = 0;
|
||||||
int i, j, rv;
|
int i, j, rv;
|
||||||
|
|
||||||
if (!MULTICAST(addr))
|
if (!ipv4_is_multicast(addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
|
@ -1985,7 +1985,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
|
||||||
struct ip_sf_socklist *newpsl, *psl;
|
struct ip_sf_socklist *newpsl, *psl;
|
||||||
int leavegroup = 0;
|
int leavegroup = 0;
|
||||||
|
|
||||||
if (!MULTICAST(addr))
|
if (!ipv4_is_multicast(addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (msf->imsf_fmode != MCAST_INCLUDE &&
|
if (msf->imsf_fmode != MCAST_INCLUDE &&
|
||||||
msf->imsf_fmode != MCAST_EXCLUDE)
|
msf->imsf_fmode != MCAST_EXCLUDE)
|
||||||
|
@ -2068,7 +2068,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
|
||||||
struct inet_sock *inet = inet_sk(sk);
|
struct inet_sock *inet = inet_sk(sk);
|
||||||
struct ip_sf_socklist *psl;
|
struct ip_sf_socklist *psl;
|
||||||
|
|
||||||
if (!MULTICAST(addr))
|
if (!ipv4_is_multicast(addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
|
@ -2130,7 +2130,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
|
||||||
if (psin->sin_family != AF_INET)
|
if (psin->sin_family != AF_INET)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
addr = psin->sin_addr.s_addr;
|
addr = psin->sin_addr.s_addr;
|
||||||
if (!MULTICAST(addr))
|
if (!ipv4_is_multicast(addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
|
@ -2180,7 +2180,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
|
||||||
struct ip_sf_socklist *psl;
|
struct ip_sf_socklist *psl;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!MULTICAST(loc_addr))
|
if (!ipv4_is_multicast(loc_addr))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
for (pmc=inet->mc_list; pmc; pmc=pmc->next) {
|
for (pmc=inet->mc_list; pmc; pmc=pmc->next) {
|
||||||
|
|
|
@ -176,7 +176,8 @@ static struct ip_tunnel * ipgre_tunnel_lookup(__be32 remote, __be32 local, __be3
|
||||||
}
|
}
|
||||||
for (t = tunnels_l[h1]; t; t = t->next) {
|
for (t = tunnels_l[h1]; t; t = t->next) {
|
||||||
if (local == t->parms.iph.saddr ||
|
if (local == t->parms.iph.saddr ||
|
||||||
(local == t->parms.iph.daddr && MULTICAST(local))) {
|
(local == t->parms.iph.daddr &&
|
||||||
|
ipv4_is_multicast(local))) {
|
||||||
if (t->parms.i_key == key && (t->dev->flags&IFF_UP))
|
if (t->parms.i_key == key && (t->dev->flags&IFF_UP))
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
@ -201,7 +202,7 @@ static struct ip_tunnel **__ipgre_bucket(struct ip_tunnel_parm *parms)
|
||||||
|
|
||||||
if (local)
|
if (local)
|
||||||
prio |= 1;
|
prio |= 1;
|
||||||
if (remote && !MULTICAST(remote)) {
|
if (remote && !ipv4_is_multicast(remote)) {
|
||||||
prio |= 2;
|
prio |= 2;
|
||||||
h ^= HASH(remote);
|
h ^= HASH(remote);
|
||||||
}
|
}
|
||||||
|
@ -367,7 +368,8 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
|
||||||
|
|
||||||
read_lock(&ipgre_lock);
|
read_lock(&ipgre_lock);
|
||||||
t = ipgre_tunnel_lookup(iph->daddr, iph->saddr, (flags&GRE_KEY) ? *(((__be32*)p) + (grehlen>>2) - 1) : 0);
|
t = ipgre_tunnel_lookup(iph->daddr, iph->saddr, (flags&GRE_KEY) ? *(((__be32*)p) + (grehlen>>2) - 1) : 0);
|
||||||
if (t == NULL || t->parms.iph.daddr == 0 || MULTICAST(t->parms.iph.daddr))
|
if (t == NULL || t->parms.iph.daddr == 0 ||
|
||||||
|
ipv4_is_multicast(t->parms.iph.daddr))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)
|
if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)
|
||||||
|
@ -619,7 +621,7 @@ static int ipgre_rcv(struct sk_buff *skb)
|
||||||
skb_postpull_rcsum(skb, skb_transport_header(skb), offset);
|
skb_postpull_rcsum(skb, skb_transport_header(skb), offset);
|
||||||
skb->pkt_type = PACKET_HOST;
|
skb->pkt_type = PACKET_HOST;
|
||||||
#ifdef CONFIG_NET_IPGRE_BROADCAST
|
#ifdef CONFIG_NET_IPGRE_BROADCAST
|
||||||
if (MULTICAST(iph->daddr)) {
|
if (ipv4_is_multicast(iph->daddr)) {
|
||||||
/* Looped back packet, drop it! */
|
/* Looped back packet, drop it! */
|
||||||
if (((struct rtable*)skb->dst)->fl.iif == 0)
|
if (((struct rtable*)skb->dst)->fl.iif == 0)
|
||||||
goto drop;
|
goto drop;
|
||||||
|
@ -783,7 +785,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
struct rt6_info *rt6 = (struct rt6_info*)skb->dst;
|
struct rt6_info *rt6 = (struct rt6_info*)skb->dst;
|
||||||
|
|
||||||
if (rt6 && mtu < dst_mtu(skb->dst) && mtu >= IPV6_MIN_MTU) {
|
if (rt6 && mtu < dst_mtu(skb->dst) && mtu >= IPV6_MIN_MTU) {
|
||||||
if ((tunnel->parms.iph.daddr && !MULTICAST(tunnel->parms.iph.daddr)) ||
|
if ((tunnel->parms.iph.daddr &&
|
||||||
|
!ipv4_is_multicast(tunnel->parms.iph.daddr)) ||
|
||||||
rt6->rt6i_dst.plen == 128) {
|
rt6->rt6i_dst.plen == 128) {
|
||||||
rt6->rt6i_flags |= RTF_MODIFIED;
|
rt6->rt6i_flags |= RTF_MODIFIED;
|
||||||
skb->dst->metrics[RTAX_MTU-1] = mtu;
|
skb->dst->metrics[RTAX_MTU-1] = mtu;
|
||||||
|
@ -1009,7 +1012,7 @@ ipgre_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||||
|
|
||||||
t = netdev_priv(dev);
|
t = netdev_priv(dev);
|
||||||
|
|
||||||
if (MULTICAST(p.iph.daddr))
|
if (ipv4_is_multicast(p.iph.daddr))
|
||||||
nflags = IFF_BROADCAST;
|
nflags = IFF_BROADCAST;
|
||||||
else if (p.iph.daddr)
|
else if (p.iph.daddr)
|
||||||
nflags = IFF_POINTOPOINT;
|
nflags = IFF_POINTOPOINT;
|
||||||
|
@ -1143,7 +1146,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
|
||||||
memcpy(&iph->daddr, daddr, 4);
|
memcpy(&iph->daddr, daddr, 4);
|
||||||
return t->hlen;
|
return t->hlen;
|
||||||
}
|
}
|
||||||
if (iph->daddr && !MULTICAST(iph->daddr))
|
if (iph->daddr && !ipv4_is_multicast(iph->daddr))
|
||||||
return t->hlen;
|
return t->hlen;
|
||||||
|
|
||||||
return -t->hlen;
|
return -t->hlen;
|
||||||
|
@ -1166,7 +1169,7 @@ static int ipgre_open(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
|
|
||||||
if (MULTICAST(t->parms.iph.daddr)) {
|
if (ipv4_is_multicast(t->parms.iph.daddr)) {
|
||||||
struct flowi fl = { .oif = t->parms.link,
|
struct flowi fl = { .oif = t->parms.link,
|
||||||
.nl_u = { .ip4_u =
|
.nl_u = { .ip4_u =
|
||||||
{ .daddr = t->parms.iph.daddr,
|
{ .daddr = t->parms.iph.daddr,
|
||||||
|
@ -1189,7 +1192,7 @@ static int ipgre_open(struct net_device *dev)
|
||||||
static int ipgre_close(struct net_device *dev)
|
static int ipgre_close(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
if (MULTICAST(t->parms.iph.daddr) && t->mlink) {
|
if (ipv4_is_multicast(t->parms.iph.daddr) && t->mlink) {
|
||||||
struct in_device *in_dev = inetdev_by_index(t->mlink);
|
struct in_device *in_dev = inetdev_by_index(t->mlink);
|
||||||
if (in_dev) {
|
if (in_dev) {
|
||||||
ip_mc_dec_group(in_dev, t->parms.iph.daddr);
|
ip_mc_dec_group(in_dev, t->parms.iph.daddr);
|
||||||
|
@ -1236,7 +1239,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
|
||||||
|
|
||||||
if (iph->daddr) {
|
if (iph->daddr) {
|
||||||
#ifdef CONFIG_NET_IPGRE_BROADCAST
|
#ifdef CONFIG_NET_IPGRE_BROADCAST
|
||||||
if (MULTICAST(iph->daddr)) {
|
if (ipv4_is_multicast(iph->daddr)) {
|
||||||
if (!iph->saddr)
|
if (!iph->saddr)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
dev->flags = IFF_BROADCAST;
|
dev->flags = IFF_BROADCAST;
|
||||||
|
|
|
@ -749,7 +749,7 @@ static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!MULTICAST(mfc->mfcc_mcastgrp.s_addr))
|
if (!ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
c=ipmr_cache_alloc();
|
c=ipmr_cache_alloc();
|
||||||
|
@ -1461,7 +1461,7 @@ int pim_rcv_v1(struct sk_buff * skb)
|
||||||
b. packet is not a NULL-REGISTER
|
b. packet is not a NULL-REGISTER
|
||||||
c. packet is not truncated
|
c. packet is not truncated
|
||||||
*/
|
*/
|
||||||
if (!MULTICAST(encap->daddr) ||
|
if (!ipv4_is_multicast(encap->daddr) ||
|
||||||
encap->tot_len == 0 ||
|
encap->tot_len == 0 ||
|
||||||
ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
|
ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
|
||||||
goto drop;
|
goto drop;
|
||||||
|
@ -1517,7 +1517,7 @@ static int pim_rcv(struct sk_buff * skb)
|
||||||
/* check if the inner packet is destined to mcast group */
|
/* check if the inner packet is destined to mcast group */
|
||||||
encap = (struct iphdr *)(skb_transport_header(skb) +
|
encap = (struct iphdr *)(skb_transport_header(skb) +
|
||||||
sizeof(struct pimreghdr));
|
sizeof(struct pimreghdr));
|
||||||
if (!MULTICAST(encap->daddr) ||
|
if (!ipv4_is_multicast(encap->daddr) ||
|
||||||
encap->tot_len == 0 ||
|
encap->tot_len == 0 ||
|
||||||
ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
|
ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
|
@ -530,7 +530,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
||||||
if (msg->msg_flags & MSG_DONTROUTE)
|
if (msg->msg_flags & MSG_DONTROUTE)
|
||||||
tos |= RTO_ONLINK;
|
tos |= RTO_ONLINK;
|
||||||
|
|
||||||
if (MULTICAST(daddr)) {
|
if (ipv4_is_multicast(daddr)) {
|
||||||
if (!ipc.oif)
|
if (!ipc.oif)
|
||||||
ipc.oif = inet->mc_index;
|
ipc.oif = inet->mc_index;
|
||||||
if (!saddr)
|
if (!saddr)
|
||||||
|
|
|
@ -1154,7 +1154,8 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (new_gw == old_gw || !IN_DEV_RX_REDIRECTS(in_dev)
|
if (new_gw == old_gw || !IN_DEV_RX_REDIRECTS(in_dev)
|
||||||
|| MULTICAST(new_gw) || BADCLASS(new_gw) || ZERONET(new_gw))
|
|| ipv4_is_multicast(new_gw) || ipv4_is_badclass(new_gw)
|
||||||
|
|| ipv4_is_zeronet(new_gw))
|
||||||
goto reject_redirect;
|
goto reject_redirect;
|
||||||
|
|
||||||
if (!IN_DEV_SHARED_MEDIA(in_dev)) {
|
if (!IN_DEV_SHARED_MEDIA(in_dev)) {
|
||||||
|
@ -1633,12 +1634,12 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
if (in_dev == NULL)
|
if (in_dev == NULL)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (MULTICAST(saddr) || BADCLASS(saddr) || LOOPBACK(saddr) ||
|
if (ipv4_is_multicast(saddr) || ipv4_is_badclass(saddr) ||
|
||||||
skb->protocol != htons(ETH_P_IP))
|
ipv4_is_loopback(saddr) || skb->protocol != htons(ETH_P_IP))
|
||||||
goto e_inval;
|
goto e_inval;
|
||||||
|
|
||||||
if (ZERONET(saddr)) {
|
if (ipv4_is_zeronet(saddr)) {
|
||||||
if (!LOCAL_MCAST(daddr))
|
if (!ipv4_is_local_multicast(daddr))
|
||||||
goto e_inval;
|
goto e_inval;
|
||||||
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
|
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
|
||||||
} else if (fib_validate_source(saddr, 0, tos, 0,
|
} else if (fib_validate_source(saddr, 0, tos, 0,
|
||||||
|
@ -1680,7 +1681,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_IP_MROUTE
|
#ifdef CONFIG_IP_MROUTE
|
||||||
if (!LOCAL_MCAST(daddr) && IN_DEV_MFORWARD(in_dev))
|
if (!ipv4_is_local_multicast(daddr) && IN_DEV_MFORWARD(in_dev))
|
||||||
rth->u.dst.input = ip_mr_input;
|
rth->u.dst.input = ip_mr_input;
|
||||||
#endif
|
#endif
|
||||||
RT_CACHE_STAT_INC(in_slow_mc);
|
RT_CACHE_STAT_INC(in_slow_mc);
|
||||||
|
@ -1890,7 +1891,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
by fib_lookup.
|
by fib_lookup.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (MULTICAST(saddr) || BADCLASS(saddr) || LOOPBACK(saddr))
|
if (ipv4_is_multicast(saddr) || ipv4_is_badclass(saddr) ||
|
||||||
|
ipv4_is_loopback(saddr))
|
||||||
goto martian_source;
|
goto martian_source;
|
||||||
|
|
||||||
if (daddr == htonl(0xFFFFFFFF) || (saddr == 0 && daddr == 0))
|
if (daddr == htonl(0xFFFFFFFF) || (saddr == 0 && daddr == 0))
|
||||||
|
@ -1899,10 +1901,11 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
/* Accept zero addresses only to limited broadcast;
|
/* Accept zero addresses only to limited broadcast;
|
||||||
* I even do not know to fix it or not. Waiting for complains :-)
|
* I even do not know to fix it or not. Waiting for complains :-)
|
||||||
*/
|
*/
|
||||||
if (ZERONET(saddr))
|
if (ipv4_is_zeronet(saddr))
|
||||||
goto martian_source;
|
goto martian_source;
|
||||||
|
|
||||||
if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
|
if (ipv4_is_badclass(daddr) || ipv4_is_zeronet(daddr) ||
|
||||||
|
ipv4_is_loopback(daddr))
|
||||||
goto martian_destination;
|
goto martian_destination;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1949,7 +1952,7 @@ brd_input:
|
||||||
if (skb->protocol != htons(ETH_P_IP))
|
if (skb->protocol != htons(ETH_P_IP))
|
||||||
goto e_inval;
|
goto e_inval;
|
||||||
|
|
||||||
if (ZERONET(saddr))
|
if (ipv4_is_zeronet(saddr))
|
||||||
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
|
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
|
||||||
else {
|
else {
|
||||||
err = fib_validate_source(saddr, 0, tos, 0, dev, &spec_dst,
|
err = fib_validate_source(saddr, 0, tos, 0, dev, &spec_dst,
|
||||||
|
@ -2079,7 +2082,7 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
Note, that multicast routers are not affected, because
|
Note, that multicast routers are not affected, because
|
||||||
route cache entry is created eventually.
|
route cache entry is created eventually.
|
||||||
*/
|
*/
|
||||||
if (MULTICAST(daddr)) {
|
if (ipv4_is_multicast(daddr)) {
|
||||||
struct in_device *in_dev;
|
struct in_device *in_dev;
|
||||||
|
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
|
@ -2088,7 +2091,8 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr,
|
||||||
ip_hdr(skb)->protocol);
|
ip_hdr(skb)->protocol);
|
||||||
if (our
|
if (our
|
||||||
#ifdef CONFIG_IP_MROUTE
|
#ifdef CONFIG_IP_MROUTE
|
||||||
|| (!LOCAL_MCAST(daddr) && IN_DEV_MFORWARD(in_dev))
|
|| (!ipv4_is_local_multicast(daddr) &&
|
||||||
|
IN_DEV_MFORWARD(in_dev))
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
@ -2114,14 +2118,14 @@ static inline int __mkroute_output(struct rtable **result,
|
||||||
u32 tos = RT_FL_TOS(oldflp);
|
u32 tos = RT_FL_TOS(oldflp);
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
if (LOOPBACK(fl->fl4_src) && !(dev_out->flags&IFF_LOOPBACK))
|
if (ipv4_is_loopback(fl->fl4_src) && !(dev_out->flags&IFF_LOOPBACK))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (fl->fl4_dst == htonl(0xFFFFFFFF))
|
if (fl->fl4_dst == htonl(0xFFFFFFFF))
|
||||||
res->type = RTN_BROADCAST;
|
res->type = RTN_BROADCAST;
|
||||||
else if (MULTICAST(fl->fl4_dst))
|
else if (ipv4_is_multicast(fl->fl4_dst))
|
||||||
res->type = RTN_MULTICAST;
|
res->type = RTN_MULTICAST;
|
||||||
else if (BADCLASS(fl->fl4_dst) || ZERONET(fl->fl4_dst))
|
else if (ipv4_is_badclass(fl->fl4_dst) || ipv4_is_zeronet(fl->fl4_dst))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (dev_out->flags & IFF_LOOPBACK)
|
if (dev_out->flags & IFF_LOOPBACK)
|
||||||
|
@ -2201,7 +2205,7 @@ static inline int __mkroute_output(struct rtable **result,
|
||||||
#ifdef CONFIG_IP_MROUTE
|
#ifdef CONFIG_IP_MROUTE
|
||||||
if (res->type == RTN_MULTICAST) {
|
if (res->type == RTN_MULTICAST) {
|
||||||
if (IN_DEV_MFORWARD(in_dev) &&
|
if (IN_DEV_MFORWARD(in_dev) &&
|
||||||
!LOCAL_MCAST(oldflp->fl4_dst)) {
|
!ipv4_is_local_multicast(oldflp->fl4_dst)) {
|
||||||
rth->u.dst.input = ip_mr_input;
|
rth->u.dst.input = ip_mr_input;
|
||||||
rth->u.dst.output = ip_mc_output;
|
rth->u.dst.output = ip_mc_output;
|
||||||
}
|
}
|
||||||
|
@ -2271,9 +2275,9 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
|
||||||
|
|
||||||
if (oldflp->fl4_src) {
|
if (oldflp->fl4_src) {
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
if (MULTICAST(oldflp->fl4_src) ||
|
if (ipv4_is_multicast(oldflp->fl4_src) ||
|
||||||
BADCLASS(oldflp->fl4_src) ||
|
ipv4_is_badclass(oldflp->fl4_src) ||
|
||||||
ZERONET(oldflp->fl4_src))
|
ipv4_is_zeronet(oldflp->fl4_src))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */
|
/* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */
|
||||||
|
@ -2290,7 +2294,8 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (oldflp->oif == 0
|
if (oldflp->oif == 0
|
||||||
&& (MULTICAST(oldflp->fl4_dst) || oldflp->fl4_dst == htonl(0xFFFFFFFF))) {
|
&& (ipv4_is_multicast(oldflp->fl4_dst) ||
|
||||||
|
oldflp->fl4_dst == htonl(0xFFFFFFFF))) {
|
||||||
/* Special hack: user can direct multicasts
|
/* Special hack: user can direct multicasts
|
||||||
and limited broadcast via necessary interface
|
and limited broadcast via necessary interface
|
||||||
without fiddling with IP_MULTICAST_IF or IP_PKTINFO.
|
without fiddling with IP_MULTICAST_IF or IP_PKTINFO.
|
||||||
|
@ -2327,14 +2332,15 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
|
||||||
goto out; /* Wrong error code */
|
goto out; /* Wrong error code */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LOCAL_MCAST(oldflp->fl4_dst) || oldflp->fl4_dst == htonl(0xFFFFFFFF)) {
|
if (ipv4_is_local_multicast(oldflp->fl4_dst) ||
|
||||||
|
oldflp->fl4_dst == htonl(0xFFFFFFFF)) {
|
||||||
if (!fl.fl4_src)
|
if (!fl.fl4_src)
|
||||||
fl.fl4_src = inet_select_addr(dev_out, 0,
|
fl.fl4_src = inet_select_addr(dev_out, 0,
|
||||||
RT_SCOPE_LINK);
|
RT_SCOPE_LINK);
|
||||||
goto make_route;
|
goto make_route;
|
||||||
}
|
}
|
||||||
if (!fl.fl4_src) {
|
if (!fl.fl4_src) {
|
||||||
if (MULTICAST(oldflp->fl4_dst))
|
if (ipv4_is_multicast(oldflp->fl4_dst))
|
||||||
fl.fl4_src = inet_select_addr(dev_out, 0,
|
fl.fl4_src = inet_select_addr(dev_out, 0,
|
||||||
fl.fl4_scope);
|
fl.fl4_scope);
|
||||||
else if (!oldflp->fl4_dst)
|
else if (!oldflp->fl4_dst)
|
||||||
|
@ -2618,7 +2624,7 @@ static int rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
|
||||||
#ifdef CONFIG_IP_MROUTE
|
#ifdef CONFIG_IP_MROUTE
|
||||||
__be32 dst = rt->rt_dst;
|
__be32 dst = rt->rt_dst;
|
||||||
|
|
||||||
if (MULTICAST(dst) && !LOCAL_MCAST(dst) &&
|
if (ipv4_is_multicast(dst) && !ipv4_is_local_multicast(dst) &&
|
||||||
IPV4_DEVCONF_ALL(&init_net, MC_FORWARDING)) {
|
IPV4_DEVCONF_ALL(&init_net, MC_FORWARDING)) {
|
||||||
int err = ipmr_get_route(skb, r, nowait);
|
int err = ipmr_get_route(skb, r, nowait);
|
||||||
if (err <= 0) {
|
if (err <= 0) {
|
||||||
|
|
|
@ -626,7 +626,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
||||||
connected = 0;
|
connected = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (MULTICAST(daddr)) {
|
if (ipv4_is_multicast(daddr)) {
|
||||||
if (!ipc.oif)
|
if (!ipc.oif)
|
||||||
ipc.oif = inet->mc_index;
|
ipc.oif = inet->mc_index;
|
||||||
if (!saddr)
|
if (!saddr)
|
||||||
|
|
Loading…
Reference in a new issue