Revision: 16119
Author: [email protected]
Date: Wed Dec 29 22:15:48 2010
Log: Implemented Dialogic Linkset
http://code.google.com/p/mobicents/source/detail?r=16119
Modified:
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinksetFactory.java
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinksetFactory.java
=======================================
---
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java
Wed Dec 29 10:39:39 2010
+++
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java
Wed Dec 29 22:15:48 2010
@@ -12,12 +12,14 @@
import org.mobicents.ss7.linkset.oam.LinkState;
/**
+ * Instance of this class represents SS7 link for <tt>dahdi</tt> based SS7
+ * Cards
*
* @author amit bhayani
*
*/
public class DahdiLink extends Link {
-
+
private static final Logger logger = Logger.getLogger(DahdiLink.class);
private int span = -1;
@@ -100,7 +102,7 @@
if (this.state == LinkState.AVAILABLE) {
throw new Exception(LinkOAMMessages.LINK_ALREADY_ACTIVE);
}
-
+
// Add check that all parameters are set before initializing the
// Link. Else send error message
if (this.span == -1 || this.code == -1 || this.channelID == -1) {
@@ -110,7 +112,7 @@
this.mode = LinkMode.CONFIGURED;
this.configure();
-
+
this.state = LinkState.UNAVAILABLE;
}
@@ -118,14 +120,13 @@
* Management Operations
*/
public void deactivate() throws Exception {
- if(this.mode == LinkMode.UNCONFIGURED){
+ if (this.mode == LinkMode.UNCONFIGURED) {
throw new Exception(LinkOAMMessages.LINK_ALREADY_DEACTIVE);
}
-
+
this.mtp2.stop();
-
-
- //TODO : SHouldn't this come from Mtp2Listener?
+
+ // TODO : SHouldn't this come from Mtp2Listener?
this.state = LinkState.SHUTDOWN;
}
@@ -173,6 +174,6 @@
@Override
public void print(StringBuffer sb, int leftPad, int descPad) {
-
+
}
}
=======================================
---
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java
Tue Dec 28 22:56:42 2010
+++
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java
Wed Dec 29 22:15:48 2010
@@ -24,6 +24,19 @@
import org.mobicents.ss7.linkset.oam.LinksetStream;
/**
+ * <p>
+ * Linkset for <tt>dahdi</tt> based hardware. <tt>dahdi</tt> boards usually
+ * have no MTP support and depends on external software to provide
MTP2/MTP3
+ * support.
+ * </p>
+ * <p>
+ * DahdiLinkset encapsulates the {...@link Mtp3 Mtp3} and {...@link Mtp2 Mtp2}
+ * protocols.
+ * </p>
+ * <p>
+ * Well known <tt>dahdi</tt> based SS7 cards are <tt>Diguim</tt> and
+ * <tt>Sangoma</tt>
+ * </p>
*
* @author amit bhayani
*
@@ -33,7 +46,7 @@
private static final Logger logger =
Logger.getLogger(DahdiLinkset.class);
private Mtp3 mtp3 = null;
- private ConcurrentLinkedQueue<byte[]> queue = new
ConcurrentLinkedQueue();
+ private ConcurrentLinkedQueue<byte[]> queue = new
ConcurrentLinkedQueue<byte[]>();
public DahdiLinkset() {
super();
@@ -246,9 +259,9 @@
return false;
}
}
-
+
@Override
- public String getName(){
+ public String getName() {
return linksetName;
}
=======================================
---
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinksetFactory.java
Tue Dec 28 00:59:26 2010
+++
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinksetFactory.java
Wed Dec 29 22:15:48 2010
@@ -5,6 +5,9 @@
import org.mobicents.ss7.linkset.oam.LinksetFactory;
/**
+ * <p>
+ * Factory for creating <tt>dahdi</tt> based {...@link Linkset}
+ * </p>
*
* @author amit bhayani
*
@@ -24,7 +27,7 @@
@Override
public Linkset createLinkset(String[] options) throws Exception {
- // the expected command is "linkset create dahdi opc 1 dpc 2 ni 3
+ // the expected command is "linkset create dahdi opc 1 apc 2 ni 3
// linkset1". We know length is 10
if (options.length != 10) {
throw new Exception(LinkOAMMessages.INVALID_COMMAND);
=======================================
---
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java
Tue Dec 28 07:05:48 2010
+++
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java
Wed Dec 29 22:15:48 2010
@@ -1,28 +1,82 @@
package org.mobicents.ss7.hardware.dialogic.oam;
+import java.io.IOException;
+
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
+
+import org.apache.log4j.Logger;
+import org.mobicents.protocols.stream.api.SelectorKey;
+import org.mobicents.protocols.stream.api.SelectorProvider;
+import org.mobicents.protocols.stream.api.StreamSelector;
+import org.mobicents.ss7.hardware.dialogic.InterProcessCommunicator;
import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
import org.mobicents.ss7.linkset.oam.Linkset;
+import org.mobicents.ss7.linkset.oam.LinksetMode;
+import org.mobicents.ss7.linkset.oam.LinksetSelector;
import org.mobicents.ss7.linkset.oam.LinksetState;
+import org.mobicents.ss7.linkset.oam.LinksetStream;
/**
+ * <p>
+ * Linkset for <tt>dialogic</tt> based hardware. <tt>dialogic</tt> boards
+ * have MTP2 and MTP3 support on board.
+ * </p>
*
* @author amit bhayani
*
*/
public class DialogicLinkset extends Linkset {
+ private static final Logger logger = Logger
+ .getLogger(DialogicLinkset.class);
+
+ private static final String SRC_MODULE = "srcMod";
+ private static final String DEST_MODULE = "destMod";
+
+ private InterProcessCommunicator ipc;
+
+ private int sourceModule;
+ private int destModule;
+
public DialogicLinkset() {
super();
}
+
+ public DialogicLinkset(String linksetName, int opc, int dpc, int ni,
+ int srcMod, int dstMod) {
+ super(linksetName, opc, dpc, ni);
+ this.sourceModule = srcMod;
+ this.destModule = dstMod;
+ }
+
+ public int getSourceModule() {
+ return sourceModule;
+ }
+
+ public void setSourceModule(int sourceModule) {
+ this.sourceModule = sourceModule;
+ }
+
+ public int getDestModule() {
+ return destModule;
+ }
+
+ public void setDestModule(int destModule) {
+ this.destModule = destModule;
+ }
@Override
protected void initialize() {
- // TODO Auto-generated method stub
-
+ this.linksetStream = new LinksetStreamImpl();
}
@Override
protected void configure() throws Exception {
+ if (this.mode == LinksetMode.CONFIGURED) {
+ ipc = new InterProcessCommunicator(this.sourceModule,
+ this.destModule);
+ }
}
@@ -32,7 +86,8 @@
throw new Exception(LinkOAMMessages.LINKSET_ALREADY_ACTIVE);
}
- // TODO Start Dialogic Linkset
+ this.mode = LinksetMode.CONFIGURED;
+ this.configure();
}
@Override
@@ -59,4 +114,84 @@
public void deleteLink(String arg0) throws Exception {
throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
}
-}
+
+ protected static final XMLFormat<DialogicLinkset> DAHDI_LINK_XML = new
XMLFormat<DialogicLinkset>(
+ DialogicLinkset.class) {
+
+ @Override
+ public void read(javolution.xml.XMLFormat.InputElement xml,
+ DialogicLinkset linkset) throws XMLStreamException {
+
+ LINKSET_XML.read(xml, linkset);
+
+ linkset.sourceModule = xml.getAttribute(SRC_MODULE, -1);
+ linkset.destModule = xml.getAttribute(DEST_MODULE, -1);
+
+ try {
+ linkset.configure();
+ } catch (Exception e) {
+ logger.error("Failed to initialize dialogic card", e);
+ }
+ }
+
+ @Override
+ public void write(DialogicLinkset linkset,
+ javolution.xml.XMLFormat.OutputElement xml)
+ throws XMLStreamException {
+
+ LINKSET_XML.write(linkset, xml);
+
+ xml.setAttribute(SRC_MODULE, linkset.sourceModule);
+ xml.setAttribute(DEST_MODULE, linkset.destModule);
+ }
+ };
+
+ private class LinksetStreamImpl extends LinksetStream {
+ byte[] rxData = null;
+
+ @Override
+ public boolean poll(int arg0, int arg1) {
+ try {
+ if (ipc != null) {
+ rxData = ipc.receive();
+ return true;
+ }
+ } catch (IOException ex) {
+ logger
+ .error(
+ "IO error while receiving data from
InterProcessCommunicator",
+ ex);
+ }
+ return false;
+ }
+
+ @Override
+ public String getName() {
+ return linksetName;
+ }
+
+ public void close() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public SelectorProvider provider() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public int read(byte[] paramArrayOfByte) throws IOException {
+ paramArrayOfByte = rxData;
+ return paramArrayOfByte == null ? 0 : paramArrayOfByte.length;
+ }
+
+ public SelectorKey register(StreamSelector selector) throws
IOException {
+ return ((LinksetSelector) selector).register(this);
+ }
+
+ public int write(byte[] paramArrayOfByte) throws IOException {
+ ipc.send(paramArrayOfByte);
+ return paramArrayOfByte.length;
+ }
+ }
+
+}
=======================================
---
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinksetFactory.java
Mon Dec 27 09:29:37 2010
+++
/trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinksetFactory.java
Wed Dec 29 22:15:48 2010
@@ -5,6 +5,9 @@
import org.mobicents.ss7.linkset.oam.LinksetFactory;
/**
+ * <p>
+ * Factory for creating <tt>dialogic</tt> based {...@link Linkset}
+ * </p>
*
* @author amit bhayani
*
@@ -24,7 +27,52 @@
@Override
public Linkset createLinkset(String[] options) throws Exception {
- throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
+ // the expected command is "linkset create dialogic opc 1 apc 2 ni
3
+ // srcmod 61 dstmod 34 linkset1". We know length is 14
+ if (options.length != 14) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ String option = options[3];
+
+ // If first option is not OPC
+ if (option.compareTo("opc") != 0) {
+ return null;
+ }
+
+ int opc = Integer.parseInt(options[4]);
+
+ if (options[5].compareTo("apc") != 0) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ int dpc = Integer.parseInt(options[6]);
+
+ if (options[7].compareTo("ni") != 0) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ int ni = Integer.parseInt(options[8]);
+
+ if (options[9].compareTo("srcmod") != 0) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ int srcmod = Integer.parseInt(options[10]);
+
+ if (options[11].compareTo("dstmod") != 0) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ int dstmod = Integer.parseInt(options[12]);
+
+ String name = options[13];
+
+ if (name == null) {
+ throw new Exception(LinkOAMMessages.INVALID_COMMAND);
+ }
+
+ return new DialogicLinkset(name, opc, dpc, ni, srcmod, dstmod);
}
}