Compare commits

..

1 Commits

Author SHA1 Message Date
Boris Grozev
7ac659d567 test: Use meet-jit-si-turnrelay.jitsi.net for STUN, do not use TURN in tests. 2023-03-06 07:43:06 -06:00
9 changed files with 27 additions and 62 deletions

View File

@ -7,11 +7,3 @@ 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

View File

@ -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 [community forum](https://community.jitsi.org) for questions and discussions.
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.
Thanks
------

23
pom.xml
View File

@ -38,11 +38,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
<jicoco.version>1.1-104-g20c4353</jicoco.version>
<kotlin.version>1.6.21</kotlin.version>
<kotest.version>5.3.0</kotest.version>
<junit.version>5.8.2</junit.version>
</properties>
<dependencies>
@ -59,7 +58,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-utils</artifactId>
<version>1.0-127-g6c65524</version>
<version>1.0-114-g43815ed</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@ -71,7 +70,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.10.0</version>
<version>1.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -110,12 +109,6 @@
<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>
<build>
@ -221,7 +214,7 @@
<plugin>
<groupId>com.github.gantsign.maven</groupId>
<artifactId>ktlint-maven-plugin</artifactId>
<version>3.0.0</version>
<version>1.13.1</version>
<configuration>
<sourceRoots>
<sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>
@ -494,7 +487,7 @@
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<phase>package</phase>

View File

@ -21,6 +21,7 @@ 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.*;
@ -69,6 +70,15 @@ 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.
@ -2646,19 +2656,7 @@ public class Agent
{
if (shouldRunStunKeepAlive())
{
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(keepAliveSent == 0 ? 0 : consentFreshnessInterval);
}
return Duration.ofMillis(-1);
}

View File

@ -260,11 +260,6 @@ public abstract class AbstractUdpListener
thread.start();
}
public TransportAddress getLocalAddress()
{
return localAddress;
}
/**
* Triggers the termination of the threads of this instance.
*/

View File

@ -1,7 +1,5 @@
package org.ice4j.util;
import org.jitsi.utils.logging2.*;
import java.time.*;
import java.util.concurrent.*;
@ -13,11 +11,6 @@ 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.
@ -212,10 +205,6 @@ public abstract class PeriodicRunnable
{
this.run();
}
catch (Exception e)
{
logger.warn("Exception in run(), will retry.", e);
}
finally
{
if (running)

View File

@ -27,10 +27,6 @@ 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) }

View File

@ -31,9 +31,6 @@ 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.

View File

@ -5,7 +5,7 @@ import static org.mockito.Mockito.*;
import java.time.*;
import java.util.concurrent.*;
import org.jitsi.utils.concurrent.*;
import org.jitsi.test.concurrent.*;
import org.junit.jupiter.api.*;
/**
@ -21,7 +21,12 @@ public class PeriodicRunnableTests
@BeforeEach
void beforeEach()
{
timer = new FakeScheduledExecutorService();
timer = mock(
FakeScheduledExecutorService.class,
withSettings()
.useConstructor()
.defaultAnswer(CALLS_REAL_METHODS)
);
executor = mock(ExecutorService.class);
when(executor.submit(any(Runnable.class))).thenAnswer(a ->
{