Commit 854da991 authored by Robert Shearman's avatar Robert Shearman Committed by David S. Miller

ipv4: Allow sending multicast packets on specific i/f using VRF socket

It is useful to be able to use the same socket for listening in a
specific VRF, as for sending multicast packets out of a specific
interface. However, the bound device on the socket currently takes
precedence and results in the packets not being sent.

Relax the condition on overriding the output interface to use for
sending packets out of UDP, raw and ping sockets to allow multicast
packets to be sent using the specified multicast interface.
Signed-off-by: default avatarRobert Shearman <rshearma@vyatta.att-mail.com>
Signed-off-by: default avatarMike Manning <mmanning@vyatta.att-mail.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6919622a
...@@ -42,7 +42,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len ...@@ -42,7 +42,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->inet_saddr; saddr = inet->inet_saddr;
if (ipv4_is_multicast(usin->sin_addr.s_addr)) { if (ipv4_is_multicast(usin->sin_addr.s_addr)) {
if (!oif) if (!oif || netif_index_is_l3_master(sock_net(sk), oif))
oif = inet->mc_index; oif = inet->mc_index;
if (!saddr) if (!saddr)
saddr = inet->mc_addr; saddr = inet->mc_addr;
......
...@@ -779,7 +779,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) ...@@ -779,7 +779,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
} }
if (ipv4_is_multicast(daddr)) { if (ipv4_is_multicast(daddr)) {
if (!ipc.oif) if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))
ipc.oif = inet->mc_index; ipc.oif = inet->mc_index;
if (!saddr) if (!saddr)
saddr = inet->mc_addr; saddr = inet->mc_addr;
......
...@@ -608,7 +608,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) ...@@ -608,7 +608,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
tos |= RTO_ONLINK; tos |= RTO_ONLINK;
if (ipv4_is_multicast(daddr)) { if (ipv4_is_multicast(daddr)) {
if (!ipc.oif) if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))
ipc.oif = inet->mc_index; ipc.oif = inet->mc_index;
if (!saddr) if (!saddr)
saddr = inet->mc_addr; saddr = inet->mc_addr;
......
...@@ -1042,7 +1042,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) ...@@ -1042,7 +1042,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
} }
if (ipv4_is_multicast(daddr)) { if (ipv4_is_multicast(daddr)) {
if (!ipc.oif) if (!ipc.oif || netif_index_is_l3_master(sock_net(sk), ipc.oif))
ipc.oif = inet->mc_index; ipc.oif = inet->mc_index;
if (!saddr) if (!saddr)
saddr = inet->mc_addr; saddr = inet->mc_addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment