From f609189c11b55c2702105cdbade0c596ca8d7352 Mon Sep 17 00:00:00 2001
From: Thiago Camargo <thiago@b35dd754-fafc-0310-a699-88a17e54d16e>
Date: Thu, 29 Mar 2007 01:50:57 +0000
Subject: [PATCH] Small Fixes in BridgedResolver

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7768 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../smackx/jingle/nat/BridgedResolver.java        | 15 +++++++++++----
 .../smackx/jingle/nat/TransportCandidate.java     |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
index 89f1758ed..71919e2ed 100644
--- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
+++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
@@ -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);
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
index 0db2bd80c..032fb7caf 100644
--- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
+++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
@@ -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;