Revision: 16098
Author: [email protected]
Date: Wed Dec 29 04:14:21 2010
Log: implemented latest changes of Linkset / Link
http://code.google.com/p/mobicents/source/detail?r=16098

Added:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/LinksetListenerImpl.java /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/M3UALayer4.java /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/ShellExecutor.java
Modified:
 /trunk/servers/media/core/.classpath
 /trunk/servers/media/core/server-impl/pom.xml
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java /trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml

=======================================
--- /dev/null
+++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/LinksetListenerImpl.java Wed Dec 29 04:14:21 2010
@@ -0,0 +1,80 @@
+package org.mobicents.media.server.impl.resource.ss7;
+
+import org.apache.log4j.Logger;
+import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
+import org.mobicents.ss7.management.console.LinksetListener;
+
+public class LinksetListenerImpl implements LinksetListener {
+
+       private static final Logger logger = Logger
+                       .getLogger(LinksetListenerImpl.class);
+
+       private LinksetManager linksetManager = null;
+
+       protected LinksetListenerImpl(LinksetManager linksetManager) {
+               this.linksetManager = linksetManager;
+       }
+
+       public String execute(String[] options) {
+
+               try {
+                       // Atleast 1 option is passed?
+                       if (options == null || options.length < 2) {
+                               return LinkOAMMessages.INVALID_COMMAND;
+                       }
+
+                       String firstOption = options[1];
+
+                       if (firstOption == null) {
+                               return LinkOAMMessages.INVALID_COMMAND;
+                       }
+
+                       if (firstOption.compareTo("create") == 0) {
+                               // Create Linkset
+                               return 
this.linksetManager.createLinkset(options);
+                       } else if (firstOption.compareTo("delete") == 0) {
+                               // Delete Linkset
+                               return 
this.linksetManager.deleteLinkset(options);
+
+                       } else if (firstOption.compareTo("activate") == 0) {
+                               // noshutdown Linkset
+                               return 
this.linksetManager.activateLinkset(options);
+
+                       } else if (firstOption.compareTo("deactivate") == 0) {
+                               // shutdown Linkset
+                               return 
this.linksetManager.deactivateLinkset(options);
+
+                       } else if (firstOption.compareTo("link") == 0) {
+                               // Operation for Link
+
+                               // Check do we have more options
+                               if (options.length < 3) {
+                                       return LinkOAMMessages.INVALID_COMMAND;
+                               }
+
+                               // Check if its create, delete, shutdown or 
noshutdown
+                               firstOption = options[2];
+                               if (firstOption == null) {
+                                       return LinkOAMMessages.INVALID_COMMAND;
+                               }
+
+                               if (firstOption.compareTo("create") == 0) {
+                                       return 
this.linksetManager.createLink(options);
+                               } else if (firstOption.compareTo("delete") == 
0) {
+                                       return 
this.linksetManager.deleteLink(options);
+                               } else if (firstOption.compareTo("deactivate") 
== 0) {
+                                       return 
this.linksetManager.deactivateLink(options);
+                               } else if (firstOption.compareTo("activate") == 
0) {
+                                       return 
this.linksetManager.activateLink(options);
+                               }
+                       }
+               } catch (Exception e) {
+                       logger.error("Error while executing command ", e);
+                       return e.toString();
+               } catch (Throwable t) {
+                       return t.toString();
+               }
+               return LinkOAMMessages.INVALID_COMMAND;
+       }
+}
=======================================
--- /dev/null
+++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/M3UALayer4.java Wed Dec 29 04:14:21 2010
@@ -0,0 +1,209 @@
+package org.mobicents.media.server.impl.resource.ss7;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.util.Collection;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.log4j.Logger;
+import org.mobicents.protocols.ss7.m3ua.M3UAChannel;
+import org.mobicents.protocols.ss7.m3ua.M3UAProvider;
+import org.mobicents.protocols.ss7.m3ua.M3UASelectionKey;
+import org.mobicents.protocols.ss7.m3ua.M3UASelector;
+import org.mobicents.protocols.ss7.m3ua.M3UAServerChannel;
+import org.mobicents.protocols.ss7.m3ua.impl.tcp.TcpProvider;
+import org.mobicents.protocols.ss7.m3ua.message.M3UAMessage;
+import org.mobicents.protocols.ss7.m3ua.message.MessageClass;
+import org.mobicents.protocols.ss7.m3ua.message.MessageType;
+import org.mobicents.protocols.ss7.m3ua.message.TransferMessage;
+import org.mobicents.protocols.ss7.m3ua.message.parm.ProtocolData;
+import org.mobicents.protocols.stream.api.SelectorKey;
+import org.mobicents.ss7.linkset.oam.Layer4;
+import org.mobicents.ss7.linkset.oam.Linkset;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
+import org.mobicents.ss7.linkset.oam.LinksetSelector;
+import org.mobicents.ss7.linkset.oam.LinksetStream;
+
+public class M3UALayer4 implements Layer4 {
+
+       private static Logger logger = Logger.getLogger(M3UALayer4.class);
+
+       byte[] rxBuffer;
+       byte[] txBuffer;
+
+ private ConcurrentLinkedQueue<byte[]> mtpqueue = new ConcurrentLinkedQueue<byte[]>(); + private ConcurrentLinkedQueue<byte[]> m3uaqueue = new ConcurrentLinkedQueue<byte[]>();
+
+       private int OP_READ_WRITE = 3;
+
+       private String address = null;
+       private int port = 2727;
+
+       private M3UAProvider m3uaProvider;
+       private M3UAServerChannel serverChannel;
+       private M3UAChannel channel;
+       private M3UASelector selector;
+
+       private LinksetSelector linkSetSelector = new LinksetSelector();
+       private LinksetStream linksetStream = null;
+
+       private LinksetManager linksetManager = null;
+
+       private boolean started = false;
+
+       public void add(Linkset linkset) {
+               try {
+                       linksetStream = linkset.getLinksetStream();
+                       linksetStream.register(this.linkSetSelector);
+               } catch (IOException ex) {
+                       logger.error(String.format(
+                                       "Registration for %s LinksetStream 
failed", linkset
+                                                       .getName()), ex);
+               }
+       }
+
+       public void remove(Linkset linkset) {
+
+       }
+
+       public String getAddress() {
+               return address;
+       }
+
+       public void setAddress(String address) {
+               this.address = address;
+       }
+
+       public int getPort() {
+               return port;
+       }
+
+       public void setPort(int port) {
+               this.port = port;
+       }
+
+       public LinksetManager getLinksetManager() {
+               return linksetManager;
+       }
+
+       public void setLinksetManager(LinksetManager linksetManager) {
+               this.linksetManager = linksetManager;
+       }
+
+       public void start() throws Exception {
+               // M3UA
+               m3uaProvider = TcpProvider.open();
+               selector = m3uaProvider.openSelector();
+
+               serverChannel = m3uaProvider.openServerChannel();
+               serverChannel.bind(new InetSocketAddress(address, port));
+
+               logger.info(String.format("M3UA Bound to %s:%d", address, 
port));
+               serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+
+               this.linksetManager.setLayer4(this);
+
+               this.started = true;
+
+       }
+
+       public void stop() throws Exception {
+               this.started = false;
+       }
+
+       protected void perform() throws IOException {
+
+               if (!started) {
+                       return;
+               }
+               Collection<SelectorKey> selected = linkSetSelector.selectNow(
+                               OP_READ_WRITE, 1);
+
+               for (SelectorKey key : selected) {
+                       ((LinksetStream) key.getStream()).read(rxBuffer);
+
+                       // Read data
+                       if (rxBuffer != null) {
+                               mtpqueue.offer(rxBuffer);
+                       }
+
+                       // write to stream
+                       if (!m3uaqueue.isEmpty()) {
+                               txBuffer = m3uaqueue.poll();
+                               if (txBuffer != null) {
+                                       linksetStream.write(txBuffer);
+                               }
+                       }
+               }
+
+               // M3UA
+               Collection<M3UASelectionKey> selection = selector.selectNow();
+               for (M3UASelectionKey key : selection) {
+                       if (key.isAcceptable()) {
+                               accept((M3UAServerChannel) key.channel());
+                       }
+
+                       if (key.isReadable()) {
+                               if (logger.isTraceEnabled()) {
+                                       logger
+                                                       .trace("Transmitting data 
from M3UA channel to hardware");
+                               }
+                               read((M3UAChannel) key.channel());
+                       }
+
+                       if (key.isWritable()) {
+                               if (logger.isTraceEnabled()) {
+                                       logger
+                                                       .trace("Transmitting data 
from hardware to M3UA channel");
+                               }
+                               write((M3UAChannel) key.channel());
+                       }
+               }
+
+       }
+
+       private void accept(M3UAServerChannel serverChannel) throws IOException 
{
+               this.channel = serverChannel.accept();
+               this.channel.register(selector, SelectionKey.OP_READ
+                               | SelectionKey.OP_WRITE);
+               this.logger.info("Connected with " + channel);
+       }
+
+       private void read(M3UAChannel channel) throws IOException {
+               M3UAMessage message = channel.receive();
+               switch (message.getMessageClass()) {
+               case MessageClass.TRANSFER_MESSAGES:
+                       switch (message.getMessageType()) {
+                       case MessageType.PAYLOAD:
+                               TransferMessage msg = (TransferMessage) message;
+                               m3uaqueue.add(msg.getData().getMsu());
+                       }
+                       break;
+               default:
+                       logger.info("Unknown message class: " + 
message.getMessageClass());
+               }
+       }
+
+       private void write(M3UAChannel channel) throws IOException {
+               if (mtpqueue.isEmpty()) {
+                       return;
+               }
+
+               logger.info("Sending MSU to the remote peer");
+               byte[] msu = mtpqueue.poll();
+
+               if (msu != null) {
+                       TransferMessage msg = (TransferMessage) m3uaProvider
+                                       .getMessageFactory()
+                                       
.createMessage(MessageClass.TRANSFER_MESSAGES,
+                                                       MessageType.PAYLOAD);
+                       ProtocolData data = m3uaProvider.getParameterFactory()
+                                       .createProtocolData(0, msu);
+                       msg.setData(data);
+                       channel.send(msg);
+                       logger.info("Message sent");
+               }
+       }
+
+}
=======================================
--- /dev/null
+++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/ShellExecutor.java Wed Dec 29 04:14:21 2010
@@ -0,0 +1,196 @@
+package org.mobicents.media.server.impl.resource.ss7;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+
+import javolution.util.FastList;
+
+import org.apache.log4j.Logger;
+import org.mobicents.ss7.linkset.oam.LinksetManager;
+import org.mobicents.ss7.management.console.Subject;
+import org.mobicents.ss7.management.transceiver.ChannelProvider;
+import org.mobicents.ss7.management.transceiver.ChannelSelectionKey;
+import org.mobicents.ss7.management.transceiver.ChannelSelector;
+import org.mobicents.ss7.management.transceiver.Message;
+import org.mobicents.ss7.management.transceiver.MessageFactory;
+import org.mobicents.ss7.management.transceiver.ShellChannel;
+import org.mobicents.ss7.management.transceiver.ShellServerChannel;
+
+public class ShellExecutor {
+
+       Logger logger = Logger.getLogger(ShellExecutor.class);
+
+       private ChannelProvider provider;
+       private ShellServerChannel serverChannel;
+       private ShellChannel channel;
+       private ChannelSelector selector;
+       private ChannelSelectionKey skey;
+
+       private MessageFactory messageFactory = null;
+
+       private String rxMessage = "";
+       private String txMessage = "";
+
+       private LinksetManager linksetManager = null;
+
+       private LinksetListenerImpl linksetListenerImpl = null;
+
+       private volatile boolean started = false;
+
+       private String address;
+
+       private int port;
+
+       public ShellExecutor() throws IOException {
+
+       }
+
+       public String getAddress() {
+               return address;
+       }
+
+       public void setAddress(String address) {
+               this.address = address;
+       }
+
+       public int getPort() {
+               return port;
+       }
+
+       public void setPort(int port) {
+               this.port = port;
+       }
+
+       public LinksetManager getLinksetManager() {
+               return linksetManager;
+       }
+
+       public void setLinksetManager(LinksetManager linksetManager) {
+               this.linksetManager = linksetManager;
+       }
+
+       public void start() throws IOException {
+               linksetListenerImpl = new 
LinksetListenerImpl(this.linksetManager);
+
+               provider = ChannelProvider.open();
+               serverChannel = provider.openServerChannel();
+               InetSocketAddress inetSocketAddress = new 
InetSocketAddress(address,
+                               port);
+               serverChannel.bind(inetSocketAddress);
+
+               selector = provider.openSelector();
+               skey = serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+
+               messageFactory = new MessageFactory();
+
+               this.logger.info(String.format("ShellExecutor listening at %s",
+                               inetSocketAddress));
+
+               this.started = true;
+       }
+
+       public void stop() {
+               this.started = false;
+
+               try {
+                       skey.cancel();
+                       if (channel != null) {
+                               channel.close();
+                       }
+                       serverChannel.close();
+                       selector.close();
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+       }
+
+       public void perform() {
+
+               if (started) {
+                       try {
+                               FastList<ChannelSelectionKey> keys = 
selector.selectNow();
+
+                               for (FastList.Node<ChannelSelectionKey> n = 
keys.head(), end = keys
+                                               .tail(); (n = n.getNext()) != 
end;) {
+
+                                       ChannelSelectionKey key = n.getValue();
+
+                                       if (key.isAcceptable()) {
+                                               accept();
+                                       } else if (key.isReadable()) {
+                                               ShellChannel chan = 
(ShellChannel) key.channel();
+                                               Message msg = (Message) 
chan.receive();
+
+                                               if (msg != null) {
+                                                       System.out.println("Receive 
" + msg);
+                                                       rxMessage = 
msg.toString();
+
+                                                       if 
(rxMessage.compareTo("disconnect") == 0) {
+                                                               this.txMessage = 
"Bye";
+                                                               
chan.send(messageFactory
+                                                                               
.createMessage(txMessage));
+
+                                                       } else {
+                                                               String[] options = 
rxMessage.split(" ");
+                                                               Subject subject 
= Subject
+                                                                               
.getSubject(options[0]);
+                                                               if (subject == 
null) {
+                                                                       
chan.send(messageFactory
+                                                                                       
.createMessage("Invalid Subject"));
+                                                               } else {
+                                                                       // 
Nullify examined options
+                                                                       
options[0] = null;
+
+                                                                       switch 
(subject) {
+                                                                       case 
LINKSET:
+                                                                               
this.txMessage = this.linksetListenerImpl
+                                                                               
                .execute(options);
+                                                                               
chan.send(messageFactory
+                                                                               
                .createMessage(this.txMessage));
+                                                                               
break;
+                                                                       }
+                                                               }
+                                                       } // if 
(rxMessage.compareTo("disconnect")
+                                               } // if (msg != null)
+
+                                               // TODO Handle message
+
+                                               rxMessage = "";
+
+                                       } else if (key.isWritable() && 
txMessage.length() > 0) {
+
+                                               if 
(this.txMessage.compareTo("Bye") == 0) {
+                                                       this.closeChannel();
+                                               }
+                                               this.txMessage = "";
+                                       }
+                               }
+                       } catch (IOException e) {
+                               logger.error("Error while operating on 
ChannelSelectionKey", e);
+                       }
+
+               }
+
+       }
+
+       private void accept() throws IOException {
+               channel = serverChannel.accept();
+               skey.cancel();
+               skey = channel.register(selector, SelectionKey.OP_READ
+                               | SelectionKey.OP_WRITE);
+               System.out.println("Client connected");
+       }
+
+       private void closeChannel() throws IOException {
+               if (channel != null) {
+                       try {
+                               this.channel.close();
+                       } catch (IOException e) {
+                               logger.error("Error closing channel", e);
+                       }
+               }
+               skey.cancel();
+               skey = serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+       }
+}
=======================================
--- /trunk/servers/media/core/.classpath        Fri Dec 17 03:20:02 2010
+++ /trunk/servers/media/core/.classpath        Wed Dec 29 04:14:21 2010
@@ -7,6 +7,10 @@
   <classpathentry kind="src" path="server-standalone/src/main/resources"/>
   <classpathentry kind="src" path="server-standalone/src/main/java"/>
   <classpathentry kind="src" path="server-spi/src/main/java"/>
+  <classpathentry kind="src" path="docs/sources-jbcp/src/main/resources"/>
+ <classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/> + <classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/>
+  <classpathentry kind="src" path="docs/sources-jbcp/src/main/resources"/>
   <classpathentry kind="src" path="controllers/mgcp/src/test/java"/>
   <classpathentry kind="src" path="controllers/mgcp/src/main/java"/>
   <classpathentry kind="src" path="controllers/rtsp/src/test/java"/>
@@ -53,9 +57,10 @@
<classpathentry kind="var" path="M2_REPO/org/mobicents/external/tritonus/tritonus_share/0.3.6/tritonus_share-0.3.6.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/mgcp/mgcp-impl/2.0.0.GA/mgcp-impl-2.0.0.GA.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/hardware/mobicents-dahdi/1.0.0-SNAPSHOT/mobicents-dahdi-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/hardware/mobicents-dialogic/1.0.0-SNAPSHOT/mobicents-dialogic-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-api/1.0.0-SNAPSHOT/m3ua-api-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-impl/1.0.0-SNAPSHOT/m3ua-impl-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/linkset/1.0.0-SNAPSHOT/linkset-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/shell/1.0.0-SNAPSHOT/shell-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/mtp/mtp/1.0.0-SNAPSHOT/mtp-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/stream/stream/1.0.0-SNAPSHOT/stream-1.0.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
=======================================
--- /trunk/servers/media/core/server-impl/pom.xml       Mon Dec 20 07:34:04 2010
+++ /trunk/servers/media/core/server-impl/pom.xml       Wed Dec 29 04:14:21 2010
@@ -134,6 +134,12 @@
                        
<groupId>org.mobicents.protocols.ss7.management</groupId>
                        <version>${version.ss7.management}</version>
                </dependency>
+
+               <dependency>
+                       <artifactId>linkset</artifactId>
+                       
<groupId>org.mobicents.protocols.ss7.management</groupId>
+                       <version>${version.ss7.management}</version>
+               </dependency>
        </dependencies>
        <build>
                <finalName>${pom.artifactId}-${pom.version}</finalName>
=======================================
--- /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java Mon Dec 20 08:55:47 2010 +++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java Wed Dec 29 04:14:21 2010
@@ -1,38 +1,11 @@
 package org.mobicents.media.server.impl.resource.ss7;

-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.util.Collection;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import javolution.text.TextBuilder;
-import javolution.util.FastMap;

 import org.apache.log4j.Logger;
 import org.mobicents.media.Server;
 import org.mobicents.media.server.impl.clock.LocalTask;
 import org.mobicents.media.server.spi.clock.Task;
-import org.mobicents.protocols.ss7.m3ua.M3UAChannel;
-import org.mobicents.protocols.ss7.m3ua.M3UAProvider;
-import org.mobicents.protocols.ss7.m3ua.M3UASelectionKey;
-import org.mobicents.protocols.ss7.m3ua.M3UASelector;
-import org.mobicents.protocols.ss7.m3ua.M3UAServerChannel;
-import org.mobicents.protocols.ss7.m3ua.impl.tcp.TcpProvider;
-import org.mobicents.protocols.ss7.m3ua.message.M3UAMessage;
-import org.mobicents.protocols.ss7.m3ua.message.MessageClass;
-import org.mobicents.protocols.ss7.m3ua.message.MessageType;
-import org.mobicents.protocols.ss7.m3ua.message.TransferMessage;
-import org.mobicents.protocols.ss7.m3ua.message.parm.ProtocolData;
-import org.mobicents.protocols.ss7.management.shell.ShellCmdListener;
-import org.mobicents.protocols.ss7.management.shell.ShellCommand;
-import org.mobicents.protocols.ss7.mtp.oam.Linkset;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetMode;
-import org.mobicents.protocols.ss7.mtp.oam.LinksetSelector;
-import org.mobicents.protocols.stream.api.SelectorKey;

 /**
  *
@@ -42,78 +15,31 @@
 public class MtpManagement implements Task {

private static final Logger logger = Logger.getLogger(MtpManagement.class);
-       private ConcurrentLinkedQueue<byte[]> queue = new 
ConcurrentLinkedQueue();
-
-       private String shellServerAddress = null;
-       private int shellServerPort = 3435;
-
-       private String m3uaServerAddress = null;
-       private int m3uaServerPort = 2727;
-
-       private LinksetManager linkSetManager = null;
-
- org.mobicents.protocols.ss7.management.shell.server.ShellServer cliServer = null;
-
-       private ShellCmdListenerImpl shellCmdListenerImpl = null;
-
-       private LinksetSelector linkSetSelector = null;
+
+       private ShellExecutor shellExecutor = null;
+       private M3UALayer4 m3UALayer4 = null;

        private LocalTask task = null;
        private boolean isActive = false;

-       private int OP_READ_WRITE = 3;
-
-       private M3UAProvider m3uaProvider;
-       private M3UAServerChannel serverChannel;
-       private M3UAChannel channel;
-       private M3UASelector selector;
-
-       // TODO Probably M3UA Linkset should be used here?
-       Linkset linkset = null;
-       byte[] messageBuffer;
-
        public MtpManagement() {

        }

-       public String getShellServerAddress() {
-               return shellServerAddress;
+       public ShellExecutor getShellExecutor() {
+               return shellExecutor;
        }

-       public void setShellServerAddress(String shellServerAddress) {
-               this.shellServerAddress = shellServerAddress;
+       public void setShellExecutor(ShellExecutor shellExecutor) {
+               this.shellExecutor = shellExecutor;
        }

-       public int getShellServerPort() {
-               return shellServerPort;
+       public M3UALayer4 getM3UALayer4() {
+               return m3UALayer4;
        }

-       public void setShellServerPort(int shellServerPort) {
-               this.shellServerPort = shellServerPort;
-       }
-
-       public LinksetManager getLinkSetManager() {
-               return linkSetManager;
-       }
-
-       public void setLinkSetManager(LinksetManager linkSetManager) {
-               this.linkSetManager = linkSetManager;
-       }
-
-       public String getM3uaServerAddress() {
-               return m3uaServerAddress;
-       }
-
-       public void setM3uaServerAddress(String serverAddress) {
-               m3uaServerAddress = serverAddress;
-       }
-
-       public int getM3uaServerPort() {
-               return m3uaServerPort;
-       }
-
-       public void setM3uaServerPort(int serverPort) {
-               m3uaServerPort = serverPort;
+       public void setM3UALayer4(M3UALayer4 layer4) {
+               m3UALayer4 = layer4;
        }

        /**
@@ -124,68 +50,7 @@
        }

        public void start() throws Exception {
-
-               // Link Managemenet
-               linkSetSelector = new LinksetSelector();
-
-               try {
-                       linkSetManager.load();
-                       FastMap<TextBuilder, Linkset> linksets = linkSetManager
-                                       .getLinksets();
-
-                       // If there are configured Linkset, lets add them to 
LinksetSelector
- for (FastMap.Entry<TextBuilder, Linkset> e = linksets.head(), end = linksets
-                                       .tail(); (e = e.getNext()) != end;) {
-                               Linkset linkset = e.getValue();
-                               if (linkset.getMode() == 
LinksetMode.CONFIGURED) {
-                                       logger.info(String.format(
-                                                       "Linkset %s is configured 
and will be started", e
-                                                                       
.getKey().toString()));
-                                       try {
-                                               SelectorKey key = 
linkset.register(linkSetSelector);
-                                       } catch (IOException ex) {
-                                               logger.error(String.format(
-                                                               "Registration for %s 
LinkSet failed", e
-                                                                               
.getKey().toString()), ex);
-                                       }
-                               }
-                       }
-
-               } catch (FileNotFoundException fnfex) {
-                       logger
-                                       .warn(String
-                                                       .format(
-                                                                       "SS7 
configuration file not found. Reconfigure SS7 Linksets : %s",
-                                                                       
fnfex.getMessage()));
-               }
-
-               Server.scheduler.start();
-
-               // Start Shell Server
-               shellCmdListenerImpl = new ShellCmdListenerImpl();
-
- cliServer = new org.mobicents.protocols.ss7.management.shell.server.ShellServer();
-               cliServer.setLocalAddress(this.shellServerAddress);
-               cliServer.setLocalPort(this.shellServerPort);
-
-               cliServer.setCliCmdListener(shellCmdListenerImpl);
-               cliServer.start();
-
-               // M3UA
-               m3uaProvider = TcpProvider.open();
-               selector = m3uaProvider.openSelector();
-
-               serverChannel = m3uaProvider.openServerChannel();
-               serverChannel.bind(new InetSocketAddress(m3uaServerAddress,
-                               m3uaServerPort));
-
-               logger.info("M3UA Bound to " + m3uaServerAddress);
-               serverChannel.register(selector, SelectionKey.OP_ACCEPT);
-
-               this.isActive = true;
-
                task = Server.scheduler.execute(this);
-
        }

        public void stop() {
@@ -195,124 +60,6 @@
        public void destroy() {

        }
-
-       private class ShellCmdListenerImpl implements ShellCmdListener {
-
-               public void addLink(TextBuilder linksetName, TextBuilder 
linkName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.addLink(linksetName, linkName, 
byteBuffer);
-               }
-
-               public void addLinkSet(TextBuilder linksetName, int linkSetTpe,
-                               ByteBuffer byteBuffer) {
-                       linkset = linkSetManager.addLinkset(linksetName, 
linkSetTpe,
-                                       byteBuffer);
-                       if (linkset != null) {
-                               // Add to selector
-                               try {
-                                       SelectorKey key = 
linkset.register(linkSetSelector);
-                               } catch (IOException e) {
-                                       logger.error(String.format(
-                                                       "Registration for %s LinkSet 
failed", linksetName
-                                                                       
.toString()), e);
-                               }
-                       }
-               }
-
-               public void adjacentPointCode(TextBuilder linksetName, int 
adjacentPC,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.adjacentPointCode(linksetName, 
adjacentPC,
-                                       byteBuffer);
-               }
-
-               public void channel(TextBuilder linksetName, TextBuilder 
linkName,
-                               int channel, ByteBuffer byteBuffer) {
-                       linkSetManager.channel(linksetName, linkName, channel, 
byteBuffer);
-               }
-
-               public void code(TextBuilder linksetName, TextBuilder linkName,
-                               int code, ByteBuffer byteBuffer) {
-                       linkSetManager.code(linksetName, linkName, code, 
byteBuffer);
-               }
-
-               public void deleteLink(TextBuilder linksetName, TextBuilder 
linkName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.deleteLink(linksetName, linkName, 
byteBuffer);
-               }
-
- public void deleteLinkSet(TextBuilder linksetName, ByteBuffer byteBuffer) {
-                       linkSetManager.deleteLinkset(linksetName, byteBuffer);
-               }
-
-               public void inhibit(TextBuilder linksetName, TextBuilder 
linkName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.inhibit(linksetName, linkName, 
byteBuffer);
-               }
-
-               public void localIpPort(TextBuilder linksetName, TextBuilder 
localIp,
-                               int localPort, ByteBuffer byteBuffer) {
-                       linkSetManager.localIpPort(linksetName, localIp, 
localPort,
-                                       byteBuffer);
-               }
-
-               public void localPointCode(TextBuilder linksetName, int localPC,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.localPointCode(linksetName, localPC, 
byteBuffer);
-               }
-
-               public void networkIndicator(TextBuilder linksetName,
-                               ShellCommand networkInd, ByteBuffer byteBuffer) 
{
-                       int netInd = 2; // National by default
-                       if (networkInd.getCmdInt() == 
ShellCommand.NETWORK_INDICATOR_INT
-                                       .getCmdInt()) {
-                               netInd = 0;
-                       } else if (networkInd.getCmdInt() == 
ShellCommand.NETWORK_INDICATOR_SPA
-                                       .getCmdInt()) {
-                               netInd = 1;
-                       } else if (networkInd.getCmdInt() == 
ShellCommand.NETWORK_INDICATOR_RES
-                                       .getCmdInt()) {
-                               netInd = 3;
-                       }
-                       linkSetManager.networkIndicator(linksetName,
-                                       networkInd.getCmdInt(), byteBuffer);
-               }
-
-               public void noshutdownLink(TextBuilder linksetName,
-                               TextBuilder linkName, ByteBuffer byteBuffer) {
-                       linkSetManager.noshutdownLink(linksetName, linkName, 
byteBuffer);
-               }
-
-               public void noshutdownLinkSet(TextBuilder linksetName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.noshutdownLinkset(linksetName, 
byteBuffer);
-               }
-
-               public void showLinkSet(boolean statistics, TextBuilder 
linksetName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.showLinkset(statistics, linksetName, 
byteBuffer);
-               }
-
-               public void shutdownLink(TextBuilder linksetName, TextBuilder 
linkName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.shutdownLink(linksetName, linkName, 
byteBuffer);
-               }
-
-               public void shutdownLinkSet(TextBuilder linksetName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.shutdownLinkset(linksetName, byteBuffer);
-               }
-
-               public void span(TextBuilder linksetName, TextBuilder linkName,
-                               int span, ByteBuffer byteBuffer) {
-                       linkSetManager.span(linksetName, linkName, span, 
byteBuffer);
-               }
-
-               public void uninhibit(TextBuilder linksetName, TextBuilder 
linkName,
-                               ByteBuffer byteBuffer) {
-                       linkSetManager.uninhibit(linksetName, linkName, 
byteBuffer);
-               }
-
-       }

        /**
         * Task methods implementation
@@ -328,95 +75,14 @@
        public int perform() {

                try {
-
-                       // Linkset
-                       Collection<SelectorKey> selected = 
linkSetSelector.selectNow(
-                                       OP_READ_WRITE, 1);
-                       for (SelectorKey key : selected) {
-                               ((Linkset) key.getStream()).read(messageBuffer);
-                               queue.offer(messageBuffer);
-                       }
-
-                       // M3UA
-                       Collection<M3UASelectionKey> selection = 
selector.selectNow();
-                       for (M3UASelectionKey key : selection) {
-                               if (key.isAcceptable()) {
-                                       accept((M3UAServerChannel) 
key.channel());
-                               }
-
-                               if (key.isReadable()) {
-                                       if (logger.isTraceEnabled()) {
-                                               logger
-                                                               .trace("Transmitting 
data from M3UA channel to hardware");
-                                       }
-                                       read((M3UAChannel) key.channel());
-                               }
-
-                               if (key.isWritable()) {
-                                       if (logger.isTraceEnabled()) {
-                                               logger
-                                                               .trace("Transmitting 
data from hardware to M3UA channel");
-                                       }
-                                       write((M3UAChannel) key.channel());
-                               }
-                       }
-
-                       this.cliServer.perform();
-
+                       this.shellExecutor.perform();
+                       this.m3UALayer4.perform();
+                       // Management
                } catch (IOException e) {
-                       e.printStackTrace();
-               }
-
-               // Management
+                       logger.error("IOException ", e);
+               }

                return 1;
        }
-
-       private void accept(M3UAServerChannel serverChannel) throws IOException 
{
-               this.channel = serverChannel.accept();
-               this.channel.register(selector, SelectionKey.OP_READ
-                               | SelectionKey.OP_WRITE);
-               this.logger.info("Connected with " + channel);
-       }
-
-       private void read(M3UAChannel channel) throws IOException {
-               M3UAMessage message = channel.receive();
-               switch (message.getMessageClass()) {
-               case MessageClass.TRANSFER_MESSAGES:
-                       switch (message.getMessageType()) {
-                       case MessageType.PAYLOAD:
-                               TransferMessage msg = (TransferMessage) message;
-                               if (linkset != null) {
-                                       linkset.write(msg.getData().getMsu());
-                               } else {
-                                       logger.warn("Linkset not yet 
configured");
-                               }
-                       }
-                       break;
-               default:
-                       logger.info("Unknown message class: " + 
message.getMessageClass());
-               }
-       }
-
-       private void write(M3UAChannel channel) throws IOException {
-               if (queue.isEmpty()) {
-                       return;
-               }
-
-               logger.info("Sending MSU to the remote peer");
-               byte[] msu = queue.poll();
-
-               if (msu != null) {
-                       TransferMessage msg = (TransferMessage) m3uaProvider
-                                       .getMessageFactory()
-                                       
.createMessage(MessageClass.TRANSFER_MESSAGES,
-                                                       MessageType.PAYLOAD);
-                       ProtocolData data = m3uaProvider.getParameterFactory()
-                                       .createProtocolData(0, msu);
-                       msg.setData(data);
-                       channel.send(msg);
-                       logger.info("Message sent");
-               }
-       }

 }
=======================================
--- /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java Fri Dec 17 03:20:02 2010 +++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java Wed Dec 29 04:14:21 2010
@@ -40,7 +40,6 @@
 import org.mobicents.media.server.spi.clock.Task;
 import org.mobicents.protocols.link.LinkState;
 import org.mobicents.protocols.link.LinkStateListener;
-import org.mobicents.protocols.ss7.hardware.Mtp1;
 import org.mobicents.protocols.ss7.m3ua.M3UAChannel;
 import org.mobicents.protocols.ss7.m3ua.M3UAProvider;
 import org.mobicents.protocols.ss7.m3ua.M3UASelectionKey;
@@ -52,6 +51,7 @@
 import org.mobicents.protocols.ss7.m3ua.message.MessageType;
 import org.mobicents.protocols.ss7.m3ua.message.TransferMessage;
 import org.mobicents.protocols.ss7.m3ua.message.parm.ProtocolData;
+import org.mobicents.protocols.ss7.mtp.Mtp1;
 import org.mobicents.protocols.ss7.mtp.Mtp2;
 import org.mobicents.protocols.ss7.mtp.Mtp3;
 import org.mobicents.protocols.ss7.mtp.Mtp3Listener;
=======================================
--- /trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml Mon Dec 20 07:34:04 2010 +++ /trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml Wed Dec 29 04:14:21 2010
@@ -3,39 +3,53 @@
        xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
        xmlns="urn:jboss:bean-deployer:2.0">

-       <bean name="DahdiLinksetFactory"
-               class="org.mobicents.protocols.ss7.mtp.oam.DahdiLinksetFactory">
+       <bean name="LinksetFactoryFactory"
+               class="org.mobicents.ss7.linkset.oam.LinksetFactoryFactory">
+               <incallback method="addFactory" />
+               <uncallback method="removeFactory" />
        </bean>

-       <bean name="DialogicLinksetFactory"
-               
class="org.mobicents.protocols.ss7.mtp.oam.DialogicLinksetFactory">
+       <bean name="DahdiLinksetFactory"
+               
class="org.mobicents.ss7.hardware.dahdi.oam.DahdiLinksetFactory">
        </bean>

-       <bean name="M3UALinksetFactory"
-               class="org.mobicents.protocols.ss7.mtp.oam.M3UALinksetFactory">
-       </bean>

        <bean name="LinksetManager"
-               class="org.mobicents.protocols.ss7.mtp.oam.LinksetManager">
-
-               <property name="linksetFactories">
-                       <list>
-                               <inject bean="DahdiLinksetFactory" />
-                       </list>
+               class="org.mobicents.ss7.linkset.oam.LinksetManager">
+
+               <property name="linksetFactoryFactory">
+                       <inject bean="LinksetFactoryFactory" />
                </property>
        </bean>
+
+
+       <bean name="ShellExecutor"
+               
class="org.mobicents.media.server.impl.resource.ss7.ShellExecutor">
+               <property name="address">127.0.0.1</property>
+               <property name="port">3435</property>
+ <property name="linksetManager"><inject bean="LinksetManager" /></property>
+       </bean>
+
+       <bean name="M3UALayer4"
+               class="org.mobicents.media.server.impl.resource.ss7.M3UALayer4">
+               <property name="address">127.0.0.1</property>
+               <property name="port">3434</property>
+               <property name="linksetManager">
+                       <inject bean="LinksetManager" />
+               </property>
+       </bean>
+

        <bean name="MTP"
                
class="org.mobicents.media.server.impl.resource.ss7.MtpManagement">
-               <property name="shellServerAddress">127.0.0.1</property>
-               <property name="shellServerPort">3435</property>
-
-               <property name="m3uaServerAddress">127.0.0.1</property>
-               <property name="m3uaServerPort">3434</property>
-
-               <property name="linkSetManager">
-                       <inject bean="LinksetManager" />
+
+               <property name="shellExecutor">
+                       <inject bean="ShellExecutor" />
                </property>
+
+               <property name="m3UALayer4">
+                       <inject bean="M3UALayer4" />
+               </property>

        </bean>

Reply via email to