From e472f6ac1c4e271f5a8bd60816110c3940220cf8 Mon Sep 17 00:00:00 2001 From: damencho Date: Wed, 10 May 2017 15:06:15 -0500 Subject: [PATCH] Fixes leak of file descriptors by not closing DatagramSockets. The problem was reproduced with java7 and defining multiple ipv6 fake(not-operational) addresses to one of the interfaces and running for a while. Fixes jitsi/jitsi-meet#1390 and fixes jitsi/jicofo#167. --- .../java/org/ice4j/socket/DelegatingDatagramSocket.java | 6 +++--- .../java/org/ice4j/socket/MultiplexedDatagramSocket.java | 2 ++ .../org/ice4j/socket/RelayedCandidateDatagramSocket.java | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java index cffbd91..7449864 100644 --- a/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java @@ -282,10 +282,10 @@ public class DelegatingDatagramSocket @Override public void close() { - if (delegate == null) - super.close(); - else + if (delegate != null) delegate.close(); + + super.close(); } /** diff --git a/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java b/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java index 595830d..086281e 100644 --- a/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java @@ -118,6 +118,8 @@ public class MultiplexedDatagramSocket public void close() { multiplexing.close(this); + + super.close(); } /** diff --git a/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java b/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java index 63b327b..a3cc2d8 100644 --- a/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java @@ -350,6 +350,8 @@ public class RelayedCandidateDatagramSocket turnCandidateHarvest.hostCandidate.getTransportAddress(), this); turnCandidateHarvest.close(this); + + super.close(); } /**