Adds password support for google relayed candidate (updates ice4j to svn revision #322).

cusax-fix
Vincent Lucas 14 years ago
parent 038a5b038f
commit a687c482c6

Binary file not shown.

@ -264,7 +264,7 @@ else if(ext.getElementName().equals(
}
String user = relayData.get("username");
String password = relayData.get("passsword");
String password = relayData.get("password");
StunServerDescriptor dsc =
new StunServerDescriptor(
relayData.get("relay"),
@ -420,12 +420,14 @@ static Agent createAgent(ProtocolProviderServiceJabberImpl provider,
{
harvester = new GoogleTurnSSLCandidateHarvester(
addr,
new String(desc.getUsername()));
new String(desc.getUsername()),
new String(desc.getPassword()));
}
else
harvester = new GoogleTurnCandidateHarvester(
addr,
new String(desc.getUsername()));
new String(desc.getUsername()),
new String(desc.getPassword()));
}
}
else

@ -339,7 +339,16 @@ public static GTalkCandidatePacketExtension createCandidate(
// different username/password for each candidate ?
packet.setUsername(((LocalCandidate)candidate).getUfrag());
packet.setPassword("");
if(candidate instanceof GoogleRelayedCandidate)
{
packet.setPassword(
((GoogleRelayedCandidate)
candidate).getPassword());
}
else
{
packet.setPassword("");
}
packet.setAddress(transportAddress.getHostAddress());
packet.setPort(transportAddress.getPort());
if(transportAddress.getPort() != 443)

Loading…
Cancel
Save