From bee319845baad03d271411a662c61cc305b34a2d Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 17 Oct 2011 14:35:20 +0000 Subject: [PATCH] Fixes a problem with symmetrical NAT (detected with a test on 3G network). --- src/org/ice4j/ice/Agent.java | 36 +++++++++++---------------- src/org/ice4j/ice/Component.java | 8 +++--- src/org/ice4j/ice/IceMediaStream.java | 13 +++++----- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index d3f4d26..0840ad3 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -1261,7 +1261,17 @@ public class Agent return; } - useCandidate = pair.useCandidateReceived(); + CandidatePair pair2 = findCandidatePair( + localCandidate.getTransportAddress(), + remoteAddress); + if(pair2 == null) + { + useCandidate = false; + } + else + { + useCandidate = pair2.useCandidateReceived(); + } remoteCandidate = new RemoteCandidate( remoteAddress, parentComponent, @@ -1326,26 +1336,9 @@ public class Agent //we've just discovered a peer-reflexive candidate. CandidatePair knownPair = null; - if(compatibilityMode == CompatibilityMode.RFC5245) - knownPair = this.findCandidatePair( - triggerPair.getLocalCandidate().getTransportAddress(), - triggerPair.getRemoteCandidate().getTransportAddress()); - else - { - if(triggerPair.getLocalCandidate().getTransport() == Transport.TCP) - { - knownPair = findCandidatePair( - triggerPair.getLocalCandidate().getTransportAddress(), - triggerPair.getRemoteCandidate().getTransportAddress()); - } - else - { - knownPair = findCandidatePair( - ((RemoteCandidate)triggerPair.getRemoteCandidate()). - getUfrag(), - triggerPair.getLocalCandidate().getUfrag()); - } - } + knownPair = this.findCandidatePair( + triggerPair.getLocalCandidate().getTransportAddress(), + triggerPair.getRemoteCandidate().getTransportAddress()); IceMediaStream parentStream = triggerPair.getLocalCandidate() .getParentComponent().getParentStream(); @@ -1423,6 +1416,7 @@ public class Agent // logger.info("Add peer CandidatePair with new reflexive address to" + " checkList"); + triggerPair.setUseCandidateReceived(); parentStream.addToCheckList(triggerPair); } diff --git a/src/org/ice4j/ice/Component.java b/src/org/ice4j/ice/Component.java index 8508a80..9feb902 100644 --- a/src/org/ice4j/ice/Component.java +++ b/src/org/ice4j/ice/Component.java @@ -340,14 +340,14 @@ public class Component upnpBase = lc.getBase(); } } - if(upnpBase != null) - { - localCnds.remove(upnpBase); - } + checkList = new Vector(); for(LocalCandidate localCnd : localCnds) { + if(localCnd == upnpBase) + continue; + if(parentStream.getParentAgent(). getCompatibilityMode() == CompatibilityMode.GTALK && localCnd.getIceSocketWrapper() instanceof diff --git a/src/org/ice4j/ice/IceMediaStream.java b/src/org/ice4j/ice/IceMediaStream.java index c4368f6..d3e7785 100644 --- a/src/org/ice4j/ice/IceMediaStream.java +++ b/src/org/ice4j/ice/IceMediaStream.java @@ -352,9 +352,8 @@ public class IceMediaStream { List localCnds = component.getLocalCandidates(); List remoteCnds = component.getRemoteCandidates(); - - // remove UPnP base from local candidate LocalCandidate upnpBase = null; + for(LocalCandidate lc : localCnds) { if(lc instanceof UPNPCandidate) @@ -362,13 +361,13 @@ public class IceMediaStream upnpBase = lc.getBase(); } } - if(upnpBase != null) - { - localCnds.remove(upnpBase); - } for(LocalCandidate localCnd : localCnds) { + // Don't take into consideration UPnP base candidate + if(localCnd == upnpBase) + continue; + for(Candidate remoteCnd : remoteCnds) { if(localCnd.canReach(remoteCnd)) @@ -419,7 +418,7 @@ public class IceMediaStream } } }.start(); - return; + continue; } CandidatePair pair = new CandidatePair(localCnd,