Compare commits
10 Commits
update-dep
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d289f125a4 | ||
|
|
0d8af275cd | ||
|
|
1c60acc59b | ||
|
|
fd43e6c181 | ||
|
|
27ad37d1af | ||
|
|
9fe2d69cf1 | ||
|
|
a947919f40 | ||
|
|
76e8a1968d | ||
|
|
28a23e1859 | ||
|
|
71e244dd67 |
@ -7,3 +7,11 @@ charset = utf-8
|
||||
indent_size = 2
|
||||
indent_style = space
|
||||
max_line_length = 120
|
||||
|
||||
[*.{kt,kts}]
|
||||
max_line_length = 120
|
||||
ktlint_code_style = intellij_idea
|
||||
|
||||
# I find trailing commas annoying
|
||||
ktlint_standard_trailing-comma-on-call-site = disabled
|
||||
ktlint_standard_trailing-comma-on-declaration-site = disabled
|
||||
|
||||
14
.github/workflows/maven.yml
vendored
14
.github/workflows/maven.yml
vendored
@ -11,7 +11,7 @@ on:
|
||||
|
||||
env:
|
||||
# Java version to use for the release
|
||||
RELEASE_JAVA_VERSION: 8
|
||||
RELEASE_JAVA_VERSION: 11
|
||||
|
||||
jobs:
|
||||
test:
|
||||
@ -19,16 +19,16 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
java: [ 8, 11, 17 ]
|
||||
java: [ 11, 17 ]
|
||||
|
||||
name: Java ${{ matrix.java }}
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up JDK ${{ matrix.java }}
|
||||
uses: actions/setup-java@v2
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: ${{ matrix.java }}
|
||||
@ -39,7 +39,7 @@ jobs:
|
||||
|
||||
- name: Upload coverage report
|
||||
if: matrix.java == env.RELEASE_JAVA_VERSION
|
||||
uses: codecov/codecov-action@v1
|
||||
uses: codecov/codecov-action@v2
|
||||
|
||||
release:
|
||||
if: github.ref == 'refs/heads/master'
|
||||
@ -47,12 +47,12 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v2
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: ${{ env.RELEASE_JAVA_VERSION }}
|
||||
|
||||
@ -4,7 +4,7 @@ The Interactive Connectivity Establishment (ICE) protocol combines various NAT t
|
||||
|
||||
This project provides a Java implementation of the ICE protocol that would be usable by both SIP and XMPP applications. The project also provides features such as socket sharing and support for Pseudo TCP.
|
||||
|
||||
ice4j is maintained by the [Jitsi](https://jitsi.org/) community. Use Jitsi's [dev mailing list](https://jitsi.org/Development/MailingLists) for questions and discussions.
|
||||
ice4j is maintained by the [Jitsi](https://jitsi.org/) community. Use Jitsi's [community forum](https://community.jitsi.org) for questions and discussions.
|
||||
|
||||
Thanks
|
||||
------
|
||||
|
||||
58
pom.xml
58
pom.xml
@ -38,10 +38,11 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<jicoco.version>1.1-95-gd8fd866</jicoco.version>
|
||||
<kotlin.version>1.5.31</kotlin.version>
|
||||
<kotest.version>4.6.3</kotest.version>
|
||||
<junit.version>5.8.1</junit.version>
|
||||
<jicoco.version>1.1-127-gf49982f</jicoco.version>
|
||||
<kotlin.version>1.9.10</kotlin.version>
|
||||
<dokka.version>1.9.0</dokka.version>
|
||||
<kotest.version>5.7.2</kotest.version>
|
||||
<junit.version>5.10.0</junit.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@ -58,7 +59,7 @@
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>jitsi-utils</artifactId>
|
||||
<version>1.0-114-g43815ed</version>
|
||||
<version>1.0-127-g6c65524</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
@ -70,7 +71,7 @@
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-launcher</artifactId>
|
||||
<version>1.8.1</version>
|
||||
<version>1.10.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -106,7 +107,13 @@
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>4.0.0</version>
|
||||
<version>4.5.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.mockk</groupId>
|
||||
<artifactId>mockk-jvm</artifactId>
|
||||
<version>1.13.8</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -146,7 +153,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<jvmTarget>1.8</jvmTarget>
|
||||
<jvmTarget>11</jvmTarget>
|
||||
<args>
|
||||
<arg>-Xallow-result-return-type</arg>
|
||||
</args>
|
||||
@ -155,7 +162,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<version>3.10.1</version>
|
||||
<executions>
|
||||
<!-- Replacing default-compile as it is treated specially by maven -->
|
||||
<execution>
|
||||
@ -183,8 +190,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<release>11</release>
|
||||
<compilerArgs>
|
||||
<arg>-Xlint:all</arg>
|
||||
</compilerArgs>
|
||||
@ -193,10 +199,17 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<version>3.1.1</version>
|
||||
<version>3.1.2</version>
|
||||
<configuration>
|
||||
<configLocation>checkstyle.xml</configLocation>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.puppycrawl.tools</groupId>
|
||||
<artifactId>checkstyle</artifactId>
|
||||
<version>10.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@ -208,7 +221,7 @@
|
||||
<plugin>
|
||||
<groupId>com.github.gantsign.maven</groupId>
|
||||
<artifactId>ktlint-maven-plugin</artifactId>
|
||||
<version>1.7.0</version>
|
||||
<version>3.0.0</version>
|
||||
<configuration>
|
||||
<sourceRoots>
|
||||
<sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>
|
||||
@ -229,7 +242,7 @@
|
||||
<plugin>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>bnd-maven-plugin</artifactId>
|
||||
<version>5.2.0</version>
|
||||
<version>6.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@ -241,7 +254,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<version>3.2.2</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||
@ -251,7 +264,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.22.2</version>
|
||||
<version>3.0.0-M6</version>
|
||||
<configuration>
|
||||
<includes>**/*</includes>
|
||||
<systemPropertyVariables>
|
||||
@ -262,12 +275,12 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<version>3.0.0-M2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.8</version>
|
||||
<version>1.6.13</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<serverId>ossrh</serverId>
|
||||
@ -282,6 +295,7 @@
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@ -311,7 +325,7 @@
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.7</version>
|
||||
<version>0.8.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@ -448,7 +462,7 @@
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>generate-sources</phase>
|
||||
@ -480,7 +494,7 @@
|
||||
<plugin>
|
||||
<groupId>org.jetbrains.dokka</groupId>
|
||||
<artifactId>dokka-maven-plugin</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
<version>${dokka.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
@ -493,7 +507,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.6</version>
|
||||
<version>3.0.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
|
||||
@ -21,7 +21,6 @@ import org.ice4j.*;
|
||||
import org.ice4j.ice.harvest.*;
|
||||
import org.ice4j.stack.*;
|
||||
import org.ice4j.util.PeriodicRunnable;
|
||||
import org.jitsi.utils.collections.*;
|
||||
import org.jitsi.utils.concurrent.*;
|
||||
import org.jitsi.utils.logging2.Logger;
|
||||
import org.jitsi.utils.logging2.*;
|
||||
@ -70,15 +69,6 @@ public class Agent
|
||||
private static final PropertyChangeListener[] NO_STATE_CHANGE_LISTENERS
|
||||
= new PropertyChangeListener[0];
|
||||
|
||||
/**
|
||||
* The {@link Logger} used by the {@link Agent} class for logging output.
|
||||
* Note that this shouldn't be used directly by instances of {@link Agent},
|
||||
* because it doesn't take into account the per-instance log level.
|
||||
* Instances should use {@link #logger} instead.
|
||||
*/
|
||||
private static final java.util.logging.Logger classLogger
|
||||
= java.util.logging.Logger.getLogger(Agent.class.getName());
|
||||
|
||||
/**
|
||||
* The name of the {@link PropertyChangeEvent} that we use to deliver
|
||||
* events on changes in the state of ICE processing in this agent.
|
||||
@ -2656,7 +2646,19 @@ public class Agent
|
||||
{
|
||||
if (shouldRunStunKeepAlive())
|
||||
{
|
||||
return Duration.ofMillis(keepAliveSent == 0 ? 0 : consentFreshnessInterval);
|
||||
if (keepAliveSent == 0)
|
||||
{
|
||||
return Duration.ZERO;
|
||||
}
|
||||
else
|
||||
{
|
||||
double r = 1;
|
||||
if (config.getRandomizeConsentFreshnessInterval())
|
||||
{
|
||||
r = 0.8d + ThreadLocalRandom.current().nextDouble() * 0.4;
|
||||
}
|
||||
return Duration.ofMillis((long) (consentFreshnessInterval * r));
|
||||
}
|
||||
}
|
||||
return Duration.ofMillis(-1);
|
||||
}
|
||||
|
||||
@ -260,6 +260,11 @@ public abstract class AbstractUdpListener
|
||||
thread.start();
|
||||
}
|
||||
|
||||
public TransportAddress getLocalAddress()
|
||||
{
|
||||
return localAddress;
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers the termination of the threads of this instance.
|
||||
*/
|
||||
|
||||
@ -220,17 +220,14 @@ public class MappingCandidateHarvesters
|
||||
|
||||
List<Callable<StunMappingCandidateHarvester>> tasks = new LinkedList<>();
|
||||
|
||||
// Create a StunMappingCandidateHarvester for each local:remote address
|
||||
// pair.
|
||||
List<InetAddress> localAddresses
|
||||
= HostCandidateHarvester.getAllAllowedAddresses();
|
||||
// Create a StunMappingCandidateHarvester for each local:remote address pair.
|
||||
List<InetAddress> localAddresses = HostCandidateHarvester.getAllAllowedAddresses();
|
||||
for (String stunServer : stunServers)
|
||||
{
|
||||
String[] addressAndPort = stunServer.split(":");
|
||||
if (addressAndPort.length < 2)
|
||||
{
|
||||
logger.severe("Failed to parse STUN server address: "
|
||||
+ stunServer);
|
||||
logger.severe("Failed to parse STUN server address: " + stunServer);
|
||||
continue;
|
||||
}
|
||||
int port;
|
||||
@ -259,15 +256,12 @@ public class MappingCandidateHarvesters
|
||||
continue;
|
||||
}
|
||||
|
||||
TransportAddress localAddress
|
||||
= new TransportAddress(localInetAddress, 0, Transport.UDP);
|
||||
TransportAddress localAddress = new TransportAddress(localInetAddress, 0, Transport.UDP);
|
||||
|
||||
logger.info("Using " + remoteAddress + " for StunMappingCandidateHarvester (localAddress="
|
||||
+ localAddress + ").");
|
||||
final StunMappingCandidateHarvester stunHarvester
|
||||
= new StunMappingCandidateHarvester(
|
||||
localAddress,
|
||||
remoteAddress);
|
||||
= new StunMappingCandidateHarvester(localAddress, remoteAddress);
|
||||
|
||||
Callable<StunMappingCandidateHarvester> task = () ->
|
||||
{
|
||||
@ -278,8 +272,14 @@ public class MappingCandidateHarvesters
|
||||
}
|
||||
}
|
||||
|
||||
// Now run discover() on all created harvesters in parallel and pick
|
||||
// the ones which succeeded.
|
||||
if (tasks.isEmpty())
|
||||
{
|
||||
logger.warning("STUN mapping harvesters are configured, but no allowed local addresses were found." +
|
||||
" Not using STUN.");
|
||||
return stunHarvesters;
|
||||
}
|
||||
|
||||
// Now run discover() on all created harvesters in parallel and pick the ones which succeeded.
|
||||
ExecutorService es = ExecutorFactory.createFixedThreadPool(tasks.size(), "ice4j.Harvester-executor-");
|
||||
|
||||
try
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
package org.ice4j.util;
|
||||
|
||||
import org.jitsi.utils.logging2.*;
|
||||
|
||||
import java.time.*;
|
||||
import java.util.concurrent.*;
|
||||
|
||||
@ -11,6 +13,11 @@ import java.util.concurrent.*;
|
||||
*/
|
||||
public abstract class PeriodicRunnable
|
||||
{
|
||||
/**
|
||||
* The {@link Logger} used by the {@link PeriodicRunnable} class for logging output.
|
||||
*/
|
||||
private final static Logger logger = new LoggerImpl(PeriodicRunnable.class.getName());
|
||||
|
||||
/**
|
||||
* A timer to perform periodic scheduling of {@link #run()} execution
|
||||
* on {@link #executor}'s thread.
|
||||
@ -205,6 +212,10 @@ public abstract class PeriodicRunnable
|
||||
{
|
||||
this.run();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
logger.warn("Exception in run(), will retry.", e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (running)
|
||||
|
||||
@ -27,6 +27,10 @@ class AgentConfig {
|
||||
"ice4j.consent-freshness.interval".from(configSource)
|
||||
}
|
||||
|
||||
val randomizeConsentFreshnessInterval: Boolean by config {
|
||||
"ice4j.consent-freshness.randomize-interval".from(configSource)
|
||||
}
|
||||
|
||||
val consentFreshnessOriginalWaitInterval: Duration by config {
|
||||
"org.ice4j.ice.CONSENT_FRESHNESS_WAIT_INTERVAL".from(configSource)
|
||||
.convertFrom<Long> { Duration.ofMillis(it) }
|
||||
|
||||
@ -31,6 +31,9 @@ ice4j {
|
||||
// The maximum number of retransmissions of a STUN Binding request without a valid STUN Binding response after which
|
||||
// consent freshness is to be considered unconfirmed according to `STUN Usage for Consent Freshness` (RFC7675).
|
||||
max-retransmissions = 30
|
||||
// Whether to randomize the period between any two checks between 0.8 and 1.2 of the configured interval as
|
||||
// recommended in RFC7675 Section 5.1. We keep this configurable in case the previous behavior is desired.
|
||||
randomize-interval = true
|
||||
}
|
||||
|
||||
// Configuration related to harvesting (aka gathering) of local candidates.
|
||||
|
||||
@ -5,7 +5,7 @@ import static org.mockito.Mockito.*;
|
||||
|
||||
import java.time.*;
|
||||
import java.util.concurrent.*;
|
||||
import org.jitsi.test.concurrent.*;
|
||||
import org.jitsi.utils.concurrent.*;
|
||||
import org.junit.jupiter.api.*;
|
||||
|
||||
/**
|
||||
@ -21,12 +21,7 @@ public class PeriodicRunnableTests
|
||||
@BeforeEach
|
||||
void beforeEach()
|
||||
{
|
||||
timer = mock(
|
||||
FakeScheduledExecutorService.class,
|
||||
withSettings()
|
||||
.useConstructor()
|
||||
.defaultAnswer(CALLS_REAL_METHODS)
|
||||
);
|
||||
timer = new FakeScheduledExecutorService();
|
||||
executor = mock(ExecutorService.class);
|
||||
when(executor.submit(any(Runnable.class))).thenAnswer(a ->
|
||||
{
|
||||
|
||||
@ -339,29 +339,9 @@ public class Ice
|
||||
{
|
||||
// STUN
|
||||
StunCandidateHarvester stunHarv = new StunCandidateHarvester(
|
||||
new TransportAddress("stun.jitsi.net", 3478, Transport.UDP));
|
||||
StunCandidateHarvester stun6Harv = new StunCandidateHarvester(
|
||||
new TransportAddress("stun6.jitsi.net", 3478, Transport.UDP));
|
||||
new TransportAddress("meet-jit-si-turnrelay.jitsi.net", 3478, Transport.UDP));
|
||||
|
||||
agent.addCandidateHarvester(stunHarv);
|
||||
agent.addCandidateHarvester(stun6Harv);
|
||||
|
||||
// TURN
|
||||
String[] hostnames = new String[]
|
||||
{
|
||||
"stun.jitsi.net",
|
||||
"stun6.jitsi.net"
|
||||
};
|
||||
int port = 3478;
|
||||
LongTermCredential longTermCredential
|
||||
= new LongTermCredential("guest", "anonymouspower!!");
|
||||
|
||||
for (String hostname : hostnames)
|
||||
agent.addCandidateHarvester(
|
||||
new TurnCandidateHarvester(
|
||||
new TransportAddress(
|
||||
hostname, port, Transport.UDP),
|
||||
longTermCredential));
|
||||
|
||||
//UPnP: adding an UPnP harvester because they are generally slow
|
||||
//which makes it more convenient to test things like trickle.
|
||||
|
||||
@ -20,7 +20,7 @@ import io.kotest.core.spec.IsolationMode
|
||||
import io.kotest.core.spec.Spec
|
||||
import io.kotest.core.spec.style.ShouldSpec
|
||||
import io.kotest.extensions.system.withSystemProperties
|
||||
import org.jitsi.config.useNewConfig
|
||||
import org.jitsi.config.withNewConfig
|
||||
import org.jitsi.metaconfig.MetaconfigSettings
|
||||
|
||||
/**
|
||||
@ -29,13 +29,13 @@ import org.jitsi.metaconfig.MetaconfigSettings
|
||||
abstract class ConfigTest : ShouldSpec() {
|
||||
override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf
|
||||
|
||||
override fun beforeSpec(spec: Spec) {
|
||||
override suspend fun beforeSpec(spec: Spec) {
|
||||
super.beforeSpec(spec)
|
||||
MetaconfigSettings.cacheEnabled = false
|
||||
}
|
||||
|
||||
inline fun withNewConfig(config: String, block: () -> Unit) {
|
||||
useNewConfig("new-${this::class.simpleName}", config, true, block)
|
||||
withNewConfig(config, "new-${this::class.simpleName}", true, block)
|
||||
}
|
||||
|
||||
fun withLegacyConfig(config: Map<String, String?>, block: () -> Unit) = withSystemProperties(config) { block }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user