Revision: 15563
Author: baranowb
Date: Tue Nov 30 00:47:52 2010
Log: Fixes Issue 2157
Fixes NI
http://code.google.com/p/mobicents/source/detail?r=15563
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 04:52:34 2010
+++
/trunk/protocols/ss7/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPMtpProviderImpl.java
Tue Nov 30 00:47:52 2010
@@ -144,13 +144,12 @@
int opc = mtpProvider.getOriginalPointCode();
int dpc = mtpProvider.getAdjacentPointCode();
int si = Mtp3._SI_SERVICE_ISUP;//ISUP
- int ni = 2;//assume national
+ int ni = this.mtpProvider.getNetworkIndicator();
int sls = 0;//mtp3 will select correct
int ssi = ni << 2;
ByteArrayOutputStream bout = new ByteArrayOutputStream();
//encoding routing label
- 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)));
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Mon Nov 29 04:52:34 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Tue Nov 30 00:47:52 2010
@@ -60,11 +60,11 @@
//FIXME: MOVE THIS TO LINKSET?
protected volatile boolean started = false;
/** defautl value of SSI */
- public static final int DEFAULT_SSI = 2;//NATIONAL, as default.
+ public static final int DEFAULT_NI = 2;//NATIONAL, as default.
private int dpc;
private int opc;
- private int ssi=DEFAULT_SSI;;
+ private int ni=DEFAULT_NI << 2; // << cause its faster for checks.
/** List of signaling channels wrapped with MTP2*/
@@ -131,12 +131,17 @@
return opc;
}
- 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.
+
+ /**
+ * Sets network indicator to be used as part of SIO( actually SSI). It
Accepts 2 bit integer.
+ * @param ni
+ */
+ public void setNetworkIndicator(int ni){
+ this.ni = (0x03 & ni) << 2;
+ }
+
+ public int getNetworkIndicator() {
+ return this.ni >> 2;
}
/** (non-Javadoc)
@@ -227,7 +232,7 @@
public void onMessage(int sio, byte[] sif, Mtp2 mtp2) {
int subserviceIndicator = (sio >> 4) & 0x0F;
int serviceIndicator = sio & 0x0F;
-
+ int ni = (subserviceIndicator & 0x0C) ; //local NI(network
Indicator) form msg., 0x0C, since we store it as shifted value.
// int dpc = (sif[0] & 0xff | ((sif[1] & 0x3f) << 8));
// int opc = ((sif[1] & 0xC0) >> 6) | ((sif[2] & 0xff) << 2) |
((sif[3]
// & 0x0f) << 10);
@@ -237,7 +242,7 @@
int sls = sls(sif, 1);
//check SSI, Q.704 Figure 25, seems like if its bad, we
discard.
- if(this.ssi!=subserviceIndicator)
+ if(this.ni!=ni)
{
if (logger.isTraceEnabled()) {
logger.trace(
@@ -286,7 +291,7 @@
//change order of opc/dpc in SLTA !
- writeRoutingLabel(slta, 0, this.ssi, sls, opc,
dpc);
+ writeRoutingLabel(slta, 0, this.ni << 2, sls, opc,
dpc);
slta[0] = (byte) sio;
slta[5] = 0x021;
// +1 cause we copy LEN byte also.
@@ -482,7 +487,7 @@
int subservice = DEFAULT_SUB_SERVICE_TRA;
//}
byte[] buffer = new byte[6];
- writeRoutingLabel(buffer, 0, this.ssi, 0, dpc, opc);
+ writeRoutingLabel(buffer, 0, this.ni, 0, dpc, opc);
// buffer[0] = (byte) (_SERVICE_TRA | ( subservice << 4));
//buffer[0] = (byte) 0x00;
// H0 and H1, see Q.704 section 15.11.2+
@@ -560,7 +565,7 @@
public void ping(long timeout) {
//prepearing test message
- writeRoutingLabel(sltm, 0x01, ssi, link.getSls(), dpc, opc);
+ writeRoutingLabel(sltm, 0x01, ni, link.getSls(), dpc, opc);
//sltm[0] = (byte) 0x01;
sltm[5] = 0x11;
sltm[6] = (byte) (SLTM_PATTERN.length << 4);
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
Mon Nov 29 04:52:34 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
Tue Nov 30 00:47:52 2010
@@ -48,7 +48,7 @@
//originated and adjacent point codes
private int opc;
private int dpc;
-
+ private int ni;
//Message listener
private MtpListener listener;
@@ -141,7 +141,17 @@
return opc;
}
- /**
+ @Override
+ public void setNetworkIndicator(int ni) {
+ this.ni = ni;
+ }
+
+ @Override
+ public int getNetworkIndicator() {
+ return this.ni;
+ }
+
+ /**
* (Non Java-doc.)
*
* @see
org.mobicents.protocols.ss7.mtp.provider.MtpProvider#setMtpListener(org.mobicents.protocols.ss7.mtp.provider.MtpListener)
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/pipe/PipeMtpProviderImpl.java
Mon Nov 29 04:52:34 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/pipe/PipeMtpProviderImpl.java
Tue Nov 30 00:47:52 2010
@@ -12,39 +12,28 @@
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
@@ -53,46 +42,52 @@
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 {
@@ -100,29 +95,30 @@
}
-
-
- /* (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();
@@ -131,41 +127,53 @@
}
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.");
- }
-}
+ 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 void setNetworkIndicator(int ni) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getNetworkIndicator() {
+ 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 04:52:34 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
Tue Nov 30 00:47:52 2010
@@ -44,6 +44,13 @@
* @return the opc
*/
public int getOriginalPointCode();
+ /**
+ * Sets network indicator to be used as part of SIO( actually SSI). It
Accepts 2 bit integer.
+ * @param ni
+ */
+ public void setNetworkIndicator(int ni);
+
+ public int getNetworkIndicator();
/**
* Sets listener for MTP callbacks. If null is passed internal refence
is
=======================================
---
/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
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
Tue Nov 30 00:47:52 2010
@@ -58,6 +58,7 @@
public static final String PROPERTY_APC = "mtp.apc";
public static final String PROPERTY_OPC = "mtp.opc";
+ public static final String PROPERTY_NI = "mtp.ni";
protected SocketAddress localAddress = new
InetSocketAddress("127.0.0.1", 8998);;
protected SocketAddress remoteAddress = new
InetSocketAddress("127.0.0.1", 1345);
@@ -81,7 +82,7 @@
private int opc;
private int apc;
-
+ private int ni;
/**
*
*/
@@ -139,6 +140,16 @@
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.");
+ }
+ this.ni = Integer.parseInt(s);
+
+
+
} catch (Exception e) {
throw new ConfigurationException(e);
}
@@ -214,6 +225,13 @@
return opc;
}
+ public void setNetworkIndicator(int ni) {
+ this.ni = ni;
+ }
+
+ public int getNetworkIndicator() {
+ return this.ni;
+ }
public void setMtpListener(MtpListener listener) {
this.listener = listener;
}
=======================================
---
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Mon Nov 29 04:52:34 2010
+++
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Tue Nov 30 00:47:52 2010
@@ -26,6 +26,7 @@
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;
@@ -182,8 +183,8 @@
//prepare routing label
int opc = mtpInfo.getOpc();
int dpc = mtpInfo.getDpc();
- int si = 3;//SCCP
- int ni = 3;//assume national
+ int si = 3;//SCCP //Why not static? Mtp3._SI_SERVICE_SCCP
+ int ni = linkset.getNetworkIndicator();
int sls = mtpInfo.getSls();
int ssi = ni << 2;