diff --git a/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java b/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java index 35bc6f9..2463ef0 100644 --- a/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java +++ b/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvesters.java @@ -41,22 +41,7 @@ public class MappingCandidateHarvesters * The {@link Logger} used by the {@link MappingCandidateHarvesters} * class for logging output. */ - private static final Logger logger - = Logger.getLogger(MappingCandidateHarvesters.class.getName()); - - /** - * The name of the property that specifies the local address, if any, for - * the pre-configured NAT harvester. - */ - public static final String NAT_HARVESTER_LOCAL_ADDRESS_PNAME - = "org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS"; - - /** - * The name of the property that specifies the public address, if any, for - * the pre-configured NAT harvester. - */ - public static final String NAT_HARVESTER_PUBLIC_ADDRESS_PNAME - = "org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS"; + private static final Logger logger = Logger.getLogger(MappingCandidateHarvesters.class.getName()); /** * Whether {@link #harvesters} has been initialized. @@ -106,23 +91,14 @@ public class MappingCandidateHarvesters long start = System.currentTimeMillis(); List harvesterList = new LinkedList<>(); - - // Pre-configured NAT harvester. - String localAddressStr - = StackProperties.getString(NAT_HARVESTER_LOCAL_ADDRESS_PNAME); - String publicAddressStr - = StackProperties.getString(NAT_HARVESTER_PUBLIC_ADDRESS_PNAME); - - if (localAddressStr != null && publicAddressStr != null) + for (HarvestConfig.StaticMapping staticMapping : config.getStaticMappings()) { + logger.info("Adding a static mapping: " + staticMapping); // the port number is unused, 9 is for "discard" - TransportAddress localAddress - = new TransportAddress(localAddressStr, 9, Transport.UDP); - TransportAddress publicAddress - = new TransportAddress(publicAddressStr, 9, Transport.UDP); + TransportAddress localAddress = new TransportAddress(staticMapping.getLocalAddress(), 9, Transport.UDP); + TransportAddress publicAddress = new TransportAddress(staticMapping.getPublicAddress(), 9, Transport.UDP); - harvesterList.add( - new MappingCandidateHarvester(publicAddress, localAddress)); + harvesterList.add(new MappingCandidateHarvester(publicAddress, localAddress)); } // AWS harvester diff --git a/src/main/kotlin/org/ice4j/ice/harvest/HarvestConfig.kt b/src/main/kotlin/org/ice4j/ice/harvest/HarvestConfig.kt index 1e6ff1a..5580da7 100644 --- a/src/main/kotlin/org/ice4j/ice/harvest/HarvestConfig.kt +++ b/src/main/kotlin/org/ice4j/ice/harvest/HarvestConfig.kt @@ -16,6 +16,7 @@ package org.ice4j.ice.harvest +import com.typesafe.config.Config import org.jitsi.metaconfig.config import org.jitsi.metaconfig.optionalconfig import java.time.Duration @@ -74,6 +75,34 @@ class HarvestConfig { } fun forceAwsHarvester() = enableAwsHarvester + private val legacyNatHarvesterLocalAddress: String? by optionalconfig { + "org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS".from(configSource) + } + + private val legacyNatHarvesterPublicAddress: String? by optionalconfig { + "org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS".from(configSource) + } + + private val staticMappingsFromNewConfig: Set by config { + "ice4j.harvest.mapping.static-mappings".from(configSource) + .convertFrom> { cfg -> + cfg.map { StaticMapping(it.getString("localAddress"), it.getString("publicAddress")) }.toSet() + } + } + + val staticMappings: Set = let { + if (legacyNatHarvesterLocalAddress != null && legacyNatHarvesterPublicAddress != null) { + setOf( + StaticMapping(legacyNatHarvesterLocalAddress!!, legacyNatHarvesterPublicAddress!!), + *staticMappingsFromNewConfig.toTypedArray() + ) + } else { + staticMappingsFromNewConfig + } + } + + data class StaticMapping(val localAddress: String, val publicAddress: String) + companion object { @JvmField val config = HarvestConfig() diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index c4f7a7f..b65ef56 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -53,6 +53,13 @@ ice4j { addresses = [ ] # addresses = [ "stun1.example.com:5379", "stun2.example.com:443" ] } + // Pre-configured mappings + static-mappings = [ + #{ + # local-address = "10.10.0.123" + # public-address = "1.2.3.4" + #} + ] } } }