Changeset 151:39c0ce77b49c in mediastreamer2

Timestamp:

Nov 3, 2008 4:11:21 PM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

add stun client to UserInstance? tester

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@154 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

p2pproxy

Files:

• src/org/linphone/p2pproxy/core/P2pProxyMain.java (modified) (2 diffs)
• src/org/linphone/p2pproxy/core/stun/StunClient.java (modified) (1 diff)
• test-src/org/linphone/p2pproxy/test/utils/UserInstance.java (modified) (7 diffs)

p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java

@@ -477 +477 @@
    } 
 }
+
 public static String[] lookupSipProxiesUri(String aDomaine) {
            try {
@@ -486 +487 @@
         }
 
+public static String[] lookupMediaServerAddress(String aDomaine) {
+   try {
+      isReady();
+      return mP2pProxyManagement.getMediaServerList();
+   } catch (Exception e) {
+      return null;
+   } 
+}
+
 public static int getState() {
    try {

p2pproxy/src/org/linphone/p2pproxy/core/stun/StunClient.java

@@ -52 +52 @@
    private int SO_TIME_OUT = 300;
    
+   public StunClient(String[] aStunServerList) {
+      List<InetSocketAddress> lAddressList = new ArrayList<InetSocketAddress>();
+      for (String lStunInstance:aStunServerList) {
+         URI lUri = URI.create(lStunInstance);
+         InetSocketAddress lInetSocketAddress = new InetSocketAddress(lUri.getHost(),lUri.getPort());
+         lAddressList.add(lInetSocketAddress);
+      }
+      mStunServerList = lAddressList;
+   }
    StunClient(List<InetSocketAddress> aStunServerList) {
       mStunServerList = aStunServerList;

p2pproxy/test-src/org/linphone/p2pproxy/test/utils/UserInstance.java

@@ -32 +32 @@
 import org.linphone.p2pproxy.api.P2pProxyResourceManagement;
 import org.linphone.p2pproxy.core.P2pProxyMain;
+import org.linphone.p2pproxy.core.stun.StunClient;
 import org.linphone.p2pproxy.launcher.P2pProxylauncherConstants;
 import org.zoolu.net.SocketAddress;
@@ -42 +43 @@
 private final SipProvider mProvider;
 private final SipClient mSipClient;
+private  StunClient mStunClient;
 private final int REGISTRATION_PERIOD=60;
 private final static Logger mLog = Logger.getLogger(UserInstance.class);
@@ -80 +82 @@
     mProvider=new SipProvider(null,lSipPort);
         mSipClient = new SipClient(mProvider,userName,30000);
+        
          class RegistrarTimerTask extends  TimerTask {
                 @Override
@@ -103 +106 @@
                         mProvider.setOutboundProxy(new SocketAddress(lProxyUri.getRawSchemeSpecificPart()));
                         mLog.info("use outband proxy ["+mProvider.getOutboundProxy()+"]");
+                        //3 setup stun client
+                        
+                        String [] lMediaServer = P2pProxyMain.lookupMediaServerAddress(P2pProxyResourceManagement.DOMAINE);
+                        mStunClient =  new StunClient(lMediaServer);
                         mSipClient.register(REGISTRATION_PERIOD,userName);
                         mIsRegistered = true;
@@ -113 +120 @@
                 
         };
-        mTimer.schedule(new  RegistrarTimerTask(), REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
+        mTimer.schedule(new  RegistrarTimerTask(), 0);
         mSipClient.listen();
         } catch (Exception e) {
@@ -124 +131 @@
 public static void main(String[] args) throws P2pProxyException {
         String lFrom=null, lTo=null, lPreferedProxyUri=null;
-        int lDuration = 10, lLoop=0;
+        int lDuration = 10000, lLoop=0;
         for (int i=0; i < args.length; i=i+2) {  
                    String argument = args[i];
@@ -158 +165 @@
            System.exit(1);
    }
-   if (lTo == null) {
+   if (lLoop != 0 && lTo == null) {
            System.out.println("missing -to ");
            usage();