Do not limit org.ice4j.ice.harvest.DISABLE_LINK_LOCAL_ADDRESSES to IPv6. (#156)
* Do not limit DISABLE_LINK_LOCAL_ADDRESSES to IPv6. * Removed part about IPv6 for in comment for DISABLE_LINK_LOCAL_ADDRESSES.
This commit is contained in:
parent
4027cf429d
commit
ce42c77b82
@ -220,7 +220,7 @@ public class StackProperties
|
|||||||
= "org.ice4j.ice.harvest.ALLOWED_ADDRESSES";
|
= "org.ice4j.ice.harvest.ALLOWED_ADDRESSES";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the property which, if set to true, specifies that IPv6
|
* The name of the property which, if set to true, specifies that
|
||||||
* link local addresses should not be used for candidate allocations.
|
* link local addresses should not be used for candidate allocations.
|
||||||
*/
|
*/
|
||||||
public static final String DISABLE_LINK_LOCAL_ADDRESSES
|
public static final String DISABLE_LINK_LOCAL_ADDRESSES
|
||||||
|
|||||||
@ -286,7 +286,7 @@ public abstract class AbstractTcpListener
|
|||||||
boolean useIPv6 = !StackProperties.getBoolean(
|
boolean useIPv6 = !StackProperties.getBoolean(
|
||||||
StackProperties.DISABLE_IPv6,
|
StackProperties.DISABLE_IPv6,
|
||||||
false);
|
false);
|
||||||
boolean useIPv6LinkLocal = !StackProperties.getBoolean(
|
boolean useLinkLocalAddresses = !StackProperties.getBoolean(
|
||||||
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
||||||
false);
|
false);
|
||||||
|
|
||||||
@ -335,8 +335,7 @@ public abstract class AbstractTcpListener
|
|||||||
if (!useIPv6 && (address instanceof Inet6Address))
|
if (!useIPv6 && (address instanceof Inet6Address))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!useIPv6LinkLocal
|
if (!useLinkLocalAddresses
|
||||||
&& (address instanceof Inet6Address)
|
|
||||||
&& address.isLinkLocalAddress())
|
&& address.isLinkLocalAddress())
|
||||||
{
|
{
|
||||||
logger.info("Not using link-local address " + address +" for"
|
logger.info("Not using link-local address " + address +" for"
|
||||||
|
|||||||
@ -232,7 +232,7 @@ public class HostCandidateHarvester
|
|||||||
boolean isIPv6Disabled = StackProperties.getBoolean(
|
boolean isIPv6Disabled = StackProperties.getBoolean(
|
||||||
StackProperties.DISABLE_IPv6,
|
StackProperties.DISABLE_IPv6,
|
||||||
false);
|
false);
|
||||||
boolean isIPv6LinkLocalDisabled = StackProperties.getBoolean(
|
boolean isLinkLocalAddressesDisabled = StackProperties.getBoolean(
|
||||||
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
||||||
false);
|
false);
|
||||||
|
|
||||||
@ -259,8 +259,7 @@ public class HostCandidateHarvester
|
|||||||
|
|
||||||
if (isIPv6Disabled && address instanceof Inet6Address)
|
if (isIPv6Disabled && address instanceof Inet6Address)
|
||||||
continue;
|
continue;
|
||||||
if (isIPv6LinkLocalDisabled
|
if (isLinkLocalAddressesDisabled
|
||||||
&& address instanceof Inet6Address
|
|
||||||
&& address.isLinkLocalAddress())
|
&& address.isLinkLocalAddress())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@ -316,7 +315,7 @@ public class HostCandidateHarvester
|
|||||||
StackProperties.DISABLE_IPv6,
|
StackProperties.DISABLE_IPv6,
|
||||||
false);
|
false);
|
||||||
|
|
||||||
boolean isIPv6LinkLocalDisabled = StackProperties.getBoolean(
|
boolean isLinkLocalAddressesDisabled = StackProperties.getBoolean(
|
||||||
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
StackProperties.DISABLE_LINK_LOCAL_ADDRESSES,
|
||||||
false);
|
false);
|
||||||
|
|
||||||
@ -353,8 +352,7 @@ public class HostCandidateHarvester
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isIPv6LinkLocalDisabled
|
if (isLinkLocalAddressesDisabled
|
||||||
&& (addr instanceof Inet6Address)
|
|
||||||
&& addr.isLinkLocalAddress())
|
&& addr.isLinkLocalAddress())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user