andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use StandardSocketOptions#IP_MULTICAST_IF as default source when joing multicast groups (#11585)

Browse Source 
Motivation:

We should use StandardSocketOptions#IP_MULTICAST_IF as default source when joing multicast groups and only try to use the localAddress if this returns null.

Modifications:

First check if StandardSocketOptions#IP_MULTICAST_IF was set and if so use the network interface when joining mulicast groups

Result:

Fixes https://github.com/netty/netty/issues/11541
This commit is contained in:
Norman Maurer 2021-08-18 12:11:48 +02:00 committed by GitHub
parent cafc669436
commit 228a01e268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollDatagramChannel.java
View File

@ -141,9 +141,11 @@ public final class EpollDatagramChannel extends AbstractEpollChannel implements
@Override @Override
public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) { public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) {
try { try {
return joinGroup( NetworkInterface iface = config().getNetworkInterface();
multicastAddress, if (iface == null) {
NetworkInterface.getByInetAddress(localAddress().getAddress()), null, promise); iface = NetworkInterface.getByInetAddress(localAddress().getAddress());
}
return joinGroup(multicastAddress, iface, null, promise);
} catch (IOException e) { } catch (IOException e) {
promise.setFailure(e); promise.setFailure(e);
} }

9
transport-native-kqueue/src/main/java/io/netty/channel/kqueue/KQueueDatagramChannel.java
View File

@ -99,10 +99,11 @@ public final class KQueueDatagramChannel extends AbstractKQueueDatagramChannel i
@Override @Override
public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) { public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) {
try { try {
return joinGroup( NetworkInterface iface = config().getNetworkInterface();
multicastAddress, if (iface == null) {
NetworkInterface.getByInetAddress(localAddress().getAddress()), iface = NetworkInterface.getByInetAddress(localAddress().getAddress());
null, promise); }
return joinGroup(multicastAddress, iface, null, promise);
} catch (SocketException e) { } catch (SocketException e) {
promise.setFailure(e); promise.setFailure(e);
} }

8
transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
View File

@ -369,10 +369,12 @@ public final class NioDatagramChannel
@Override @Override
public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) { public ChannelFuture joinGroup(InetAddress multicastAddress, ChannelPromise promise) {
try { try {
NetworkInterface iface = config.getNetworkInterface();
if (iface == null) {
iface = NetworkInterface.getByInetAddress(localAddress().getAddress());
}
return joinGroup( return joinGroup(
multicastAddress, multicastAddress, iface, null, promise);
NetworkInterface.getByInetAddress(localAddress().getAddress()),
null, promise);
} catch (SocketException e) { } catch (SocketException e) {
promise.setFailure(e); promise.setFailure(e);
} }