Changeset 79:0e5a82c0bdc4 in mediastreamer2


Ignore:
Timestamp:
Oct 12, 2008 10:07:16 PM (5 years ago)
Author:
jehan <jehan@…>
Branch:
default
Message:

refactor proxy management interface

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

Location:
p2pproxy/src/org/linphone/p2pproxy
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • p2pproxy/src/org/linphone/p2pproxy/api/P2pProxyManagement.java

    r70 r79  
    2222 
    2323 
    24 public interface P2pProxyManagement extends P2pProxyNetworkProbe,P2pProxyRtpRelayManagement,P2pProxySipProxyRegistrarManagement { 
     24public interface P2pProxyManagement extends P2pProxyNetworkProbe,P2pProxySipProxyRegistrarManagement { 
    2525 
    2626   /** 

  • p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyInstanceImpl.java

    r16 r79  
    2525import java.net.InetAddress; 
    2626import java.net.URI; 
    27 import java.net.URL; 
    2827import java.net.UnknownHostException; 
    2928import java.util.Enumeration; 
    … …  
    145144               // setup sip proxy 
    146145               mP2pProxyAccountManagement = new P2pProxyAccountManagement(mJxtaNetworkManager); 
    147                mSipProxy = new SipProxyRegistrar(mConfigurator,mJxtaNetworkManager,mP2pProxyAccountManagement,mP2pProxyManagement); 
     146               mSipProxy = new SipProxyRegistrar(mConfigurator,mJxtaNetworkManager,mP2pProxyAccountManagement); 
    148147               // setup sip client                 
    149148               mProviderForSipClient = new SipProvider(getPrivateHostAddress(),BASE_CLIENT_SIP_PORT+mIndex); 

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

    r77 r79  
    4040import org.linphone.p2pproxy.api.P2pProxyManagement; 
    4141import org.linphone.p2pproxy.api.P2pProxyNotReadyException; 
     42import org.linphone.p2pproxy.api.P2pProxySipProxyRegistrarManagement; 
    4243import org.linphone.p2pproxy.api.P2pProxyUserAlreadyExistException; 
    4344import org.linphone.p2pproxy.core.media.rtprelay.RtpRelayService; 
    4445import org.linphone.p2pproxy.core.sipproxy.SipProxyRegistrar; 
    45 import org.linphone.p2pproxy.core.sipproxy.SipProxyRegistrarAdvertisement; 
    4646import org.zoolu.sip.provider.SipStack; 
    4747import org.linphone.p2pproxy.launcher.P2pProxylauncherConstants; 
    … …  
    5454   private  static SipProxyRegistrar mSipAndPipeListener; 
    5555   private static P2pProxyAccountManagementMBean mP2pProxyAccountManagement; 
     56   private static P2pProxySipProxyRegistrarManagement mP2pProxySipProxyRegistrarManagement; 
    5657   public final static String ACCOUNT_MGR_MBEAN_NAME="org.linphone.p2proxy:type=account-manager"; 
    5758   public final static String PROXY_REG_MBEAN_NAME="org.linphone.p2proxy:type=proxy-registrar"; 
    … …  
    266267                   // setup sip provider 
    267268                   SipStack.log_path = mConfigHomeDir+"/logs"; 
    268                    mSipAndPipeListener = new SipProxyRegistrar(mConfigurator,mJxtaNetworkManager,mP2pProxyAccountManagement,mP2pProxyManagement); 
     269                   mSipAndPipeListener = new SipProxyRegistrar(mConfigurator,mJxtaNetworkManager,mP2pProxyAccountManagement); 
    269270                   //set management 
    270271                   try { 
    … …  
    301302      mServiceProvider = new EdgePeerServiceManager(aProperties, mJxtaNetworkManager); 
    302303      mP2pProxyManagement = (P2pProxyManagement) mServiceProvider; 
     304      mP2pProxySipProxyRegistrarManagement = (P2pProxySipProxyRegistrarManagement) mServiceProvider; 
    303305      mServiceProvider.start(3000L); 
    304306   } 
    … …  
    309311      mServiceProvider = new SuperPeerServiceManager(aProperties, mJxtaNetworkManager); 
    310312      mP2pProxyManagement = (P2pProxyManagement) mServiceProvider; 
     313      mP2pProxySipProxyRegistrarManagement = (P2pProxySipProxyRegistrarManagement) mServiceProvider; 
    311314      mServiceProvider.start(3000L); 
    312315   } 
    … …  
    316319      mServiceProvider = new SeedingPeerServiceManager(aProperties, mJxtaNetworkManager,true); 
    317320      mP2pProxyManagement = null; 
     321      mP2pProxySipProxyRegistrarManagement = (P2pProxySipProxyRegistrarManagement) mServiceProvider; 
    318322      mServiceProvider.start(3000L); 
    319323   }    
    … …  
    431435   try { 
    432436      isReady(); 
    433       SipProxyRegistrarAdvertisement lSipProxyRegistrarAdvertisement = (SipProxyRegistrarAdvertisement) (mJxtaNetworkManager.getAdvertisement(null, SipProxyRegistrarAdvertisement.NAME, true)); 
    434       return lSipProxyRegistrarAdvertisement.getAddress(); 
     437      return mP2pProxySipProxyRegistrarManagement.getSipProxyRegistrarUri(); 
    435438   } catch (Exception e) { 
    436439      return null; 

  • p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyManagementImpl.java

    r70 r79  
    3636import org.linphone.p2pproxy.core.sipproxy.SipProxyRegistrarAdvertisement; 
    3737 
    38 public abstract class P2pProxyManagementImpl implements ServiceProvider,P2pProxyManagement { 
    39    protected final JxtaNetworkManager mJxtaNetworkManager; 
     38public abstract class P2pProxyManagementImpl extends P2pProxySipProxyRegistrarManagementImpl implements ServiceProvider,P2pProxyManagement { 
    4039   protected final Configurator mConfigurator; 
    4140   private final PeerInfoServiceClient mPeerInfoServiceClient; 
    42    private final RtpRelayServiceClient mRtpRelayServiceClient; 
    4341   private final static Logger mLog = Logger.getLogger(P2pProxyManagementImpl.class); 
    4442    
    4543   P2pProxyManagementImpl(Configurator aConfigurator, JxtaNetworkManager aJxtaNetworkManager) throws SocketException, UnknownHostException 
    4644    { 
    47         mJxtaNetworkManager = aJxtaNetworkManager; 
     45        super(aJxtaNetworkManager); 
    4846        mConfigurator = aConfigurator; 
    4947        mPeerInfoServiceClient = new PeerInfoServiceClient(aConfigurator, aJxtaNetworkManager); 
    50         mRtpRelayServiceClient = new RtpRelayServiceClient(aConfigurator, aJxtaNetworkManager); 
    5148    } 
    5249 
    … …  
    5451    { 
    5552        mPeerInfoServiceClient.start(aTimeout); 
    56         mRtpRelayServiceClient.start(aTimeout); 
    5753         
    5854    } 
    … …  
    6056    public void stop() { 
    6157        mPeerInfoServiceClient.stop(); 
    62         mRtpRelayServiceClient.stop(); 
    6358        mLog.info("P2pProxyManagementImpl stopped"); 
    6459    } 
    … …  
    7570 
    7671  
    77    public Map<MediaType, InetSocketAddress> getAddresses() throws P2pProxyException { 
    78       return  mRtpRelayServiceClient.getAddresses(); 
    79    } 
    80    public String getSipProxyRegistrarUri() throws P2pProxyException  { 
    81       try { 
    82          SipProxyRegistrarAdvertisement lSipProxyRegistrarAdvertisement = (SipProxyRegistrarAdvertisement) (mJxtaNetworkManager.getAdvertisement(null, SipProxyRegistrarAdvertisement.NAME, true)); 
    83          return lSipProxyRegistrarAdvertisement.getAddress(); 
    84       }catch (Exception e) { 
    85             throw new P2pProxyException(e); 
    86          } 
    87  
    88       } 
     72  
    8973 
    9074} 

  • p2pproxy/src/org/linphone/p2pproxy/core/SeedingPeerServiceManager.java

    r0 r79  
    1818import org.linphone.p2pproxy.core.rdvautoconfig.PeerInfoProviderService; 
    1919 
    20 public class SeedingPeerServiceManager implements ServiceProvider { 
    21    protected final JxtaNetworkManager mJxtaNetworkManager; 
     20public class SeedingPeerServiceManager extends P2pProxySipProxyRegistrarManagementImpl implements ServiceProvider { 
    2221   protected final Configurator mConfigurator; 
    2322   private final PeerInfoProviderService mPeerInfoProviderService;  
    … …  
    2625   private final static Logger mLog = Logger.getLogger(SeedingPeerServiceManager.class); 
    2726   SeedingPeerServiceManager(Configurator aConfigurator, JxtaNetworkManager aJxtaNetworkManager,boolean enableUdpRelay) throws SocketException, UnknownHostException { 
    28       mJxtaNetworkManager = aJxtaNetworkManager; 
     27      super(aJxtaNetworkManager); 
    2928      mConfigurator = aConfigurator; 
    3029      mPeerInfoProviderService = new PeerInfoProviderService(aConfigurator, aJxtaNetworkManager); 

  • p2pproxy/src/org/linphone/p2pproxy/core/SuperPeerServiceManager.java

    r0 r79  
    66package org.linphone.p2pproxy.core; 
    77 
    8  
    9  
    10 import java.net.SocketAddress; 
    118import java.net.SocketException; 
    129import java.net.UnknownHostException; 

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

    r74 r79  
    2525import java.io.IOException; 
    2626import java.net.InetSocketAddress; 
    27 import java.util.Date; 
    2827import java.util.HashMap; 
    2928import java.util.Map; 
    … …  
    3231import java.util.concurrent.ExecutorService; 
    3332import java.util.concurrent.Future; 
    34 import net.jxta.document.Advertisement; 
    3533import net.jxta.document.AdvertisementFactory; 
    36 import net.jxta.endpoint.MessageElement; 
    37 import net.jxta.endpoint.StringMessageElement; 
    3834import net.jxta.id.IDFactory; 
    39 import net.jxta.pipe.OutputPipe; 
    40 import net.jxta.pipe.PipeMsgEvent; 
    41 import net.jxta.pipe.PipeMsgListener; 
    42 import net.jxta.protocol.PipeAdvertisement; 
    43  
    4435import org.apache.log4j.Logger; 
    4536import org.apache.log4j.NDC; 
    4637import org.linphone.p2pproxy.api.P2pProxyException; 
    47 import org.linphone.p2pproxy.api.P2pProxyRtpRelayManagement; 
    4838import org.linphone.p2pproxy.api.P2pProxyUserNotFoundException; 
    4939 
    … …  
    5141import org.linphone.p2pproxy.core.JxtaNetworkManager; 
    5242import org.linphone.p2pproxy.core.P2pProxyAccountManagementMBean; 
    53 import org.linphone.p2pproxy.core.P2pProxyAdvertisementNotFoundException; 
    5443import org.linphone.p2pproxy.core.media.rtprelay.MediaType; 
    55 import org.linphone.p2pproxy.core.media.rtprelay.SdpProcessorImpl; 
    56 import org.linphone.p2pproxy.core.sipproxy.superpeers.P2pUserRegistrationAdvertisement; 
    5744import org.linphone.p2pproxy.core.sipproxy.superpeers.SuperPeerProxy; 
    58 import org.zoolu.sip.address.NameAddress; 
    59 import org.zoolu.sip.address.SipURL; 
    6045import org.zoolu.sip.header.ExpiresHeader; 
    61 import org.zoolu.sip.header.Header; 
    6246import org.zoolu.sip.header.MultipleHeader; 
    63 import org.zoolu.sip.header.RecordRouteHeader; 
    64 import org.zoolu.sip.header.RouteHeader; 
    65 import org.zoolu.sip.header.ViaHeader; 
    6647import org.zoolu.sip.message.Message; 
    6748import org.zoolu.sip.message.MessageFactory; 
    … …  
    6950import org.zoolu.sip.provider.SipProviderListener; 
    7051import org.zoolu.sip.provider.SipStack; 
    71 import org.zoolu.sip.provider.TransactionIdentifier; 
    72 import org.zoolu.sip.transaction.Transaction; 
    7352import org.zoolu.sip.transaction.TransactionServer; 
    7453import java.util.Collections; 
    … …  
    181160   } 
    182161    
    183    public SipProxyRegistrar(Configurator lProperties,JxtaNetworkManager aJxtaNetworkManager,P2pProxyAccountManagementMBean aP2pProxyAccountManagement,P2pProxyRtpRelayManagement aP2pProxyRtpRelayManagement) throws IOException { 
     162   public SipProxyRegistrar(Configurator lProperties,JxtaNetworkManager aJxtaNetworkManager,P2pProxyAccountManagementMBean aP2pProxyAccountManagement) throws IOException { 
    184163      mJxtaNetworkManager =  aJxtaNetworkManager; 
    185164      mP2pProxyAccountManagement = aP2pProxyAccountManagement; 
Note: See TracChangeset for help on using the changeset viewer.