Changeset 108:e414f1f14f5a in mediastreamer2

Timestamp:

Oct 21, 2008 10:06:20 PM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

debug sip proxy

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

Location:

p2pproxy

Files:

• launcher/.cdtproject (added)
• src/org/linphone/p2pproxy/core/P2pProxyMain.java (modified) (3 diffs)
• src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrar.java (modified) (2 diffs)
• src/org/linphone/p2pproxy/core/sipproxy/superpeers/SuperPeerProxy.java (modified) (3 diffs)
• test-src/org/linphone/p2pproxy/test/utils/SipClient.java (modified) (5 diffs)
• test-src/org/linphone/p2pproxy/test/utils/UserInstance.java (modified) (6 diffs)

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

@@ -62 +62 @@
    private static String mConfigHomeDir;
    static private boolean mExit = false;
+   static private boolean isReady = false;
    
    
@@ -280 +281 @@
 
                    mLog.warn("p2pproxy initilized");
-
+                   isReady = true;
                    while (mExit == false) {
                            Thread.sleep(1000);
@@ -413 +414 @@
 private static void isReady() throws P2pProxyNotReadyException {
     try {
-      if ((mJxtaNetworkManager!=null && mJxtaNetworkManager.isConnectedToRendezVous(0) == true) 
+      if ((isReady == true && mJxtaNetworkManager.isConnectedToRendezVous(0) == true) 
           || 
-          (mJxtaNetworkManager!=null && mJxtaNetworkManager.getPeerGroup().getRendezVousService().isRendezVous())) {
+          (isReady == true && mJxtaNetworkManager.getPeerGroup().getRendezVousService().isRendezVous())) {
          //nop connected
       } else {

p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrar.java

@@ -300 +300 @@
          if (mP2pProxyAccountManagement.isValidAccount(lFromName)) {
          lRegistration = new Registration(lFromName);
-         lRegistration.Contact = aMessage.getContactHeader().getNameAddress().getAddress().toString();;
+         // forgot contact, use rport lRegistration.Contact = aMessage.getContactHeader().getNameAddress().getAddress().toString();;
+         
          updateRegistration(lRegistration,aMessage);
          mRegistrationTab.put(lFromName, lRegistration);
@@ -326 +327 @@
          aRegistration.Expiration =  aRegistrationMessage.getExpiresHeader().getDeltaSeconds()*1000; 
       }
-      
+      aRegistration.Contact = "sip:"+aRegistrationMessage.getRemoteAddress()+":"+aRegistrationMessage.getRemotePort();
       mSuperPeerProxy.updateRegistration(aRegistration, aRegistrationMessage); 
    }

p2pproxy/src/org/linphone/p2pproxy/core/sipproxy/superpeers/SuperPeerProxy.java

@@ -59 +59 @@
            String lTo = aMessage.getToHeader().getNameAddress().getAddress().toString();
            SipURL lNextHope = null;
-           //check if invite
-           if (aMessage.isInvite() || aMessage.isCancel()) {
+        
                    //ok need to find the root
                    //is local ?
@@ -71 +70 @@
                            }
                    }
-                      // add recordRoute
-               SipUtils.addRecordRoute(aProvider,aMessage);    
-
+                   if (aMessage.isInvite() || aMessage.isCancel()) {
+                           //check if invite
+                           // add recordRoute
+                           SipUtils.addRecordRoute(aProvider,aMessage);    
+                   }
                    
-           } else {
+           if (lNextHope == null) {
+                   // not for us
                    //just look at route set
                    MultipleHeader lMultipleRoute = aMessage.getRoutes();
@@ -83 +85 @@
                    } else {
                            // last proxy, get route from request uri
-                      lNextHope = aMessage.getRequestLine().getAddress();
+                           //check if we know the user
+                           lNextHope = aMessage.getRequestLine().getAddress();
                    }
                    

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

@@ -142 +142 @@
             String lCalleeUri = aTo;
             mLog.info("Calling  ["+aTo+"] from ["+mSipIdentity+"]");
-            long lTimout = 75000;
+            long lTimout = 30000;
 
             final Semaphore lCallerSemaphoreAccepted = new Semaphore(0);
@@ -219 +219 @@
             String lCalleeUri = aTo;
             mLog.info("Calling  ["+aTo+"] from ["+mSipIdentity+"]");
-            long lTimout = 75000;
+            long lTimout = 30000;
 
             final Semaphore lCallerSemaphoreAccepted = new Semaphore(0);
@@ -229 +229 @@
                   call.ackWithAnswer(sdp);
               }
-              public void onCallClosing(Call call, Message bye) {
-                  //nop
-              }
+
                 public void onCallRinging(Call call, Message resp) {
                     lCallerSemaphoreRinging.release();
+                }
+                public void onCallClosed(Call call, Message resp) {
+                        lCalleeSemaphoreClosed.release();
                 }
             };
@@ -251 +252 @@
                         lCaller.bye();
 
-            Assert.assertTrue("caller  call not closed until ["+lTimout+"]", lCalleeSemaphoreClosed.tryAcquire(lTimout,TimeUnit.MILLISECONDS));
- 
+            Assert.assertTrue("caller  call not closed until ["+aCallDuration + aCallDuration/10+"]", lCalleeSemaphoreClosed.tryAcquire(aCallDuration + aCallDuration/10,TimeUnit.MILLISECONDS));
+   
             mLog.info("Call ok");
             return lCaller;
@@ -272 +273 @@
                call.accept(sdp);
            }
-         public void onCallClosed(Call call, Message resp) {
-             //nop
-         }
+           public void onCallClosing(Call call, Message bye) {
+               //nop
+           }
        };
        Call  lCallee = new Call(mProvider, mSipIdentity, getContact(mProvider), lCalleeListener);

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

@@ -23 +23 @@
 import java.io.File;
 import java.net.DatagramSocket;
+import java.net.InetAddress;
 import java.net.URI;
 import java.util.Timer;
@@ -76 +77 @@
         File lFile = new File(SipStack.log_path);
     if (lFile.exists() == false) lFile.mkdir();
-        mProvider=new SipProvider(null,lSipPort);
+    //InetAddress[] lAddresses = InetAddress.getAllByName("localhost");
+    mProvider=new SipProvider(null,lSipPort);
         mSipClient = new SipClient(mProvider,userName,30000);
          class RegistrarTimerTask extends  TimerTask {
@@ -83 +85 @@
                         try {
                         // 1 get proxy address
-                        String lProxyUri = P2pProxyMain.lookupSipProxyUri(P2pProxyResourceManagement.DOMAINE);
+                        URI lProxyUri = URI.create(P2pProxyMain.lookupSipProxyUri(P2pProxyResourceManagement.DOMAINE));
                         if (lProxyUri == null) {
                                  System.out.println("cannot find registrar");
@@ -89 +91 @@
                         }
                         //2 setOutbound proxy
-                        mProvider.setOutboundProxy(new SocketAddress(lProxyUri));
+                        mProvider.setOutboundProxy(new SocketAddress(lProxyUri.getRawSchemeSpecificPart()));
                         mSipClient.register(REGISTRATION_PERIOD,userName);
                         mIsRegistered = true;
@@ -95 +97 @@
                                 mLog.error("cannot register user["+userName+"]",e);
                         } finally {
-                                mTimer.schedule(new  RegistrarTimerTask(), REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
+                                mTimer.schedule(new  RegistrarTimerTask(), 1000 *(REGISTRATION_PERIOD-REGISTRATION_PERIOD/10));
                         }
                 }
@@ -111 +113 @@
 public static void main(String[] args) throws P2pProxyException {
         String lFrom=null, lTo=null;
-        int lDuration = 10, lLoop=1;
+        int lDuration = 10, lLoop=0;
         for (int i=0; i < args.length; i=i+2) {  
                    String argument = args[i];