Changeset 126:5c5787812787 in mediastreamer2

Timestamp:

Oct 29, 2008 10:04:44 PM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

fix inter proxy communication

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

Location:

p2pproxy

Files:

• src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrar.java (modified) (1 diff)
• src/org/linphone/p2pproxy/core/sipproxy/superpeers/SuperPeerProxy.java (modified) (2 diffs)
• test-src/org/linphone/p2pproxy/test/utils/SipClient.java (modified) (1 diff)
• test-src/org/linphone/p2pproxy/test/utils/UserInstance.java (modified) (2 diffs)

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

@@ -94 +94 @@
       public final String From;
       public Registration(String aFrom) {From = aFrom;}
+      public String toString() {
+          return "reg date ["+RegistrationDate+"] exp ["+Expiration+"] contact ["+Contact+"] from ["+From+"]";
+      }
    }
    

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

@@ -74 +74 @@
                                            try {
                                                    List<P2pUserRegistrationAdvertisement> lAdvList = (List<P2pUserRegistrationAdvertisement>) mJxtaNetworkManager.getAdvertisementList(null, P2pUserRegistrationAdvertisement.USER_NAME_TAG,lTo, true);
-                                                   lNextHope = new SipURL(lAdvList.get(0).getUserName());
+                                                   lNextHope = new SipURL(lAdvList.get(0).getRegistrarAddress());
                                            } catch (Exception e) {
                                                    throw new P2pProxyUserNotFoundException("user ["+lTo+"] not found",e);
                                            } 
                                            
+                                   } else {
+                                           //nop
                                    }
                            }
@@ -94 +96 @@
                    
                    if (lMultipleRoute != null && lMultipleRoute.isEmpty()== false) {
-                           lNextHope = ((RecordRouteHeader)lMultipleRoute.getTop()).getNameAddress().getAddress();
+                           RouteHeader lRouteHeader = new RouteHeader(lMultipleRoute.getTop());
+                           lNextHope = lRouteHeader.getNameAddress().getAddress();
                    } else {
                            // last proxy, get route from request uri

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

@@ -70 +70 @@
    }
    public boolean register(int expiration,String aTo,final int aReturnCode) throws InterruptedException {
-            final long TryingTimout = 1000;
+            final long TryingTimout = 2000;
             
             NameAddress lContact = new NameAddress(getContact(mProvider));

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

@@ -52 +52 @@
         lSocket.close();
         URI lUserNameUri = URI.create(userName);
-        final String[] lParam = {"-jxta" ,"userinstance-"+lUserNameUri.getUserInfo()
+        final String[] lParam = {"-jxta" ,"userinstance-"+lUserNameUri.getSchemeSpecificPart()
                                                         ,"-edge-only"
                                                         ,"-seeding-rdv", "tcp://82.67.74.86:9701"
@@ -74 +74 @@
         }
         P2pProxyMain.createAccount(userName);
-        SipStack.log_path = "userinstance-"+lUserNameUri.getUserInfo()+"/logs";
+        SipStack.log_path = "userinstance-"+lUserNameUri.getSchemeSpecificPart()+"/logs";
         File lFile = new File(SipStack.log_path);
     if (lFile.exists() == false) lFile.mkdir();