diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
| commit | 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch) | |
| tree | f219b25bebeca4f1e9e58e7174fe7870675b6246 /java/src/IceInternal/UdpTransceiver.java | |
| parent | Add Makefile.mak rule to register assemblies in source dir. (diff) | |
| download | ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2 ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip | |
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'java/src/IceInternal/UdpTransceiver.java')
| -rw-r--r-- | java/src/IceInternal/UdpTransceiver.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 8b49ec6754b..6799e35feca 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -350,7 +350,7 @@ final class UdpTransceiver implements Transceiver try { - _addr = Network.getAddressForServer(host, port, instance.protocolSupport()); + _addr = Network.getAddressForServer(host, port, instance.protocolSupport(), instance.preferIPv6()); _fd = Network.createUdpSocket(_addr); setBufSize(instance); Network.setBlock(_fd, false); @@ -375,7 +375,7 @@ final class UdpTransceiver implements Transceiver // int protocol = _mcastAddr.getAddress().getAddress().length == 4 ? Network.EnableIPv4 : Network.EnableIPv6; - _addr = Network.getAddressForServer("", port, protocol); + _addr = Network.getAddressForServer("", port, protocol, instance.preferIPv6()); } _addr = Network.doBind(_fd, _addr); configureMulticast(_mcastAddr, mcastInterface, -1); @@ -563,7 +563,8 @@ final class UdpTransceiver implements Transceiver intf = java.net.NetworkInterface.getByName(interfaceAddr); if(intf == null) { - java.net.InetSocketAddress addr = Network.getAddress(interfaceAddr, 0, Network.EnableIPv4); + java.net.InetSocketAddress addr = Network.getAddressForServer(interfaceAddr, 0, + Network.EnableIPv4, false); intf = java.net.NetworkInterface.getByInetAddress(addr.getAddress()); } } |