Changeset 18:9f805b075575 in mediastreamer2

Timestamp:

Sep 17, 2008 11:39:48 AM (5 years ago)

Author:

jehan <jehan@…>

Branch:

default

Message:

extract legacy proxy to package sipproxy

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

Location:

p2pproxy/src/org/linphone/p2pproxy/core

Files:

• MessageDispatcher.java (modified) (1 diff)
• NetworkResources.java (deleted)
• media/jxtaudpproxy/SdpProcessorImpl.java (modified) (3 diffs)
• sipproxy/JxtaSipProxy.java (modified) (4 diffs)
• sipproxy/NetworkResources.java (added)
• sipproxy/RegistrationHandler.java (added)
• sipproxy/SipProxyRegistrar.java (modified) (4 diffs)

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

@@ -47 +47 @@
                 }
         }
-        synchronized void addPipeMsgListener(PipeMsgListener aPipeMsgListener) {
+        public synchronized void addPipeMsgListener(PipeMsgListener aPipeMsgListener) {
                 mPipeMsgListenerList.add(aPipeMsgListener);
         }

p2pproxy/src/org/linphone/p2pproxy/core/media/jxtaudpproxy/SdpProcessorImpl.java

@@ -31 +31 @@
 import org.linphone.p2pproxy.core.Configurator;
 
-import org.linphone.p2pproxy.core.NetworkResources;
+import org.linphone.p2pproxy.core.sipproxy.NetworkResources;
 import org.linphone.p2pproxy.core.sipproxy.SdpProcessor;
 import org.linphone.p2pproxy.core.sipproxy.SipProxyRegistrar;
@@ -165 +165 @@
             String lMLineName = lMediaDescriptor.getMedia().getMedia();
             RtpSessionImpl lRtpSession = null;
-            if (lRegistration.NetResources.hasRtpSession(lMLineName) == false) {
+            if (((NetworkResources) lRegistration.NetResources).hasRtpSession(lMLineName) == false) {
                // first time, just create
                int lPortStart = Integer.parseInt(mProperties.getProperty(SipProxyRegistrar.UDP_MEDIA_RELAY_PORT_START, "15000"));
                lRtpSession = new RtpSessionImpl (lPortStart,lMLineName);
-               lRegistration.NetResources.putRtpSession(lMLineName, lRtpSession);
+               ((NetworkResources) lRegistration.NetResources).putRtpSession(lMLineName, lRtpSession);
             } else {
-               lRtpSession = lRegistration.NetResources.getRtpSession(lMLineName);
+               lRtpSession = ((NetworkResources) lRegistration.NetResources).getRtpSession(lMLineName);
             }
             if (aRemotePipe != null) {
@@ -178 +178 @@
 
          }
-         return lRegistration.NetResources;
+         return (NetworkResources) lRegistration.NetResources;
       }catch (Exception e) {
          throw new P2pProxyException(e);

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

@@ -23 +23 @@
 import java.util.Map;
 
+import net.jxta.discovery.DiscoveryService;
 import net.jxta.document.Advertisement;
 import net.jxta.endpoint.MessageElement;
@@ -38 +39 @@
 import org.linphone.p2pproxy.core.P2pProxyAdvertisementNotFoundException;
 import org.linphone.p2pproxy.core.media.rtprelay.SdpProcessorImpl;
+import org.linphone.p2pproxy.core.sipproxy.SipProxyRegistrar.Registration;
 import org.zoolu.sip.address.NameAddress;
 import org.zoolu.sip.address.SipURL;
@@ -47 +49 @@
 import org.zoolu.sip.transaction.TransactionServer;
 
-public class JxtaSipProxy implements SipProxy, PipeMsgListener {
+public class JxtaSipProxy implements SipProxy, PipeMsgListener,RegistrationHandler {
    private final JxtaNetworkManager mJxtaNetworkManager;
    private final Map<String,SipProxyRegistrar.Registration> mRegistrationTab;
@@ -212 +214 @@
      //
   }
-
+public void updateRegistration(Registration aRegistration, Message aRegistrationMessage) throws P2pProxyException {
+   try {
+   if (aRegistration.NetResources == null) {
+      // new registration, create pipe
+      NetworkResources lRegistration = new NetworkResources(aRegistration.From,mJxtaNetworkManager);  
+      aRegistration.NetResources = lRegistration;
+      lRegistration.addPipeMsgListener(this);
+   }
+   
+   ((NetworkResources) aRegistration.NetResources).publish(aRegistration.Expiration);
+   } catch (Exception e) {
+      throw new P2pProxyException(e);
+   }
+   
 }
+
+}

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

@@ -47 +47 @@
 import org.linphone.p2pproxy.core.Configurator;
 import org.linphone.p2pproxy.core.JxtaNetworkManager;
-import org.linphone.p2pproxy.core.NetworkResources;
 import org.linphone.p2pproxy.core.P2pProxyAccountManagementMBean;
 import org.linphone.p2pproxy.core.P2pProxyAdvertisementNotFoundException;
@@ -94 +93 @@
       long RegistrationDate;
       long Expiration;
-      public NetworkResources NetResources;
+      //implementation specific context
+      public Object NetResources;
       public  Map<MediaType,InetSocketAddress> RtpRelays = new HashMap<MediaType,InetSocketAddress>() ;
       String Contact;
@@ -275 +275 @@
    private void updateRegistration(Registration aRegistration, Message aRegistrationMessage) throws IOException {
       aRegistration.RegistrationDate = System.currentTimeMillis();
-      // default registration periode
+      // default registration period
       aRegistration.Expiration = 3600000;
       if (aRegistrationMessage.getExpiresHeader() != null ) {
@@ -281 +281 @@
       }
       
-      if (aRegistration.NetResources == null) {
-         // new registration, create pipe
-         aRegistration.NetResources = new NetworkResources(aRegistration.From,mJxtaNetworkManager);
-         aRegistration.NetResources.addPipeMsgListener(this);
-      }
-      
-      aRegistration.NetResources.publish(aRegistration.Expiration);
+      //TODO handle registration 
    }