mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-12-23 04:57:58 +01:00
Small Fixes in BridgedResolver
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7768 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
19131e4934
commit
f609189c11
2 changed files with 12 additions and 5 deletions
|
@ -24,6 +24,8 @@ import org.jivesoftware.smack.XMPPException;
|
|||
import org.jivesoftware.smackx.jingle.JingleSession;
|
||||
|
||||
import java.util.Random;
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
/**
|
||||
* Bridged Resolver use a RTPBridge Service to add a relayed candidate.
|
||||
|
@ -65,17 +67,22 @@ public class BridgedResolver extends TransportResolver{
|
|||
|
||||
RTPBridge rtpBridge = RTPBridge.getRTPBridge(connection, String.valueOf(sid));
|
||||
|
||||
BasicResolver basicResolver = new BasicResolver();
|
||||
|
||||
basicResolver.initializeAndWait();
|
||||
String localIp="127.0.0.1";
|
||||
try {
|
||||
localIp = InetAddress.getLocalHost().getHostAddress();
|
||||
}
|
||||
catch (UnknownHostException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
TransportCandidate localCandidate = new TransportCandidate.Fixed(
|
||||
rtpBridge.getIp(), rtpBridge.getPortA());
|
||||
localCandidate.setLocalIp(basicResolver.getCandidate(0).getLocalIp());
|
||||
localCandidate.setLocalIp(localIp);
|
||||
|
||||
TransportCandidate remoteCandidate = new TransportCandidate.Fixed(
|
||||
rtpBridge.getIp(), rtpBridge.getPortB());
|
||||
remoteCandidate.setLocalIp(basicResolver.getCandidate(0).getLocalIp());
|
||||
remoteCandidate.setLocalIp(localIp);
|
||||
|
||||
localCandidate.setSymmetric(remoteCandidate);
|
||||
remoteCandidate.setSymmetric(localCandidate);
|
||||
|
|
|
@ -386,7 +386,7 @@ public abstract class TransportCandidate {
|
|||
InetAddress candAddress;
|
||||
try {
|
||||
candAddress = InetAddress.getByName(getIp());
|
||||
isUsable = candAddress.isReachable(TransportResolver.CHECK_TIMEOUT);
|
||||
isUsable = true;//candAddress.isReachable(TransportResolver.CHECK_TIMEOUT);
|
||||
}
|
||||
catch (Exception e) {
|
||||
isUsable = false;
|
||||
|
|
Loading…
Reference in a new issue