Revision: 15541
Author: baranowb
Date: Mon Nov 29 04:52:34 2010
Log: Update Issue 2157
Code tested on lab, seems to work.
http://code.google.com/p/mobicents/source/detail?r=15541
Modified:
/trunk/protocols/ss7/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPMtpProviderImpl.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/pipe/PipeMtpProviderImpl.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
=======================================
---
/trunk/protocols/ss7/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPMtpProviderImpl.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPMtpProviderImpl.java
Mon Nov 29 04:52:34 2010
@@ -144,12 +144,14 @@
int opc = mtpProvider.getOriginalPointCode();
int dpc = mtpProvider.getAdjacentPointCode();
int si = Mtp3._SI_SERVICE_ISUP;//ISUP
+ int ni = 2;//assume national
int sls = 0;//mtp3 will select correct
- int ssi = mtpProvider.getSSI();
+ int ssi = ni << 2;
ByteArrayOutputStream bout = new ByteArrayOutputStream();
//encoding routing label
- bout.write((byte) (ssi | (si & 0x0F)));
+ bout.write((byte) ssi);
+ bout.write((byte) (((ssi & 0x0F) << 4) | (si & 0x0F)));
bout.write((byte) dpc);
bout.write((byte) (((dpc >> 8) & 0x3F) | ((opc & 0x03) << 6)));
bout.write((byte) (opc >> 2));
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Mon Nov 29 04:52:34 2010
@@ -60,15 +60,13 @@
//FIXME: MOVE THIS TO LINKSET?
protected volatile boolean started = false;
/** defautl value of SSI */
- public static final int DEFAULT_NI = 2;//NATIONAL, as default.
+ public static final int DEFAULT_SSI = 2;//NATIONAL, as default.
private int dpc;
private int opc;
- private int ni=DEFAULT_NI<<6;
- private int priority = 0;
- //helper, to avoid contant |
- private int ssi = ni|priority;
-
+ private int ssi=DEFAULT_SSI;;
+
+
/** List of signaling channels wrapped with MTP2*/
private List<Mtp2> links = new ArrayList();
@@ -132,34 +130,13 @@
public int getOpc() {
return opc;
}
-
- //>> and <<, since we wont get those values from this class, however
it will improve perf, since we
- //wont have to perform those ops for each call.
- public int getNI() {
- return ni >> 6;
- }
-
- public void setNI(int ni) {
- //prepare to be set. value can be used directly.
- this.ni = (0x03 & ni) << 6;
- //update SSI
- this.ssi &= 0x30; //erase ni, leave priority
- this.ssi|=this.ni;
+
+ public int getSsi() {
+ return ssi;
}
- public int getPriority() {
- return priority >> 4;
- }
-
- public void setPriority(int priority) {
- this.priority = (0x03 & priority) << 4;
- //update SSI
- this.ssi &= 0xC0; //erase priority, leave NI
- this.ssi|=this.priority;
- }
-
- public int getSSI() {
- return ssi;
+ public void setSsi(int ssi) {
+ this.ssi = 0x0F & ssi; //0x0F, since its 4 bits, first two are used,
rest is free area.
}
/** (non-Javadoc)
@@ -248,11 +225,9 @@
* service information field;
*/
public void onMessage(int sio, byte[] sif, Mtp2 mtp2) {
- int subserviceIndicator = sio & 0xF;
+ int subserviceIndicator = (sio >> 4) & 0x0F;
int serviceIndicator = sio & 0x0F;
-
- int ni = sio & 0xC0;
- //int priority = sio & 0x30;
+
// int dpc = (sif[0] & 0xff | ((sif[1] & 0x3f) << 8));
// int opc = ((sif[1] & 0xC0) >> 6) | ((sif[2] & 0xff) << 2) |
((sif[3]
// & 0x0f) << 10);
@@ -262,7 +237,7 @@
int sls = sls(sif, 1);
//check SSI, Q.704 Figure 25, seems like if its bad, we
discard.
- if(this.ni!=ni)
+ if(this.ssi!=subserviceIndicator)
{
if (logger.isTraceEnabled()) {
logger.trace(
@@ -311,7 +286,7 @@
//change order of opc/dpc in SLTA !
- writeRoutingLabel(slta, 0, this.ni, sls, opc, dpc);
+ writeRoutingLabel(slta, 0, this.ssi, sls, opc,
dpc);
slta[0] = (byte) sio;
slta[5] = 0x021;
// +1 cause we copy LEN byte also.
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
Mon Nov 29 04:52:34 2010
@@ -23,7 +23,6 @@
import org.apache.log4j.Logger;
import org.mobicents.protocols.ConfigurationException;
import org.mobicents.protocols.StartFailedException;
-import org.mobicents.protocols.ss7.mtp.Mtp3;
import org.mobicents.protocols.ss7.mtp.Utils;
import org.mobicents.protocols.ss7.mtp.provider.MtpListener;
import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
@@ -38,7 +37,7 @@
private String linksetName;
//communicator with hardware
- private InterProcessCommunicator ipc;
+ private InterProcessCommunicator ipc;
//Dialogic modules
private int src = 61;
@@ -49,10 +48,7 @@
//originated and adjacent point codes
private int opc;
private int dpc;
- private int ni=Mtp3.DEFAULT_NI;
- private int priority;
- //helper, to avoid contant |
- private int ssi;
+
//Message listener
private MtpListener listener;
@@ -145,33 +141,6 @@
return opc;
}
- public int getNI() {
- return ni ;
- }
-
- public void setNI(int ni) {
- //prepare to be set. value can be used directly.
- this.ni = (0x03 & ni) ;
- //update SSI
- this.ssi &= 0x30; //erase ni, leave priority
- this.ssi|=this.ni<< 6;
- }
-
- public int getPriority() {
- return priority;
- }
-
- public void setPriority(int priority) {
- this.priority = (0x03 & priority);
- //update SSI
- this.ssi &= 0xC0; //erase priority, leave NI
- this.ssi|=this.priority << 4;
- }
-
- public int getSSI() {
- return ssi;
- }
-
/**
* (Non Java-doc.)
*
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/pipe/PipeMtpProviderImpl.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/pipe/PipeMtpProviderImpl.java
Mon Nov 29 04:52:34 2010
@@ -12,28 +12,39 @@
import org.mobicents.protocols.ss7.mtp.provider.MtpListener;
import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
+
+
+
/**
* Pipe Mtp provider
- *
* @author baranowb
- *
+ *
*/
public class PipeMtpProviderImpl implements MtpProvider {
+
private PipeMtpProviderImpl other;
private MtpListener listener;
-
+
+
+
+
+
public PipeMtpProviderImpl() {
super();
this.other = new PipeMtpProviderImpl(this);
- _EXECUTOR = Executors.newSingleThreadScheduledExecutor();
+ _EXECUTOR= Executors.newSingleThreadScheduledExecutor();
}
+
+
private PipeMtpProviderImpl(PipeMtpProviderImpl other) {
super();
this.other = other;
- _EXECUTOR = Executors.newSingleThreadScheduledExecutor();
- }
+ _EXECUTOR= Executors.newSingleThreadScheduledExecutor();
+ }
+
+
/**
* @return the other
@@ -42,52 +53,46 @@
return other;
}
- public void indicateLinkUp() {
- if (this.listener != null)
+ public void indicateLinkUp()
+ {
+ if(this.listener!=null)
this.listener.linkUp();
}
- public void indicateLinkDown() {
- if (this.listener != null)
+ public void indicateLinkDown()
+ {
+ if(this.listener!=null)
this.listener.linkDown();
}
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.mobicents.protocols.ss7.stream.MTPProvider#addMtpListener(org.mobicents
- * .protocols.ss7.stream.MTPListener)
+
+ /* (non-Javadoc)
+ * @see
org.mobicents.protocols.ss7.stream.MTPProvider#addMtpListener(org.mobicents.protocols.ss7.stream.MTPListener)
*/
public void setMtpListener(MtpListener lst) {
listener = lst;
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.mobicents.protocols.ss7.mtp.provider.MtpProvider#configure(java.util
- * .Properties)
+ /* (non-Javadoc)
+ * @see
org.mobicents.protocols.ss7.mtp.provider.MtpProvider#configure(java.util.Properties)
*/
public void configure(Properties p) throws ConfigurationException {
// TODO Auto-generated method stub
-
+
}
- /*
- * (non-Javadoc)
- *
+
+
+ /* (non-Javadoc)
* @see org.mobicents.protocols.ss7.mtp.provider.MtpProvider#isLinkUp()
*/
public boolean isLinkUp() {
return true;
}
- /*
- * (non-Javadoc)
- *
+
+
+ /* (non-Javadoc)
* @see org.mobicents.protocols.ss7.stream.MTPProvider#send(byte[])
*/
public void send(byte[] msg) throws IOException {
@@ -95,30 +100,29 @@
}
- /*
- * (non-Javadoc)
- *
+
+
+ /* (non-Javadoc)
* @see org.mobicents.protocols.ss7.stream.MTPProvider#stop()
*/
public void stop() throws IllegalStateException {
- if (_EXECUTOR != null) {
+ if(_EXECUTOR!=null)
+ {
_EXECUTOR.shutdown();
_EXECUTOR = null;
}
}
-
- private ScheduledExecutorService _EXECUTOR;
-
+ private ScheduledExecutorService _EXECUTOR ;
private void receive(byte[] msg) {
-
- _EXECUTOR.schedule(new DataPasser(msg), 50,
TimeUnit.MILLISECONDS);
- }
-
- private class DataPasser implements Runnable {
+
+ _EXECUTOR.schedule(new DataPasser(msg),
50,TimeUnit.MILLISECONDS);
+ }
+ private class DataPasser implements Runnable
+ {
private byte[] data;
-
+
private DataPasser(byte[] data) {
super();
@@ -127,66 +131,41 @@
}
public void run() {
- try {
+ try{
listener.receive(data);
- } catch (Exception e) {
+ }catch(Exception e )
+ {
e.printStackTrace();
}
}
-
- }
-
+
+ }
public void start() throws StartFailedException, IllegalStateException {
// TODO Auto-generated method stub
-
+
}
- public void setOriginalPointCode(int opc) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public void setAdjacentPointCode(int dpc) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public int getAdjacentPointCode() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public int getOriginalPointCode() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public String getName() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public String getLinksetName() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public int getNI() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void setNI(int ni) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public int getPriority() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void setPriority(int priority) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public int getSSI() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-}
+ public void setOriginalPointCode(int opc) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void setAdjacentPointCode(int dpc) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public int getAdjacentPointCode() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public int getOriginalPointCode() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String getName() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String getLinksetName() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+}
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
Mon Nov 29 04:52:34 2010
@@ -44,23 +44,14 @@
* @return the opc
*/
public int getOriginalPointCode();
-
- public int getNI();
-
- public void setNI(int ni) ;
-
- public int getPriority() ;
-
- public void setPriority(int priority) ;
-
- public int getSSI();
+
/**
* Sets listener for MTP callbacks. If null is passed internal refence
is
* cleared.
*
* @param lst
*/
- public void setMtpListener(MtpListener lst);
+ public void setMtpListener(MtpListener lst);
/**
* Passes argument to MTP layers for processing. Passed buffer should
not be
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
Mon Nov 29 04:52:34 2010
@@ -40,7 +40,6 @@
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.Mtp3;
import org.mobicents.protocols.ss7.mtp.provider.MtpListener;
import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
@@ -58,9 +57,7 @@
public static final String PROPERTY_RADDRESS = "mtp.address.remote";
public static final String PROPERTY_APC = "mtp.apc";
- public static final String PROPERTY_OPC = "mtp.opc";
- public static final String PROPERTY_NI = "mtp.ni";
- public static final String PROPERTY_PRIORITY = "mtp.priority";
+ public static final String PROPERTY_OPC = "mtp.opc";
protected SocketAddress localAddress = new
InetSocketAddress("127.0.0.1", 8998);;
protected SocketAddress remoteAddress = new
InetSocketAddress("127.0.0.1", 1345);
@@ -84,9 +81,7 @@
private int opc;
private int apc;
- private int ni = Mtp3.DEFAULT_NI;
- private int priority;
- private int ssi;
+
/**
*
*/
@@ -144,20 +139,6 @@
throw new ConfigurationException("OPC must be specified
with: "+PROPERTY_OPC+" property.");
}
this.opc = Integer.parseInt(s);
-
- s = p.getProperty(PROPERTY_NI);
- if(s == null)
- {
- throw new ConfigurationException("NI must be specified
with: "+PROPERTY_NI+" property.");
- }
- setNI(Integer.parseInt(s));
-
- s = p.getProperty(PROPERTY_PRIORITY);
- if(s == null)
- {
- throw new ConfigurationException("PRIORITY must be specified
with: "+PROPERTY_PRIORITY+" property.");
- }
- this.setPriority(Integer.parseInt(s));
} catch (Exception e) {
throw new ConfigurationException(e);
}
@@ -237,33 +218,6 @@
this.listener = listener;
}
- public int getNI() {
- return ni ;
- }
-
- public void setNI(int ni) {
- //prepare to be set. value can be used directly.
- this.ni = (0x03 & ni) ;
- //update SSI
- this.ssi &= 0x30; //erase ni, leave priority
- this.ssi|=this.ni<< 6;
- }
-
- public int getPriority() {
- return priority;
- }
-
- public void setPriority(int priority) {
- this.priority = (0x03 & priority);
- //update SSI
- this.ssi &= 0xC0; //erase priority, leave NI
- this.ssi|=this.priority << 4;
- }
-
- public int getSSI() {
- return ssi;
- }
-
public void stop() {
started = false;
try {
=======================================
---
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Mon Nov 29 03:45:32 2010
+++
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Mon Nov 29 04:52:34 2010
@@ -26,7 +26,6 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import org.apache.log4j.Logger;
-import org.mobicents.protocols.ss7.mtp.Mtp3;
import org.mobicents.protocols.ss7.mtp.provider.MtpListener;
import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
import org.mobicents.protocols.ss7.sccp.Router;
@@ -183,15 +182,14 @@
//prepare routing label
int opc = mtpInfo.getOpc();
int dpc = mtpInfo.getDpc();
- //int si = 3;//SCCP
- int si = Mtp3._SI_SERVICE_SCCP; //static are defined for a
reason...
- //int ni = 3;//assume national
+ int si = 3;//SCCP
+ int ni = 3;//assume national
int sls = mtpInfo.getSls();
- int ssi = linkset.getSSI();
-
+ int ssi = ni << 2;
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
//encoding routing label
- bout.write((byte) (ssi | (si & 0x0F)));
+ bout.write((byte) (((ssi & 0x0F) << 4) | (si & 0x0F)));
bout.write((byte) dpc);
bout.write((byte) (((dpc >> 8) & 0x3F) | ((opc & 0x03) << 6)));
bout.write((byte) (opc >> 2));