Revision: 16050
Author: oleg.kulikoff
Date: Sat Dec 25 06:54:07 2010
Log: Issue 1976: FSM update
http://code.google.com/p/mobicents/source/detail?r=16050

Deleted:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/MgcpTransactionHandler.java
Modified:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/mscontrol/sdp/MediaDescriptor.java

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/MgcpTransactionHandler.java Mon Dec 13 22:41:11 2010
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package org.mobicents.javax.media.mscontrol.spi;
-
-import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
-import jain.protocol.ip.mgcp.JainMgcpListener;
-import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
-
-/**
- * Base MGCP listener for specific transaction.
- *
- *
- * @author kulikov
- */
-public abstract class MgcpTransactionHandler implements JainMgcpListener {
-
-    //transaction identifier
-    private int txID;
-
-    //MGCP provider
-    private DriverImpl driver;
-
-    /**
-     * Creates new listener for specific transaction.
-     *
-     * @param txID the transaction ientifier.
-     */
-    public MgcpTransactionHandler(int txID, DriverImpl driver) {
-        this.txID = txID;
-        this.driver = driver;
-
-        //register itself as listener
-        driver.addListener(this);
-    }
-
-    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
-        //process commands with expected txID only
-        boolean done = true;
-        if (evt.getTransactionHandle() == this.txID) {
-            try {
-                done = processCommandEvent(evt);
-            } finally {
-                if (done) driver.removeListener(this);
-            }
-        }
-    }
-
-    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
-        //process responses with expected txID only
-        boolean done = true;
-        if (evt.getTransactionHandle() == this.txID) {
-            try {
-                done = processResponseEvent(evt);
-            } finally {
-                if (done) driver.removeListener(this);
-            }
-        }
-    }
-
-    public abstract boolean processCommandEvent(JainMgcpCommandEvent evt);
- public abstract boolean processResponseEvent(JainMgcpResponseEvent evt);
-}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java Sat Dec 25 06:54:07 2010
@@ -50,13 +50,6 @@
     public void setEndpoint(EndpointIdentifier endpoint) {
         this.endpointName = endpoint;
     }
-
- protected LocalConnection createLocalConnection(LocalConnection other, ConnectionIdentifier ID, Direction direction) {
-        OtherParty otherParty = new OtherParty(this, other);
- LocalConnection connection = new LocalConnection(otherParty, ID, direction);
-        connections.add(connection);
-        return connection;
-    }

     public MediaSessionImpl getMediaSession() {
         return session;
@@ -100,17 +93,17 @@
     }

public void join(Direction direction, Joinable other) throws MsControlException {
-
+ System.out.println("*******************JOIN CALLED********************");
     }


public void joinInitiate(Direction direction, Joinable other, Serializable context) throws MsControlException {
         //create connection for this container
-        LocalConnection connection1 = new LocalConnection(this, direction);
+ LocalConnection connection1 = new LocalConnection(this, direction, context);
         connections.add(connection1);

         //create connection for other container
- LocalConnection connection2 = new LocalConnection((ContainerImpl) other,direction); + LocalConnection connection2 = new LocalConnection((ContainerImpl) other,direction, context);
         ((ContainerImpl)other).connections.add(connection2);

         //make cross reference between connections;
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinRequest.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinRequest.java Sat Dec 25 06:54:07 2010
@@ -49,7 +49,7 @@
         } catch (ConflictingParameterException e) {
         }

-        new JoinResponseHandler(connection, txID);
+ connection.container.session.getDriver().attach(txID, new JoinResponseHandler(connection));
         connection.container.session.getDriver().send(crcx);
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java Sat Dec 25 06:54:07 2010
@@ -19,40 +19,39 @@
 package org.mobicents.javax.media.mscontrol.container;

 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.message.CreateConnectionResponse;
 import jain.protocol.ip.mgcp.message.parms.ReturnCode;
 import javax.media.mscontrol.MediaErr;
 import javax.media.mscontrol.join.JoinEvent;
+import org.mobicents.fsm.State;
+import org.mobicents.fsm.StateEventHandler;
 import org.mobicents.fsm.UnknownTransitionException;
-import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;

 /**
  *
  * @author kulikov
  */
-public class JoinResponseHandler extends MgcpTransactionHandler {
+public class JoinResponseHandler implements JainMgcpListener {

     private LocalConnection connection;
     private MediaErr error;
     private String errorMsg;

-    public JoinResponseHandler(LocalConnection connection, int txID) {
-        super(txID, connection.getContainer().session.getDriver());
+    public JoinResponseHandler(LocalConnection connection) {
         this.connection = connection;
     }

-    @Override
-    public boolean processCommandEvent(JainMgcpCommandEvent evt) {
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         throw new UnsupportedOperationException("Not supported yet.");
     }

-    @Override
-    public boolean processResponseEvent(JainMgcpResponseEvent evt) {
+    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
         CreateConnectionResponse resp = (CreateConnectionResponse) evt;
         switch (resp.getReturnCode().getValue()) {
             case ReturnCode.TRANSACTION_BEING_EXECUTED :
-                return false;
+                return;
             case ReturnCode.TRANSACTION_EXECUTED_NORMALLY :
                 //update this party
connection.container.endpointName = resp.getSpecificEndpointIdentifier();
@@ -69,15 +68,15 @@
                 }

                 //send signal to second connection
-                try {
- connection.otherParty.connection.fsm.signal(LocalConnection.SIGNAL_JOINED);
-                } catch (UnknownTransitionException e) {
-                }
-
- JoinEventImpl event = new JoinEventImpl(connection.container, null, - connection.otherParty.container, JoinEvent.JOINED, true, null, null);
-                connection.container.fire(event);
-                return true;
+//                try {
+// connection.otherParty.connection.fsm.signal(LocalConnection.SIGNAL_JOINED);
+//                } catch (UnknownTransitionException e) {
+//                }
+
+// JoinEventImpl event = new JoinEventImpl(connection.container, null, +// connection.otherParty.container, JoinEvent.JOINED, true, null, null);
+//                connection.container.fire(event);
+                break;
             default :
                 //send failure signal to first connection
                 try {
@@ -86,18 +85,18 @@
                 }

                 //send failure signal to second connection
-                try {
- connection.otherParty.connection.fsm.signal(LocalConnection.SIGNAL_FAILURE);
-                } catch (UnknownTransitionException e) {
-                }
+//                try {
+// connection.otherParty.connection.fsm.signal(LocalConnection.SIGNAL_FAILURE);
+//                } catch (UnknownTransitionException e) {
+//                }

                 //fire event
- JoinEventImpl failure = new JoinEventImpl(connection.container, null, - connection.otherParty.container, JoinEvent.UNJOINED, false, - JoinEvent.TOO_MANY_JOINEES, resp.getReturnCode().getComment());
-                connection.container.fire(failure);
-                return true;
+// JoinEventImpl failure = new JoinEventImpl(connection.container, null, +// connection.otherParty.container, JoinEvent.UNJOINED, false, +// JoinEvent.TOO_MANY_JOINEES, resp.getReturnCode().getComment());
+//                connection.container.fire(failure);
         }
     }

-}
+
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java Sat Dec 25 06:54:07 2010
@@ -18,8 +18,13 @@
 package org.mobicents.javax.media.mscontrol.container;

 import jain.protocol.ip.mgcp.message.parms.ConnectionIdentifier;
+import java.io.Serializable;
+import javax.media.mscontrol.MediaErr;
+import javax.media.mscontrol.join.JoinEvent;
 import javax.media.mscontrol.join.Joinable.Direction;
 import org.mobicents.fsm.FSM;
+import org.mobicents.fsm.State;
+import org.mobicents.fsm.StateEventHandler;
 import org.mobicents.fsm.UnknownTransitionException;

 /**
@@ -28,6 +33,7 @@
  */
 public class LocalConnection {
     protected final static String STATE_NULL = "NULL";
+ protected final static String STATE_SOFT_CONNECTING = "SOFT_CONNECTING";
     protected final static String STATE_CONNECTING = "CONNECTING";
     protected final static String STATE_CONNECTED = "CONNECTED";
     protected final static String STATE_DISCONNECTING = "DISCONNECTING";
@@ -35,6 +41,7 @@
     protected final static String STATE_CANCELED = "CANCELED";

     protected final static String SIGNAL_JOIN = "join";
+    protected final static String SIGNAL_SOFT_JOIN = "soft_joined";
     protected final static String SIGNAL_JOINED = "joined";
protected final static String SIGNAL_OTHER_PARTY_JOINED = "other_party_joined";
     protected final static String SIGNAL_UNJOIN = "unjoin";
@@ -55,19 +62,26 @@

     protected FSM fsm;

- protected LocalConnection(ContainerImpl container, Direction direction) {
+    protected MediaErr lastError;
+    protected String lastErrMessage;
+
+    private Serializable context;
+
+ protected LocalConnection(ContainerImpl container, Direction direction, Serializable context) {
         otherParty = new OtherParty();

         this.container = container;
         this.direction = direction;
+        this.context = context;

         this.init();
     }

- protected LocalConnection(OtherParty otherParty, ConnectionIdentifier ID, Direction direction) { + protected LocalConnection(OtherParty otherParty, ConnectionIdentifier ID, Direction direction, Serializable context) {
         this.otherParty = otherParty;
         this.ID = ID;
         this.direction = direction;
+        this.context = context;

         this.init();

@@ -83,9 +97,20 @@
         //define states
         fsm.createState(STATE_NULL);
         fsm.createState(STATE_CONNECTING);
-        fsm.createState(STATE_CONNECTED);
+
+        //on enter triggers other party with signal soft_join
+ fsm.createState(STATE_SOFT_CONNECTING).setOnEnter(new OnConnecting());
+
+        //on enter triggers other party with signal joined
+        fsm.createState(STATE_CONNECTED).setOnEnter(new OnConnected());
+
+        //on enter triggers delete connection request
fsm.createState(STATE_DISCONNECTING).setOnEnter(new UnjoinRequest(this));
+
+ //on enter triggers unjoin on other party and cleans this connection
+        //sends unjoin event
fsm.createState(STATE_INVALID).setOnEnter(new InvalidateHandler(this));
+
         fsm.createState(STATE_CANCELED);

         fsm.setStart(STATE_NULL);
@@ -99,12 +124,8 @@
         //initiate joining (first connection)
fsm.createTransition(SIGNAL_JOIN, STATE_NULL, STATE_CONNECTING).setHandler(
                 new JoinRequest(this));
-        //jump to connected state (second connection)
-        fsm.createTransition(SIGNAL_JOINED, STATE_NULL, STATE_CONNECTED);
-        //jump to invalid state (second connection)
-        fsm.createTransition(SIGNAL_FAILURE, STATE_NULL, STATE_INVALID);
-        //jump to invalid state (second connection)
-        fsm.createTransition(SIGNAL_UNJOIN, STATE_NULL, STATE_INVALID);
+        //jump to connecting state caused by master connectin
+ fsm.createTransition(SIGNAL_SOFT_JOIN, STATE_SOFT_CONNECTING, STATE_CONNECTED);

/*-----------------------------------------------------------------*/ /* STATE CONNECTING */
@@ -117,6 +138,14 @@
fsm.createTransition(SIGNAL_FAILURE, STATE_CONNECTING, STATE_INVALID);
         //no response from server
         fsm.createTimeoutTransition(STATE_CONNECTING, STATE_INVALID, 5000);
+
+ /*-----------------------------------------------------------------*/ + /* STATE SOFT_CONNECTING */ + /*-----------------------------------------------------------------*/
+        //positive response from server
+ fsm.createTransition(SIGNAL_JOINED, STATE_SOFT_CONNECTING, STATE_CONNECTED);
+        //unjoin called by user in the middle of joining process
+ fsm.createTransition(SIGNAL_UNJOIN, STATE_SOFT_CONNECTING, STATE_INVALID);

/*-----------------------------------------------------------------*/ /* STATE CONNECTED */
@@ -176,8 +205,47 @@
     }

     protected void invalidate() {
+        try {
+            otherParty.connection.fsm.signal(SIGNAL_UNJOIN);
+        } catch (UnknownTransitionException e) {
+        }
+
+        //fire unjoin event
+        JoinEventImpl evt = new JoinEventImpl(container, null,
+                        otherParty.container, JoinEvent.UNJOINED, false,
+                        lastError, lastErrMessage);
+
+        container.fire(evt);
+
+        //clean code
         otherParty = null;
         container.remove(this);
         container = null;
     }
-}
+
+    private class OnConnecting implements StateEventHandler {
+
+        public void onEvent(State state) {
+            try {
+                otherParty.connection.fsm.signal(SIGNAL_SOFT_JOIN);
+            } catch (UnknownTransitionException e) {
+            }
+        }
+
+    }
+
+    private class OnConnected implements StateEventHandler {
+
+        public void onEvent(State state) {
+            try {
+                otherParty.connection.fsm.signal(SIGNAL_JOINED);
+            } catch (UnknownTransitionException e) {
+            }
+            JoinEventImpl event = new JoinEventImpl(container, context,
+ otherParty.container, JoinEvent.JOINED, true, null, null);
+            container.fire(event);
+        }
+
+    }
+
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinRequest.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinRequest.java Sat Dec 25 06:54:07 2010
@@ -40,7 +40,8 @@
connection.container.session.getCallID(), connection.container.endpointName,
                 connection.ID);
        req.setTransactionHandle(txID);
-        new UnjoinResponseHandler(connection, txID);
+
+ connection.container.session.getDriver().attach(txID, new UnjoinResponseHandler(connection));
         connection.container.session.getDriver().send(req);
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java Sat Dec 25 06:54:07 2010
@@ -18,38 +18,31 @@
 package org.mobicents.javax.media.mscontrol.container;

 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
-import javax.media.mscontrol.join.JoinEvent;
 import org.mobicents.fsm.UnknownTransitionException;
-import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;

 /**
  *
  * @author kulikov
  */
-public class UnjoinResponseHandler extends MgcpTransactionHandler {
+public class UnjoinResponseHandler implements JainMgcpListener {

     private LocalConnection connection;

-    public UnjoinResponseHandler(LocalConnection connection, int txID) {
-        super(txID, connection.getContainer().session.getDriver());
+    public UnjoinResponseHandler(LocalConnection connection) {
         this.connection = connection;
     }

-    @Override
-    public boolean processCommandEvent(JainMgcpCommandEvent evt) {
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         throw new UnsupportedOperationException("Not supported yet.");
     }

-    @Override
-    public boolean processResponseEvent(JainMgcpResponseEvent evt) {
+    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
         try {
-            System.out.println("connection: " + connection);
- System.out.println("connection's otherParty: " + connection.otherParty);
             connection.fsm.signal(LocalConnection.SIGNAL_UNJOINED);
         } catch (UnknownTransitionException e) {
         }
-        return true;
     }

 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Sat Dec 25 06:54:07 2010
@@ -77,7 +77,6 @@
         recorder = new RecorderImpl(this);
         detector = new SignalDetectorImpl(this);

-        session.getDriver().addListener(this);
     }

     // MediaGroup Methods
@@ -136,7 +135,6 @@

     public void release() {
         //unregister media group as listener
-        session.getDriver().removeListener(this);
         unjoin();
     }

@@ -185,7 +183,6 @@
         //generate request identifier
reqID = new RequestIdentifier(Integer.toString(session.getUniqueReqID())); NotificationRequest req = new NotificationRequest(this, getEndpoint(), reqID);
-
RequestedAction[] actions = new RequestedAction[] { RequestedAction.NotifyImmediately };

         ArrayList<EventName> signalList = new ArrayList();
@@ -214,6 +211,7 @@
req.setTransactionHandle(getMediaSession().getDriver().getNextTxID()); req.setNotifiedEntity(getMediaSession().getDriver().getCallAgent());

+        getMediaSession().getDriver().attach(reqID, this);
         getMediaSession().getDriver().send(req);
     }

@@ -259,9 +257,9 @@

     public void processMgcpCommandEvent(JainMgcpCommandEvent event) {
         //process commands related to this endpoint only
-        if (!isSameEndpoint(event.getEndpointIdentifier())) {
-            return;
-        }
+//        if (!isSameEndpoint(event.getEndpointIdentifier())) {
+//            return;
+//        }

         JainMgcpResponseEvent response = null;

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Sat Dec 25 06:54:07 2010
@@ -15,6 +15,7 @@

 import org.mobicents.fsm.FSM;
 import org.mobicents.fsm.State;
+import org.mobicents.fsm.StateEventHandler;
 import org.mobicents.fsm.TransitionHandler;
 import org.mobicents.fsm.UnknownTransitionException;

@@ -65,7 +66,7 @@
         fsm = new FSM(parent.getMediaSession().getDriver().getScheduler());

         fsm.createState(STATE_IDLE);
-        fsm.createState(STATE_ACTIVE);
+        fsm.createState(STATE_ACTIVE).setOnEnter(new OnStart());
         fsm.createState(STATE_PAUSED);

         fsm.setStart(STATE_IDLE);
@@ -193,5 +194,10 @@

     }

-
-}
+    private class OnStart implements StateEventHandler {
+
+        public void onEvent(State state) {
+        }
+
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionRequest.java Mon Dec 20 23:43:36 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionRequest.java Sat Dec 25 06:54:07 2010
@@ -53,15 +53,13 @@
         //if SDP is present assign it to request
         if (connection.sdpPortManager.remoteSdp != null) {
             try {
-                System.out.println("==============REQUEST");
- System.out.println(connection.sdpPortManager.remoteSdp.toString()); req.setRemoteConnectionDescriptor(new ConnectionDescriptor(connection.sdpPortManager.remoteSdp.toString()));
             } catch (Exception e) {
             }
         }

-        //create handler for this tx
-        new CreateConnectionResponseHandler(txHandle, connection);
+        //create handler for this and register it as listener
+ connection.getMediaSession().getDriver().attach(txHandle, new CreateConnectionResponseHandler(connection));
         //send request
         connection.getMediaSession().getDriver().send(req);
     }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java Mon Dec 20 23:43:36 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java Sat Dec 25 06:54:07 2010
@@ -19,6 +19,7 @@
 package org.mobicents.javax.media.mscontrol.networkconnection;

 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.message.CreateConnectionResponse;
 import jain.protocol.ip.mgcp.message.parms.ReturnCode;
@@ -26,32 +27,28 @@
 import javax.media.mscontrol.networkconnection.SdpPortManagerEvent;
 import org.mobicents.fsm.UnknownTransitionException;
import org.mobicents.javax.media.mscontrol.networkconnection.fsm.ConnectionTransition;
-import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;

 /**
  *
  * @author kulikov
  */
-public class CreateConnectionResponseHandler extends MgcpTransactionHandler {
+public class CreateConnectionResponseHandler implements JainMgcpListener {

     private NetworkConnectionImpl connection;

- public CreateConnectionResponseHandler(int txID, NetworkConnectionImpl connection) {
-        super(txID, connection.getMediaSession().getDriver());
+ public CreateConnectionResponseHandler(NetworkConnectionImpl connection) {
         this.connection = connection;
     }

-    @Override
-    public boolean processCommandEvent(JainMgcpCommandEvent evt) {
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         throw new UnsupportedOperationException("Not supported yet.");
     }

-    @Override
-    public boolean processResponseEvent(JainMgcpResponseEvent evt) {
+    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
         CreateConnectionResponse resp = (CreateConnectionResponse) evt;
         switch (resp.getReturnCode().getValue()) {
             case ReturnCode.TRANSACTION_BEING_EXECUTED :
-                return false;
+                return;
             case ReturnCode.TRANSACTION_EXECUTED_NORMALLY :
                 connection.connectionID = resp.getConnectionIdentifier();
connection.setEndpoint(resp.getSpecificEndpointIdentifier());
@@ -66,7 +63,7 @@
                 } catch (UnknownTransitionException e) {
                 }

-                return true;
+                return;
             case ReturnCode.ENDPOINT_UNKNOWN :
                 connection.error = MediaErr.NOT_FOUND;
                 break;
@@ -100,7 +97,6 @@
             connection.fsm.signal(ConnectionTransition.FAILURE);
         } catch (UnknownTransitionException e) {
         }
-        return true;
     }

 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java Sat Dec 25 06:54:07 2010
@@ -48,7 +48,7 @@
DeleteConnection req = new DeleteConnection(this, callId, endpointID, connectionID);
         req.setTransactionHandle(txHandle);

-        new DeleteConnectionResponseHandler(txHandle, connection);
+ connection.getMediaSession().getDriver().attach(txHandle, new DeleteConnectionResponseHandler(connection));
         System.out.println("Sending DLCX!!!!");
         //send request
         connection.getMediaSession().getDriver().send(req);
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionResponseHandler.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionResponseHandler.java Sat Dec 25 06:54:07 2010
@@ -18,36 +18,32 @@
 package org.mobicents.javax.media.mscontrol.networkconnection;

 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.message.DeleteConnectionResponse;
 import org.mobicents.fsm.UnknownTransitionException;
import org.mobicents.javax.media.mscontrol.networkconnection.fsm.ConnectionTransition;
-import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;

 /**
  *
  * @author kulikov
  */
-public class DeleteConnectionResponseHandler extends MgcpTransactionHandler {
+public class DeleteConnectionResponseHandler implements JainMgcpListener {
     private NetworkConnectionImpl connection;

- public DeleteConnectionResponseHandler(int txID, NetworkConnectionImpl connection) {
-        super(txID, connection.getMediaSession().getDriver());
+ public DeleteConnectionResponseHandler(NetworkConnectionImpl connection) {
         this.connection = connection;
     }

-    @Override
-    public boolean processCommandEvent(JainMgcpCommandEvent evt) {
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         throw new UnsupportedOperationException("Not supported yet.");
     }

-    @Override
-    public boolean processResponseEvent(JainMgcpResponseEvent evt) {
+    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
         DeleteConnectionResponse response = (DeleteConnectionResponse) evt;
         try {
             connection.fsm.signal(ConnectionTransition.CLOSED);
         } catch (UnknownTransitionException e) {
         }
-        return true;
     }
 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java Mon Dec 20 23:43:36 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java Sat Dec 25 06:54:07 2010
@@ -49,13 +49,14 @@
ModifyConnection req = new ModifyConnection(this, callId, endpointID, connectionID);
         req.setTransactionHandle(txHandle);

-        new ModifyConnectionResponseHandler(txHandle, connection);
+
         try {
req.setRemoteConnectionDescriptor(new ConnectionDescriptor(connection.sdpPortManager.remoteSdp.toString()));
         } catch (Exception e) {
         }

         //send request
+ connection.getMediaSession().getDriver().attach(txHandle, new ModifyConnectionResponseHandler(connection));
         connection.getMediaSession().getDriver().send(req);
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.java Mon Dec 20 23:43:36 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.java Sat Dec 25 06:54:07 2010
@@ -18,50 +18,46 @@
 package org.mobicents.javax.media.mscontrol.networkconnection;

 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.message.ModifyConnectionResponse;
 import jain.protocol.ip.mgcp.message.parms.ReturnCode;
 import org.mobicents.fsm.UnknownTransitionException;
import org.mobicents.javax.media.mscontrol.networkconnection.fsm.ConnectionTransition;
-import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;
-import org.mobicents.mscontrol.sdp.SessionDescriptor;

 /**
  *
  * @author kulikov
  */
-public class ModifyConnectionResponseHandler extends MgcpTransactionHandler {
+public class ModifyConnectionResponseHandler implements JainMgcpListener {
     private NetworkConnectionImpl connection;

- public ModifyConnectionResponseHandler(int txID, NetworkConnectionImpl connection) {
-        super(txID, connection.getMediaSession().getDriver());
+ public ModifyConnectionResponseHandler(NetworkConnectionImpl connection) {
         this.connection = connection;
     }

-    @Override
-    public boolean processCommandEvent(JainMgcpCommandEvent evt) {
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         throw new UnsupportedOperationException("Not supported yet.");
     }

-    @Override
-    public boolean processResponseEvent(JainMgcpResponseEvent evt) {
+    public void processMgcpResponseEvent(JainMgcpResponseEvent evt) {
         ModifyConnectionResponse resp = (ModifyConnectionResponse) evt;
         switch (resp.getReturnCode().getValue()) {
             case ReturnCode.TRANSACTION_BEING_EXECUTED:
-                return false;
+                return;
             case ReturnCode.TRANSACTION_EXECUTED_NORMALLY:
connection.sdpPortManager.setLocalDescriptor(resp.getLocalConnectionDescriptor().toString());
                 try {
                     connection.fsm.signal(ConnectionTransition.OPENED);
                 } catch (UnknownTransitionException e) {
                 }
-                return true;
+                break;
             case ReturnCode.ENDPOINT_UNKNOWN :
-                return true;
+                break;
             case ReturnCode.CONNECTION_WAS_DELETED:
-                return true;
+                break;
             default:
-                return true;
+                break;
         }
     }
 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Fri Dec 24 02:58:35 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Sat Dec 25 06:54:07 2010
@@ -178,6 +178,20 @@
         //transition to CLOSING without signals
         fsm.createTimeoutTransition(
                 ConnectionState.CANCELED, ConnectionState.INVALID, 5000);
+
+ //******************************************************************/ + // STATE CLOSING / + //******************************************************************/
+        //signal from server
+        fsm.createTransition(ConnectionTransition.CLOSED,
+                ConnectionState.CLOSING, ConnectionState.INVALID);
+        //failure signal from server (TODO: try to resent signal again)
+        fsm.createTransition(ConnectionTransition.FAILURE,
+                ConnectionState.CLOSING, ConnectionState.INVALID);
+        //no signals from server
+        fsm.createTimeoutTransition(
+                ConnectionState.CLOSING, ConnectionState.INVALID, 5000);
+
     }

     protected ConnectionIdentifier getConnectionID() {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Sat Dec 25 06:54:07 2010
@@ -1,15 +1,23 @@
 package org.mobicents.javax.media.mscontrol.spi;

+import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
 import jain.protocol.ip.mgcp.JainMgcpEvent;
 import jain.protocol.ip.mgcp.JainMgcpListener;
 import jain.protocol.ip.mgcp.JainMgcpProvider;
+import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.JainMgcpStack;
+import jain.protocol.ip.mgcp.message.Constants;
+import jain.protocol.ip.mgcp.message.Notify;
+import jain.protocol.ip.mgcp.message.NotifyResponse;
 import jain.protocol.ip.mgcp.message.parms.NotifiedEntity;
+import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;
+import jain.protocol.ip.mgcp.message.parms.ReturnCode;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Properties;

-import java.util.TooManyListenersException;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.media.mscontrol.MsControlException;
@@ -27,7 +35,7 @@
  * @author amit bhayani
  *
  */
-public class DriverImpl implements Driver {
+public class DriverImpl implements Driver, JainMgcpListener {

     public static final String DRIVER_NAME = "org.mobicents.Driver_1.0";

@@ -50,6 +58,9 @@

     private int txID;

+ private ConcurrentHashMap<Integer, JainMgcpListener> txListeners = new ConcurrentHashMap(); + private ConcurrentHashMap<String, JainMgcpListener> requestListeners = new ConcurrentHashMap();
+
     static {
         DriverManager.registerDriver(new DriverImpl());
logger.info("Driver " + DRIVER_NAME + " registered with DriverManager");
@@ -94,6 +105,9 @@
             try {
                 mgcpStack = new JainMgcpStackImpl(bindAddress, localPort);
                 mgcpProvider = mgcpStack.createProvider();
+
+                //assign itself as listener
+                mgcpProvider.addJainMgcpListener(this);
             } catch (Exception e) {
                 throw new MsControlException(e.getMessage());
             }
@@ -125,16 +139,61 @@
         this.mgcpProvider.sendMgcpEvents(new JainMgcpEvent[]{evt});
     }

-    public void addListener(JainMgcpListener listener) {
-        try {
-            mgcpProvider.addJainMgcpListener(listener);
-        } catch (TooManyListenersException e) {
-        }
+    /**
+     * Attaches listener to the specific request.
+     *
+     * @param reqID the request identifier.
+     * @param listener listener to be attached.
+     */
+ public void attach(RequestIdentifier reqID, JainMgcpListener listener) { + System.out.println("Attached listener for request: " + reqID.toString());
+        this.requestListeners.put(reqID.toString(), listener);
     }

-    public void removeListener(JainMgcpListener listener) {
-        mgcpProvider.removeJainMgcpListener(listener);
-    }
+    /**
+     * Deattaches listeners related to specific request.
+     *
+     * @param reqID the request identifier.
+     */
+    public void deattach(RequestIdentifier reqID) {
+        this.requestListeners.remove(reqID.toString());
+    }
+
+    /**
+     * Attaches listener to the specific transaction.
+     *
+     * Listener is automaticaly deattaching when transaction is completed.
+     *
+     * @param txID the identifier of the transaction.
+     * @param listener the listener to attach.
+     */
+    public void attach(int txID, JainMgcpListener listener) {
+        this.txListeners.put(txID, listener);
+    }
+
+    /**
+     * Deattaches transaction listener upon user request.
+     *
+     * @param listener the listener to deattach.
+     */
+    public void deattach(JainMgcpListener listener) {
+        int identifier = -1;
+
+        //search identifier of the specified listener
+        Set<Integer> IDs = txListeners.keySet();
+        for (Integer id : IDs) {
+            if (txListeners.get(id) == listener) {
+                identifier = id;
+                break;
+            }
+        }
+
+        //remove it from list if found
+        if (identifier != -1) {
+            txListeners.remove(identifier);
+        }
+    }
+

     public PropertyInfo[] getFactoryPropertyInfo() {
         return null;
@@ -147,4 +206,52 @@
     public void shutdown() {
         scheduler.shutdownNow();
     }
-}
+
+    public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
+        //we are expecting two types of commands:
+ //-delete connection notification (in case of failure connection on server side)
+        //-notify
+        switch (evt.getObjectIdentifier()) {
+            case Constants.CMD_DELETE_CONNECTION :
+                //TODO: handle delete connection request from server;
+                break;
+            case Constants.CMD_NOTIFY :
+                Notify event = (Notify) evt;
+ System.out.println("Notification for: " + event.getRequestIdentifier().toString());
+
+                //if there is attached handler deligate call to it
+ if (this.requestListeners.containsKey(event.getRequestIdentifier().toString())) { + requestListeners.remove(event.getRequestIdentifier().toString()).processMgcpCommandEvent(evt);
+                    System.out.println("Notify processed");
+                }
+
+                //send response to this transaction;
+ NotifyResponse response = new NotifyResponse(this, ReturnCode.Transaction_Executed_Normally);
+                response.setTransactionHandle(evt.getTransactionHandle());
+
+                this.send(response);
+                break;
+            default :
+        }
+    }
+
+    public void processMgcpResponseEvent(JainMgcpResponseEvent event) {
+        JainMgcpListener handler = null;
+
+ //we are considering transaction completed if any response received except provisional
+        //listener related to completed transaction must be derigistered
+ if (event.getReturnCode() != ReturnCode.Transaction_Being_Executed) {
+            handler = txListeners.remove(event.getTransactionHandle());
+        } else {
+            handler = txListeners.get(event.getTransactionHandle());
+        }
+
+        //unknown transaction?
+        if (handler == null) {
+            return;
+        }
+
+        //deliver event to tx handler
+        handler.processMgcpResponseEvent(event);
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/mscontrol/sdp/MediaDescriptor.java Mon Dec 20 23:43:36 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/mscontrol/sdp/MediaDescriptor.java Sat Dec 25 06:54:07 2010
@@ -73,7 +73,7 @@

         Format format = null;
         while (pos2 > 0) {
-            int f = Integer.parseInt(m.substring(pos1 + 1, pos2));
+            int f = Integer.parseInt(m.substring(pos1 + 1, pos2).trim());
             format = fmtParser.getFormat(f);

             if(format!=null){

Reply via email to