Changeset 124:36b6d7d9ba1d in mediastreamer2

Timestamp:

Oct 28, 2008 10:03:49 PM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

one more step for fonis ;-)

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

Location:

p2pproxy/src/org/linphone/p2pproxy/core/sipproxy

Files:

• SipProxyRegistrar.java (modified) (3 diffs)
• superpeers/JxtaNetworkResources.java (modified) (1 diff)
• superpeers/P2pUserRegistrationAdvertisement.java (modified) (1 diff)
• superpeers/SuperPeerProxy.java (modified) (3 diffs)

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

@@ -25 +25 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -82 +83 @@
    private long mNumberOfUnknownUsersForRegistration;
    private long mNumberOfUnRegistration;
+   
    
    public static class Registration {
@@ -191 +193 @@
       };
       mTimer.scheduleAtFixedRate(lPublisherTask, 0, ADV_LIFE_TIME-ADV_LIFE_TIME/10);
+      TimerTask lRegistrationTableGC = new TimerTask() {
+
+                @Override
+                public void run() {
+                        // copy list
+                        Collection<Registration> lCurrentRegistrations = mRegistrationTab.values();
+                        long lCurrentDate = System.currentTimeMillis();
+                        for (Registration lRegistration : lCurrentRegistrations) {
+                                if ((lCurrentDate - lRegistration.RegistrationDate - lRegistration.Expiration) > 0) {
+                                        if (mLog.isInfoEnabled()) mLog.info("registration entry ["+lRegistration+"] has expired");
+                                        mRegistrationTab.remove(lRegistration.From);
+                                }
+                        }
+                }
+          
+      };
+      mTimer.scheduleAtFixedRate(lRegistrationTableGC, 0, 60000);
       
    }

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

@@ -59 +59 @@
          throw new P2pProxyException(e1);
       }
-      mLog.debug("publishing P2pUserRegistration Advertisement ["+mP2pUserRegistrationAdvertisement+"]published expire ["+aLiveTime+"]");
+      mLog.info("publishing P2pUserRegistration Advertisement ["+mP2pUserRegistrationAdvertisement+"]published expire ["+aLiveTime+"]");
    }   
    

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

@@ -100 +100 @@
    private String mUserUri;
    public final static String REGISTRAR_ADDRESS_TAG = "registrar-address";
-   public final static String USER_NAME_TAG = "user-name";
+   public final static String USER_NAME_TAG = "registration-user-name";
    private final static String ID_TAG = "ID";
    private final static String[] mIndexs = {USER_NAME_TAG};

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

@@ -20 +20 @@
 package org.linphone.p2pproxy.core.sipproxy.superpeers;
 
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
@@ -27 +29 @@
 import org.linphone.p2pproxy.api.P2pProxyUserNotFoundException;
 import org.linphone.p2pproxy.core.JxtaNetworkManager;
+import org.linphone.p2pproxy.core.P2pProxyAdvertisementNotFoundException;
 import org.linphone.p2pproxy.core.sipproxy.RegistrationHandler;
 import org.linphone.p2pproxy.core.sipproxy.SipProxy;
@@ -67 +70 @@
                                    lNextHope = new SipURL(mRegistrationTab.get(lTo).Contact);
                            } else {
-                                   throw new P2pProxyUserNotFoundException("user ["+lTo+"] not found");
+                                   if (aMessage.isInvite() || aMessage.isCancel()) {
+                                           //need to found the right proxy
+                                           try {
+                                                   List<P2pUserRegistrationAdvertisement> lAdvList = (List<P2pUserRegistrationAdvertisement>) mJxtaNetworkManager.getAdvertisementList(null, P2pUserRegistrationAdvertisement.USER_NAME_TAG,lTo, true);
+                                                   lNextHope = new SipURL(lAdvList.get(0).getUserName());
+                                           } catch (Exception e) {
+                                                   throw new P2pProxyUserNotFoundException("user ["+lTo+"] not found",e);
+                                           } 
+                                           
+                                   }
                            }
                    }