Revision: 15890
Author: [email protected]
Date: Mon Dec 20 07:34:04 2010
Log: Fix for Shell Server Impl
http://code.google.com/p/mobicents/source/detail?r=15890
Added:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java
Modified:
/trunk/servers/media/core/pom.xml
/trunk/servers/media/core/server-impl/pom.xml
/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/MtpManagement.java
Mon Dec 20 07:34:04 2010
@@ -0,0 +1,394 @@
+package org.mobicents.media.server.impl.resource.ss7;
+
+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 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.LinksetSelector;
+import org.mobicents.protocols.stream.api.SelectorKey;
+
+/**
+ *
+ * @author amit bhayani
+ *
+ */
+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 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 void setShellServerAddress(String shellServerAddress) {
+ this.shellServerAddress = shellServerAddress;
+ }
+
+ public int getShellServerPort() {
+ return shellServerPort;
+ }
+
+ 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;
+ }
+
+ /**
+ * Life Cycle methods
+ */
+ public void create() {
+
+ }
+
+ public void start() throws Exception {
+
+ try {
+ linkSetManager.load();
+ } catch (Exception e) {
+ // ignore?
+ }
+ System.out.println(linkSetManager.getLinksetFactories().size());
+
+ 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();
+
+ // Link Managemenet
+ linkSetSelector = new LinksetSelector();
+
+ // 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() {
+ task.cancel();
+ }
+
+ 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 % 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
+ */
+ public void cancel() {
+ this.isActive = false;
+ }
+
+ public boolean isActive() {
+ return this.isActive;
+ }
+
+ 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();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ // Management
+
+ 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/pom.xml Fri Dec 17 03:20:02 2010
+++ /trunk/servers/media/core/pom.xml Mon Dec 20 07:34:04 2010
@@ -40,6 +40,7 @@
<version.stream>1.0.0-SNAPSHOT</version.stream>
<version.m3ua>1.0.0-SNAPSHOT</version.m3ua>
<version.hardware>1.0.0-SNAPSHOT</version.hardware>
+ <version.ss7.management>1.0.0-SNAPSHOT</version.ss7.management>
</properties>
<modules>
=======================================
--- /trunk/servers/media/core/server-impl/pom.xml Fri Dec 17 03:20:02 2010
+++ /trunk/servers/media/core/server-impl/pom.xml Mon Dec 20 07:34:04 2010
@@ -128,7 +128,12 @@
<artifactId>mobicents-dahdi</artifactId>
<groupId>org.mobicents.protocols.ss7.hardware</groupId>
<version>${version.hardware}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <artifactId>shell</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-standalone/src/main/config/ss7/ss7-beans.xml
Fri Dec 17 03:20:02 2010
+++
/trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml
Mon Dec 20 07:34:04 2010
@@ -3,46 +3,40 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="SChannel1"
- class="org.mobicents.protocols.ss7.hardware.dahdi.Channel">
- <property name="span">1</property>
- <property name="channelID">16</property>
- <property name="code">0</property>
- <property name="IOBufferSize">32</property>
+ <bean name="DahdiLinksetFactory"
+ class="org.mobicents.protocols.ss7.mtp.oam.DahdiLinksetFactory">
</bean>
- <bean name="SChannel2"
- class="org.mobicents.protocols.ss7.hardware.dahdi.Channel">
- <property name="span">1</property>
- <property name="channelID">17</property>
- <property name="code">1</property>
- <property name="IOBufferSize">32</property>
+
+ <bean name="DialogicLinksetFactory"
+
class="org.mobicents.protocols.ss7.mtp.oam.DialogicLinksetFactory">
</bean>
- <!-- bean name="M3UserAgent"
class="org.mobicents.protocols.ss7.stream.tcp.M3UserAgent">
- <property name="port">1345</property>
- <property name="address">127.0.0.1</property>
- </bean -->
-
-
- <bean name="MTP"
- class="org.mobicents.media.server.impl.resource.zap.MTPUser">
- <property name="name">TEST_1</property>
- <property name="opc">14133</property>
- <property name="dpc">14150</property>
- <!--
- (0000) 0 International network
- (0001) 1 Spare (for international use only)
- (0010) 2 National network
- (0011) 3 Reserved for national use
- -->
- <property name="networkIndicator">2</property>
- <property name="localAddress">127.0.0.1</property>
- <property name="localPort">3434</property>
- <property name="channels">
+ <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="SChannel1" />
- <!-- inject bean="SChannel2"/ -->
+ <inject bean="DahdiLinksetFactory" />
</list>
</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>
+
+ </bean>
+
</deployment>