Add also the HostCandidate used for UPnP gathering as it is needed for peer reflexive detection.

This commit is contained in:
seb 2011-04-19 15:04:06 +00:00
parent 7dccafc489
commit 9353abd320
3 changed files with 18 additions and 7 deletions

View File

@ -964,7 +964,6 @@ public class Agent
public CandidatePair findCandidatePair(TransportAddress localAddress,
TransportAddress remoteAddress)
{
synchronized(mediaStreams)
{
Collection<IceMediaStream> streamsCollection

View File

@ -760,7 +760,6 @@ public class Component
*/
public LocalCandidate findLocalCandidate(TransportAddress localAddress)
{
for( LocalCandidate localCnd : localCandidates)
{
if(localCnd.getTransportAddress().equals(localAddress))

View File

@ -103,11 +103,20 @@ public class UPNPHarvester
"UDP",
"Ice4J: " + port))
{
LocalCandidate cand = createUPNPCandidate(socket,
List<LocalCandidate> cands = createUPNPCandidate(socket,
localAddress, externalIPAddress, externalPort,
component, device);
component.addLocalCandidate(cand);
candidates.add(cand);
// we have to add the UPNPCandidate and also the base.
// if we don't add the base, we won't be able to add
// peer reflexive candidate if someone contact us on the
// UPNPCandidate
for(LocalCandidate cand : cands)
{
component.addLocalCandidate(cand);
candidates.add(cand);
}
break;
}
else
@ -143,11 +152,12 @@ public class UPNPHarvester
* represents the specified <tt>TransportAddress</tt>
* @throws Exception if something goes wrong during candidate creation
*/
public UPNPCandidate createUPNPCandidate(DatagramSocket socket,
public List<LocalCandidate> createUPNPCandidate(DatagramSocket socket,
InetAddress localAddr, String externalIP, int port, Component cmp,
GatewayDevice device)
throws Exception
{
List<LocalCandidate> ret = new ArrayList<LocalCandidate>();
TransportAddress addr = new TransportAddress(externalIP, port,
Transport.UDP);
@ -157,6 +167,9 @@ public class UPNPHarvester
DatagramSocket stunSocket = candidate.getStunSocket(null);
candidate.getStunStack().addSocket(stunSocket);
return candidate;
ret.add(candidate);
ret.add(base);
return ret;
}
}