Changeset 106:24f0ac03bdae in mediastreamer2

Timestamp:

Oct 20, 2008 9:05:48 PM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

add proxy publisher timer

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

Location:

p2pproxy

Files:

• src/org/linphone/p2pproxy/core/P2pProxyMain.java (modified) (5 diffs)
• src/org/linphone/p2pproxy/core/sipproxy/SipProxyRegistrar.java (modified) (5 diffs)
• test-src/org/linphone/p2pproxy/test/utils/UserInstance.java (modified) (3 diffs)

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

@@ -174 +174 @@
                                    mConfigurator.setProperty(JxtaNetworkManager.TCP_LISTENING_PUBLIC_ADDRESS,args[i + 1]+":9701");
                    mConfigurator.setProperty(RtpRelayService.AUDIO_VIDEO_PUBLIC_URI,"udp://"+args[i + 1]+":"+lMediaPort);
+                   mConfigurator.setProperty(SipProxyRegistrar.REGISTRAR_PUBLIC_ADDRESS,args[i + 1]);
                    System.out.println("public address detected[" + args[i + 1] + "]");
                            }            
@@ -268 +269 @@
                    }
 
-                   //setup account manager
-                   mP2pProxyAccountManagement = new P2pProxyAccountManagement(mJxtaNetworkManager);
+
                    //set management
                    try {
@@ -302 +302 @@
       mP2pProxyManagement = (P2pProxyManagement) mServiceProvider;
       mP2pProxySipProxyRegistrarManagement = (P2pProxyResourceManagement) mServiceProvider;
+           //setup account manager
+           mP2pProxyAccountManagement = new P2pProxyAccountManagement(mJxtaNetworkManager);
       mServiceProvider.start(3000L);
    }
@@ -312 +314 @@
       mP2pProxySipProxyRegistrarManagement = (P2pProxyResourceManagement) mServiceProvider;
       mServiceProvider.start(3000L);
+           //setup account manager
+           mP2pProxyAccountManagement = new P2pProxyAccountManagement(mJxtaNetworkManager);
 //    setup sip provider
            SipStack.log_path = mConfigHomeDir+"/logs";
@@ -331 +335 @@
       mP2pProxySipProxyRegistrarManagement = (P2pProxyResourceManagement) mServiceProvider;
       mServiceProvider.start(3000L);
-//    setup sip provider
+           //setup account manager
+           mP2pProxyAccountManagement = new P2pProxyAccountManagement(mJxtaNetworkManager);
+           //    setup sip provider
            SipStack.log_path = mConfigHomeDir+"/logs";
            mSipAndPipeListener = new SipProxyRegistrar(mConfigurator,mJxtaNetworkManager,mP2pProxyAccountManagement);

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

@@ -27 +27 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
@@ -58 +60 @@
    public final static String REGISTRAR_PUBLIC_ADDRESS="org.linphone.p2pproxy.SipListener.registrar.public.address";
    public final static String ADV_NAME = "p2p-proxy-proxyregistrar";
+   private final int ADV_LIFE_TIME=60000;
    //
    private final SipProvider mProvider;
@@ -69 +72 @@
    private final Configurator mProperties;
    private final SuperPeerProxy mSuperPeerProxy;
-   private final NetworkResourceAdvertisement mProxyRegistrationAdvertisement;
+   private  NetworkResourceAdvertisement mProxyRegistrationAdvertisement;
+   private final Timer mTimer = new Timer ("Proxy registrar adv publisher");
   
    //private long mNumberOfEstablishedCall;
@@ -173 +177 @@
       mPool = Executors.newCachedThreadPool();
       mSuperPeerProxy = new SuperPeerProxy(aJxtaNetworkManager, "sip:"+mProvider.getViaAddress()+":"+mProvider.getPort(),mRegistrationTab);
-      mProxyRegistrationAdvertisement = (NetworkResourceAdvertisement) AdvertisementFactory.newAdvertisement(NetworkResourceAdvertisement.getAdvertisementType());
-      mProxyRegistrationAdvertisement.setID(IDFactory.newCodatID(mJxtaNetworkManager.getPeerGroup().getPeerGroupID(), mSuperPeerProxy.getSipProxyRegistrarAddress().toString().getBytes()));
-      mProxyRegistrationAdvertisement.setAddress(mSuperPeerProxy.getSipProxyRegistrarAddress());
-      mProxyRegistrationAdvertisement.setName(ADV_NAME);
-      mJxtaNetworkManager.getPeerGroup().getDiscoveryService().publish(mProxyRegistrationAdvertisement,60000,30000);
-      mLog.info(mProxyRegistrationAdvertisement + "published");
+      TimerTask lPublisherTask = new TimerTask() {
+
+                @Override
+                public void run() {
+                        try {
+                                SipProxyRegistrar.this.publishAdvertisement();
+                        } catch (IOException e) {
+                                mLog.error("cannot publish proxy registar adv", e);
+                        }
+                        
+                }
+          
+      };
+      mTimer.scheduleAtFixedRate(lPublisherTask, 0, ADV_LIFE_TIME-ADV_LIFE_TIME/10);
+      
    }
    public  void onReceivedMessage(SipProvider aProvider, Message aMessage) {
@@ -356 +369 @@
       return mNumberOfUnRegistration;
    }
+   private void publishAdvertisement() throws IOException {
+           if (mProxyRegistrationAdvertisement == null) {   
+           mProxyRegistrationAdvertisement = (NetworkResourceAdvertisement) AdvertisementFactory.newAdvertisement(NetworkResourceAdvertisement.getAdvertisementType());
+              mProxyRegistrationAdvertisement.setID(IDFactory.newCodatID(mJxtaNetworkManager.getPeerGroup().getPeerGroupID(), mSuperPeerProxy.getSipProxyRegistrarAddress().toString().getBytes()));
+              mProxyRegistrationAdvertisement.setAddress(mSuperPeerProxy.getSipProxyRegistrarAddress());
+              mProxyRegistrationAdvertisement.setName(ADV_NAME);
+           }
+           mJxtaNetworkManager.getPeerGroup().getDiscoveryService().publish(mProxyRegistrationAdvertisement,ADV_LIFE_TIME,ADV_LIFE_TIME/2);        
+           mLog.info(mProxyRegistrationAdvertisement + "published");
+   }
 }

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

@@ -78 +78 @@
         mProvider=new SipProvider(null,lSipPort);
         mSipClient = new SipClient(mProvider,userName,30000);
-        final TimerTask lTimerTask = new  TimerTask() {
+         class RegistrarTimerTask extends  TimerTask {
                 @Override
                 public void run() {
@@ -95 +95 @@
                                 mLog.error("cannot register user["+userName+"]",e);
                         } finally {
-                                mTimer.schedule(this, REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
+                                mTimer.schedule(new  RegistrarTimerTask(), REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
                         }
                 }
                 
         };
-        mTimer.schedule(lTimerTask, REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
+        mTimer.schedule(new  RegistrarTimerTask(), REGISTRATION_PERIOD-REGISTRATION_PERIOD/10);
         mSipClient.listen();
         } catch (Exception e) {
@@ -129 +129 @@
                            lLoop =  Integer.parseInt(args[i + 1]);
                            System.out.println("nb-call [" + lLoop + "]");
-                           isRegistered
                    } else {
                            System.out.println("Invalid option: " + args[i]);