Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhance unit test and logging #3374

Merged
merged 4 commits into from
Jan 29, 2019
Merged

enhance unit test and logging #3374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
177efc5
enhance unit test and logging
beiwei30 Jan 29, 2019
84347ac
enhance logging message
beiwei30 Jan 29, 2019
cc9d2a2
fix unit test
beiwei30 Jan 29, 2019
e74c79a
make code clean
beiwei30 Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,25 +346,24 @@ public static String toURL(String protocol, String host, int port, String path)
}

public static void joinMulticastGroup (MulticastSocket multicastSocket, InetAddress multicastAddress) throws IOException {
setInterface(multicastSocket, multicastAddress);
setInterface(multicastSocket, multicastAddress instanceof Inet6Address);
multicastSocket.setLoopbackMode(false);
multicastSocket.joinGroup(multicastAddress);
}

public static void setInterface (MulticastSocket multicastSocket, InetAddress multicastAddress) throws IOException{
public static void setInterface (MulticastSocket multicastSocket, boolean preferIpv6) throws IOException{
boolean interfaceSet = false;
boolean ipV6 = multicastAddress instanceof Inet6Address;
Enumeration interfaces = NetworkInterface.getNetworkInterfaces();
while (interfaces.hasMoreElements()) {
NetworkInterface i = (NetworkInterface) interfaces.nextElement();
Enumeration addresses = i.getInetAddresses();
while (addresses.hasMoreElements()) {
InetAddress address = (InetAddress) addresses.nextElement();
if (ipV6 && address instanceof Inet6Address) {
if (preferIpv6 && address instanceof Inet6Address) {
multicastSocket.setInterface(address);
interfaceSet = true;
break;
} else if (!ipV6 && address instanceof Inet4Address) {
} else if (!preferIpv6 && address instanceof Inet4Address) {
multicastSocket.setInterface(address);
interfaceSet = true;
break;
Expand All @@ -376,4 +375,4 @@ public static void setInterface (MulticastSocket multicastSocket, InetAddress mu
}
}

}
}
19 changes: 16 additions & 3 deletions ...gistry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import java.io.IOException;
import java.net.DatagramPacket;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.MulticastSocket;
Expand Down Expand Up @@ -81,9 +82,8 @@ public MulticastRegistry(URL url) {
}
try {
multicastAddress = InetAddress.getByName(url.getHost());
if (!multicastAddress.isMulticastAddress()) {
throw new IllegalArgumentException("Invalid multicast address " + url.getHost() + ", ipv4 multicast address scope: 224.0.0.0 - 239.255.255.255.");
}
checkMulticastAddress(multicastAddress);

multicastPort = url.getPort() <= 0 ? DEFAULT_MULTICAST_PORT : url.getPort();
multicastSocket = new MulticastSocket(multicastPort);
NetUtils.joinMulticastGroup(multicastSocket, multicastAddress);
Expand Down Expand Up @@ -132,6 +132,19 @@ public void run() {
}
}

private void checkMulticastAddress(InetAddress multicastAddress) {
if (!multicastAddress.isMulticastAddress()) {
String message = "Invalid multicast address " + multicastAddress;
if (!(multicastAddress instanceof Inet4Address)) {
throw new IllegalArgumentException(message + ", " +
"ipv4 multicast address scope: 224.0.0.0 - 239.255.255.255.");
} else {
throw new IllegalArgumentException(message + ", " + "ipv6 multicast address must start with ff, " +
"for example: ff01::1");
}
}
}

/**
* Remove the expired providers, only when "clean" parameter is true.
*/
Expand Down
49 changes: 25 additions & 24 deletions ...ry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,34 +227,35 @@ public void testMulticastAddress() {
MulticastSocket multicastSocket = null;
try {
// ipv4 multicast address
try {
multicastAddress = InetAddress.getByName("224.55.66.77");
multicastSocket = new MulticastSocket(2345);
multicastSocket.setLoopbackMode(false);
NetUtils.setInterface(multicastSocket, multicastAddress);
multicastSocket.joinGroup(multicastAddress);
} finally {
if (multicastSocket != null) {
multicastSocket.close();
}
multicastAddress = InetAddress.getByName("224.55.66.77");
multicastSocket = new MulticastSocket(2345);
multicastSocket.setLoopbackMode(false);
NetUtils.setInterface(multicastSocket, false);
multicastSocket.joinGroup(multicastAddress);
} catch (Exception e) {
Assertions.fail(e);
} finally {
if (multicastSocket != null) {
multicastSocket.close();
}
}

// multicast ipv6 address,
/*try {
multicastAddress = InetAddress.getByName("ff01::1");
multicastSocket = new MulticastSocket();
multicastSocket.setLoopbackMode(false);
NetUtils.setInterface(multicastSocket, multicastAddress);
multicastSocket.joinGroup(multicastAddress);
} finally {
if (multicastSocket != null) {
multicastSocket.close();
}
}*/
// multicast ipv6 address,
try {
multicastAddress = InetAddress.getByName("ff01::1");

} catch (Exception e) {
Assertions.fail(e);
multicastSocket = new MulticastSocket();
multicastSocket.setLoopbackMode(false);
NetUtils.setInterface(multicastSocket, true);
multicastSocket.joinGroup(multicastAddress);
} catch (Throwable t) {
t.printStackTrace();
} finally {
if (multicastSocket != null) {
multicastSocket.close();
}
}

}

}