2 new revisions:
Revision: c94ddfc14caa
Author: Oifa Yulian <[email protected]>
Date: Wed Jul 18 08:29:44 2012
Log: Upaded ISUP...
http://code.google.com/p/jss7/source/detail?r=c94ddfc14caa
Revision: 348db504915d
Author: Oifa Yulian <[email protected]>
Date: Wed Jul 18 08:30:00 2012
Log: Merge branch 'master' of https://code.google.com/p/jss7
http://code.google.com/p/jss7/source/detail?r=348db504915d
==============================================================================
Revision: c94ddfc14caa
Author: Oifa Yulian <[email protected]>
Date: Wed Jul 18 08:29:44 2012
Log: Upaded ISUP
Resolved MTP3 Bug
http://code.google.com/p/jss7/source/detail?r=c94ddfc14caa
Modified:
/docs/sources-mobicents/pom.xml
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/CircuitManagerImpl.java
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPProviderImpl.java
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ContinuityMessageImpl.java
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ISUPMessageFactoryImpl.java
/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
=======================================
--- /docs/sources-mobicents/pom.xml Wed Jun 6 06:59:00 2012
+++ /docs/sources-mobicents/pom.xml Wed Jul 18 08:29:44 2012
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-ss7-docs</artifactId>
+ <artifactId>mobicents-mms-docs</artifactId>
<groupId>org.mobicents.protocols.ss7.docs</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>mobicents-ss7-docs-sources-mobicents</artifactId>
=======================================
---
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/CircuitManagerImpl.java
Wed Jun 13 07:20:20 2012
+++
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/CircuitManagerImpl.java
Wed Jul 18 08:29:44 2012
@@ -101,7 +101,7 @@
public long getChannelID(int cic,int dpc)
{
long currValue=dpc;
- currValue=currValue<<14 + cic;
+ currValue=(currValue<<14) + (long)cic;
return currValue;
}
}
=======================================
---
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPProviderImpl.java
Thu Jun 21 07:25:06 2012
+++
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/ISUPProviderImpl.java
Wed Jul 18 08:29:44 2012
@@ -209,7 +209,7 @@
* @return
*/
void receive(ISUPMessage message, int dpc) {
- Circuit c = getCircuit(message,dpc);
+ Circuit c = getCircuit(message,dpc);
if(c!=null)
c.receive(message);
}
=======================================
---
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ContinuityMessageImpl.java
Sun Jul 8 07:39:01 2012
+++
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ContinuityMessageImpl.java
Wed Jul 18 08:29:44 2012
@@ -28,6 +28,12 @@
*/
package org.mobicents.protocols.ss7.isup.impl.message;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.mobicents.protocols.ss7.isup.ISUPParameterFactory;
import org.mobicents.protocols.ss7.isup.ParameterException;
import org.mobicents.protocols.ss7.isup.message.ContinuityMessage;
@@ -44,19 +50,30 @@
*/
public class ContinuityMessageImpl extends ISUPMessageImpl implements
ContinuityMessage {
public static final MessageType _MESSAGE_TYPE = new
MessageTypeImpl(MESSAGE_CODE);
- private static final int _MANDATORY_VAR_COUNT = 1;
+ private static final int _MANDATORY_VAR_COUNT = 0;
static final int _INDEX_F_MessageType = 0;
static final int _INDEX_F_ContinuityIndicators = 1;
+
+ protected static final List<Integer> mandatoryParam;
+ static {
+ List<Integer> tmp = new ArrayList<Integer>();
+ tmp.add(_INDEX_F_MessageType);
+ tmp.add(_INDEX_F_ContinuityIndicators);
+
+ mandatoryParam = Collections.unmodifiableList(tmp);
+ }
/**
*
* @param source
* @throws ParameterException
*/
- public ContinuityMessageImpl(){
-
-
+ public ContinuityMessageImpl(Set<Integer> mandatoryCodes, Set<Integer>
mandatoryVariableCodes, Set<Integer> optionalCodes,
+ Map<Integer, Integer> mandatoryCode2Index, Map<Integer, Integer>
mandatoryVariableCode2Index, Map<Integer, Integer> optionalCode2Index){
+ super(mandatoryCodes, mandatoryVariableCodes, optionalCodes,
mandatoryCode2Index, mandatoryVariableCode2Index, optionalCode2Index);
+
+ super.f_Parameters.put(_INDEX_F_MessageType,
this.getMessageType());
}
/* (non-Javadoc)
@@ -105,7 +122,7 @@
* getContinuitiyIndicators()
*/
public ContinuityIndicators getContinuityIndicators() {
- return (ContinuityIndicators)
super.o_Parameters.get(this._INDEX_F_ContinuityIndicators);
+ return (ContinuityIndicators)
super.f_Parameters.get(this._INDEX_F_ContinuityIndicators);
}
/*
@@ -117,7 +134,7 @@
* .ContinuitiyIndicators)
*/
public void setContinuityIndicators(ContinuityIndicators value) {
- super.o_Parameters.put(this._INDEX_F_ContinuityIndicators,
value);
+ super.f_Parameters.put(this._INDEX_F_ContinuityIndicators,
value);
}
=======================================
---
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ISUPMessageFactoryImpl.java
Mon Apr 23 10:53:14 2012
+++
/isup/isup-impl/src/main/java/org/mobicents/protocols/ss7/isup/impl/message/ISUPMessageFactoryImpl.java
Wed Jul 18 08:29:44 2012
@@ -109,6 +109,7 @@
import
org.mobicents.protocols.ss7.isup.message.parameter.ConferenceTreatmentIndicators;
import org.mobicents.protocols.ss7.isup.message.parameter.ConnectedNumber;
import
org.mobicents.protocols.ss7.isup.message.parameter.ConnectionRequest;
+import
org.mobicents.protocols.ss7.isup.message.parameter.ContinuityIndicators;
import
org.mobicents.protocols.ss7.isup.message.parameter.DisplayInformation;
import
org.mobicents.protocols.ss7.isup.message.parameter.EchoControlInformation;
import org.mobicents.protocols.ss7.isup.message.parameter.EventInformation;
@@ -376,7 +377,9 @@
*/
public ContinuityMessage createCOT() {
- ContinuityMessage msg = new ContinuityMessageImpl();
+ ContinuityMessage msg = new
ContinuityMessageImpl(_COT_HOLDER.mandatoryCodes,
+ _COT_HOLDER.mandatoryVariableCodes, _COT_HOLDER.optionalCodes,
_COT_HOLDER.mandatoryCodeToIndex,
+ _COT_HOLDER.mandatoryVariableCodeToIndex,
_COT_HOLDER.optionalCodeToIndex);
return msg;
}
@@ -1136,6 +1139,7 @@
// CON
private static final MessageIndexingPlaceHolder _CON_HOLDER;
// FIXME: COT
+ private static final MessageIndexingPlaceHolder _COT_HOLDER;
// CCR
private static final MessageIndexingPlaceHolder _CCR_HOLDER;
// FIXME: FAC
@@ -1768,7 +1772,29 @@
optionalCodeToIndex = new HashMap<Integer, Integer>();
_CON_HOLDER = CON_HOLDER;
- // FIXME: COT
+ // COT
+ mandatoryCodes.add(ContinuityIndicators._PARAMETER_CODE);
+
+
mandatoryCodeToIndex.put(ContinuityIndicators._PARAMETER_CODE,ContinuityMessageImpl._INDEX_F_ContinuityIndicators);
+
+ MessageIndexingPlaceHolder COT_HOLDER = new
MessageIndexingPlaceHolder();
+ COT_HOLDER.commandCode = ContinuityMessage.MESSAGE_CODE;
+ COT_HOLDER.mandatoryCodes =
Collections.unmodifiableSet(mandatoryCodes);
+ COT_HOLDER.mandatoryVariableCodes =
Collections.unmodifiableSet(mandatoryVariableCodes);
+ COT_HOLDER.optionalCodes =
Collections.unmodifiableSet(optionalCodes);
+ COT_HOLDER.mandatoryCodeToIndex =
Collections.unmodifiableMap(mandatoryCodeToIndex);
+ COT_HOLDER.mandatoryVariableCodeToIndex =
Collections.unmodifiableMap(mandatoryVariableCodeToIndex);
+ COT_HOLDER.optionalCodeToIndex =
Collections.unmodifiableMap(optionalCodeToIndex);
+
+ mandatoryCodes = new HashSet<Integer>();
+ mandatoryVariableCodes = new HashSet<Integer>();
+ optionalCodes = new HashSet<Integer>();
+ mandatoryCodeToIndex = new HashMap<Integer, Integer>();
+ mandatoryVariableCodeToIndex = new HashMap<Integer, Integer>();
+ optionalCodeToIndex = new HashMap<Integer, Integer>();
+ // _commandCode2CommandIndexes.put(RLC_HOLDER.commandCode,
RLC_HOLDER);
+ _COT_HOLDER = COT_HOLDER;
+
// CCR
MessageIndexingPlaceHolder CCR_HOLDER = new
MessageIndexingPlaceHolder();
CCR_HOLDER.commandCode =
ContinuityCheckRequestMessage.MESSAGE_CODE;
=======================================
--- /mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Wed Jun 13 07:20:20 2012
+++ /mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java
Wed Jul 18 08:29:44 2012
@@ -69,8 +69,7 @@
/**
* Local byte[], in which we forge messages.
*/
- private byte[] localFrame = new byte[279];
- private byte[][] localBuffers;
+ private byte[] localFrame = new byte[279];
/** List of signaling channels wrapped with MTP2*/
private List<Mtp2> links = new ArrayList();
@@ -101,12 +100,7 @@
selector =
SelectorProvider.getSelector("org.mobicents.ss7.hardware.dahdi.Selector");
} catch (Exception e) {
e.printStackTrace();
- }
- this.localBuffers = new byte[300][];
- for(int i=0;i<300;i++)
- {
- this.localBuffers[i] = new byte[i];
- }
+ }
}
public void setScheduler(Scheduler scheduler)
@@ -362,7 +356,7 @@
// | --------------------- SIF
------------------------ |
//FSN BSN LEN SIO DPC/OPC,SLS HEADING
LEN
//b1 b0 0e 01 01 80 00 00 21
70 01 02 03 04 05 06 0f CRC CRC
- byte[] messageBuffer = fetchBuffer(rxFrame.len-5); //-5 =
FSN(1) + BSN(1) + LEN(1) +2xCRC(1)
+ byte[] messageBuffer = new byte[rxFrame.len-5]; //-5 =
FSN(1) + BSN(1) + LEN(1) +2xCRC(1)
System.arraycopy(rxFrame.frame, 3, messageBuffer, 0,
rxFrame.len-5);
//messageBuffer[0] = (byte) sio;
try {
@@ -378,7 +372,7 @@
}
if (mtp3Listener != null) {
- byte[] messageBuffer = fetchBuffer(rxFrame.len-5);
+ byte[] messageBuffer = new byte[rxFrame.len-5];
System.arraycopy(rxFrame.frame, 3, messageBuffer, 0,
rxFrame.len-5);
//messageBuffer[0] = (byte) sio;
try {
@@ -543,9 +537,7 @@
* @param i
* @return
*/
- private byte[] fetchBuffer(int size) {
- return this.localBuffers[size];
- }
+
protected class SLTMTest extends Task {
private Mtp2 link;
==============================================================================
Revision: 348db504915d
Author: Oifa Yulian <[email protected]>
Date: Wed Jul 18 08:30:00 2012
Log: Merge branch 'master' of https://code.google.com/p/jss7
http://code.google.com/p/jss7/source/detail?r=348db504915d