From 1f97cf2b26d2eae8193a8c7c147d963dbcabef96 Mon Sep 17 00:00:00 2001 From: bgrozev Date: Thu, 21 Apr 2022 14:27:33 -0500 Subject: [PATCH] log: Do not print stack trace (#257) when ConnectivityCheckClient fails to send due to missing socket. This condition happens when SinglePortUdpListener is used and hasn't received packets from the destination address yet. --- .../java/org/ice4j/ice/ConnectivityCheckClient.java | 9 +++++---- src/main/java/org/ice4j/stack/NetAccessManager.java | 13 ++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java b/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java index 3d8ee51..983a72b 100644 --- a/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java @@ -21,7 +21,6 @@ import java.net.*; import java.time.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; import org.ice4j.*; import org.ice4j.attribute.*; @@ -29,7 +28,6 @@ import org.ice4j.message.*; import org.ice4j.socket.*; import org.ice4j.stack.*; import org.ice4j.util.*; -import org.jitsi.utils.logging2.*; import org.jitsi.utils.logging2.Logger; /** @@ -344,10 +342,13 @@ class ConnectivityCheckClient maxRetransmissions); if (logger.isTraceEnabled()) { - logger.trace( - "checking pair " + candidatePair + " tid " + tran); + logger.trace("checking pair " + candidatePair + " tid " + tran); } } + catch (NetAccessManager.SocketNotFoundException e) + { + logger.info("Could not start connectivity check: " + e.getMessage()); + } catch (Exception ex) { tran = null; diff --git a/src/main/java/org/ice4j/stack/NetAccessManager.java b/src/main/java/org/ice4j/stack/NetAccessManager.java index 616da2f..a76604b 100644 --- a/src/main/java/org/ice4j/stack/NetAccessManager.java +++ b/src/main/java/org/ice4j/stack/NetAccessManager.java @@ -42,7 +42,7 @@ import java.util.logging.*; * @author Boris Grozev * @author Yura Yaroshevich */ -class NetAccessManager +public class NetAccessManager implements ErrorHandler { /** @@ -628,10 +628,17 @@ class NetAccessManager Connector ap = getConnector(srcAddr, remoteAddr); if (ap == null) { - throw new IllegalArgumentException( - "No socket found for " + srcAddr + "->" + remoteAddr); + throw new IllegalArgumentException("No socket found for " + srcAddr + "->" + remoteAddr); } ap.sendMessage(bytes, remoteAddr); } + + public class SocketNotFoundException extends IllegalArgumentException + { + private SocketNotFoundException(String message) + { + super(message); + } + } }