4 new revisions:
Revision: f9127e1ad569
Author: Normandes Junior <[email protected]>
Date: Wed Aug 8 17:32:42 2012
Log: Implementing checkIMEI MAP Message....
http://code.google.com/p/jss7/source/detail?r=f9127e1ad569
Revision: 2e71e70dfbdf
Author: Normandes Junior <[email protected]>
Date: Wed Aug 8 17:50:35 2012
Log: Merge remote-tracking branch 'upstream/master' into
checkImei-branch
http://code.google.com/p/jss7/source/detail?r=2e71e70dfbdf
Revision: 8910107564a1
Author: Sergey Vetyutnev <[email protected]>
Date: Thu Aug 9 00:44:57 2012
Log: CheckIMEI update correction
http://code.google.com/p/jss7/source/detail?r=8910107564a1
Revision: 5e51fa4c6f22
Author: Sergey Vetyutnev <[email protected]>
Date: Thu Aug 9 00:49:46 2012
Log: Merge branch 'checkIMEI'
http://code.google.com/p/jss7/source/detail?r=5e51fa4c6f22
==============================================================================
Revision: f9127e1ad569
Author: Normandes Junior <[email protected]>
Date: Wed Aug 8 17:32:42 2012
Log: Implementing checkIMEI MAP Message.
Update issue #76
For now is implemented just MAP version 2
On branch checkImei-branch
Changes to be committed:
modified:
map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/MAPDialogMobility.java
modified:
map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/CheckImeiRequest.java
modified:
map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/CheckImeiResponse.java
modified:
map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/EquipmentStatus.java
modified:
map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/RequestedEquipmentInfo.java
modified:
map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPDialogMobilityImpl.java
modified:
map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
modified:
map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
modified:
map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
modified:
map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/RequestedEquipmentInfoImpl.java
modified:
map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
new file:
map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
http://code.google.com/p/jss7/source/detail?r=f9127e1ad569
Added:
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
Modified:
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/MAPDialogMobility.java
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/CheckImeiRequest.java
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/CheckImeiResponse.java
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/EquipmentStatus.java
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/imei/RequestedEquipmentInfo.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPDialogMobilityImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/RequestedEquipmentInfoImpl.java
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
=======================================
--- /dev/null
+++
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
Wed Aug 8 17:32:42 2012
@@ -0,0 +1,71 @@
+/*
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.map.service.mobility.imei;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.mobicents.protocols.asn.AsnInputStream;
+import org.mobicents.protocols.asn.AsnOutputStream;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.EquipmentStatus;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author normandes
+ *
+ */
+public class CheckImeiResponseTest {
+
+ // Real Trace
+ private byte[] getEncodedDataV2() {
+ return new byte[] { 0x0a, 0x01, 0x00 };
+ }
+
+ @Test(groups = { "functional.decode", "imei" })
+ public void testDecode() throws Exception {
+ byte[] rawData = getEncodedDataV2();
+ AsnInputStream asnIS = new AsnInputStream(rawData);
+
+ int tag = asnIS.readTag();
+ CheckImeiResponseImpl checkImeiImpl = new
CheckImeiResponseImpl(2);
+ checkImeiImpl.decodeAll(asnIS);
+
+ assertEquals(checkImeiImpl.getEquipmentStatus(),
EquipmentStatus.whiteListed);
+ }
+
+ @Test(groups = { "functional.encode", "imei" })
+ public void testEncode() throws Exception {
+ CheckImeiResponseImpl checkImei = new CheckImeiResponseImpl(2,
EquipmentStatus.whiteListed);
+
+ AsnOutputStream asnOS = new AsnOutputStream();
+ checkImei.encodeAll(asnOS);
+
+ byte[] encodedData = asnOS.toByteArray();
+ byte[] rawData = getEncodedDataV2();
+ assertTrue(Arrays.equals(rawData, encodedData));
+ }
+
+}
=======================================
---
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/MAPDialogMobility.java
Tue Jul 17 09:55:22 2012
+++
/map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/service/mobility/MAPDialogMobility.java
Wed Aug 8 17:32:42 2012
@@ -36,7 +36,9 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.EpsAuthenticationSetList;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.ReSynchronisationInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.RequestingNodeType;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.EquipmentStatus;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
+import org.mobicents.protocols.ss7.map.api.service.mobility.imei.UESBIIu;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.ADDInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.PagingArea;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.VLRCapability;
@@ -93,6 +95,10 @@
// -- International mobile equipment identities management services
public Long addCheckImeiRequest(IMEI imei, RequestedEquipmentInfo
requestedEquipmentInfo, MAPExtensionContainer extensionContainer)
throws MAPException;
+ public Long addCheckImeiRequest(long customInvokeTimeout, IMEI imei,
RequestedEquipmentInfo requestedEquipmentInfo, MAPExtensionContainer
extensionContainer)
+ throws MAPException;
+
+ public void addCheckImeiResponse(long invokeId, EquipmentStatus
equipmentStatus, UESBIIu bmuef, MAPExtensionContainer extensionContainer)
throws MAPException;
}
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPDialogMobilityImpl.java
Tue Jul 17 09:55:22 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPDialogMobilityImpl.java
Wed Aug 8 17:32:42 2012
@@ -45,7 +45,9 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.EpsAuthenticationSetList;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.ReSynchronisationInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.RequestingNodeType;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.EquipmentStatus;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
+import org.mobicents.protocols.ss7.map.api.service.mobility.imei.UESBIIu;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.ADDInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.PagingArea;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.VLRCapability;
@@ -53,6 +55,8 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.SubscriberInfo;
import
org.mobicents.protocols.ss7.map.service.mobility.authentication.SendAuthenticationInfoRequestImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.authentication.SendAuthenticationInfoResponseImpl;
+import
org.mobicents.protocols.ss7.map.service.mobility.imei.CheckImeiRequestImpl;
+import
org.mobicents.protocols.ss7.map.service.mobility.imei.CheckImeiResponseImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.locationManagement.UpdateLocationRequestImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.locationManagement.UpdateLocationResponseImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.subscriberInformation.AnyTimeInterrogationRequestImpl;
@@ -364,19 +368,92 @@
this.sendReturnResultLastComponent(resultLast);
}
-
@Override
- public Long addCheckImeiRequest(IMEI imei, RequestedEquipmentInfo
requestedEquipmentInfo,
+ public Long addCheckImeiRequest(IMEI imei, RequestedEquipmentInfo
requestedEquipmentInfo,
MAPExtensionContainer extensionContainer) throws
MAPException {
+ return this.addCheckImeiRequest(_Timer_Default, imei,
requestedEquipmentInfo, extensionContainer);
+ }
+
+ @Override
+ public Long addCheckImeiRequest(long customInvokeTimeout, IMEI imei,
RequestedEquipmentInfo requestedEquipmentInfo,
+ MAPExtensionContainer extensionContainer) throws
MAPException {
+
if ((this.appCntx.getApplicationContextName() !=
MAPApplicationContextName.equipmentMngtContext)
|| (this.appCntx.getApplicationContextVersion() !=
MAPApplicationContextVersion.version2
&& this.appCntx.getApplicationContextVersion() !=
MAPApplicationContextVersion.version3)) {
throw new MAPException("Bad application context name for
CheckImeiRequest: must be equipmentMngtContext_V2 or V3");
}
- return null;
+ Invoke invoke =
this.mapProviderImpl.getTCAPProvider().getComponentPrimitiveFactory().createTCInvokeRequest();
+ if (customInvokeTimeout == _Timer_Default) {
+ invoke.setTimeout(_Timer_m);
+ }
+ else {
+ invoke.setTimeout(customInvokeTimeout);
+ }
+
+ // Operation Code
+ OperationCode oc = TcapFactory.createOperationCode();
+ oc.setLocalOperationCode((long) MAPOperationCode.checkIMEI);
+ invoke.setOperationCode(oc);
+
+ CheckImeiRequestImpl req = new
CheckImeiRequestImpl(this.appCntx.getApplicationContextVersion().getVersion()
+ , imei, requestedEquipmentInfo,
extensionContainer);
+
+ AsnOutputStream aos = new AsnOutputStream();
+ req.encodeData(aos);
+
+ Parameter p =
this.mapProviderImpl.getTCAPProvider().getComponentPrimitiveFactory().createParameter();
+ p.setTagClass(req.getTagClass());
+ p.setPrimitive(req.getIsPrimitive());
+ p.setTag(req.getTag());
+ p.setData(aos.toByteArray());
+ invoke.setParameter(p);
+
+ Long invokeId;
+ try {
+ invokeId = this.tcapDialog.getNewInvokeId();
+ invoke.setInvokeId(invokeId);
+ } catch (TCAPException e) {
+ throw new MAPException(e.getMessage(), e);
+ }
+
+ this.sendInvokeComponent(invoke);
+
+ return invokeId;
+
+ }
+
+ @Override
+ public void addCheckImeiResponse(long invokeId, EquipmentStatus
equipmentStatus, UESBIIu bmuef, MAPExtensionContainer extensionContainer)
throws MAPException {
+ if ((this.appCntx.getApplicationContextName() !=
MAPApplicationContextName.equipmentMngtContext)
+ || (this.appCntx.getApplicationContextVersion() !=
MAPApplicationContextVersion.version2
+ && this.appCntx.getApplicationContextVersion() !=
MAPApplicationContextVersion.version3)) {
+ throw new MAPException("Bad application context name for
CheckImeiResponse: must be equipmentMngtContext_V2 or V3");
+ }
+
+ ReturnResultLast resultLast =
this.mapProviderImpl.getTCAPProvider().getComponentPrimitiveFactory().createTCResultLastRequest();
+ resultLast.setInvokeId(invokeId);
+
+ // Operation Code
+ OperationCode oc =
this.mapProviderImpl.getTCAPProvider().getComponentPrimitiveFactory().createOperationCode();
+ oc.setLocalOperationCode((long) MAPOperationCode.checkIMEI);
+ resultLast.setOperationCode(oc);
+
+ CheckImeiResponseImpl resp = new
CheckImeiResponseImpl(equipmentStatus);
+ AsnOutputStream aos = new AsnOutputStream();
+ resp.encodeData(aos);
+
+ Parameter p =
this.mapProviderImpl.getTCAPProvider().getComponentPrimitiveFactory().createParameter();
+ p.setTagClass(resp.getTagClass());
+ p.setPrimitive(resp.getIsPrimitive());
+ p.setTag(resp.getTag());
+ p.setData(aos.toByteArray());
+ resultLast.setParameter(p);
+
+ this.sendReturnResultLastComponent(resultLast);
}
}
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
Mon Jul 23 10:48:17 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
Wed Aug 8 17:32:42 2012
@@ -46,6 +46,8 @@
import org.mobicents.protocols.ss7.map.dialog.ServingCheckDataImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.authentication.SendAuthenticationInfoRequestImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.authentication.SendAuthenticationInfoResponseImpl;
+import
org.mobicents.protocols.ss7.map.service.mobility.imei.CheckImeiRequestImpl;
+import
org.mobicents.protocols.ss7.map.service.mobility.imei.CheckImeiResponseImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.locationManagement.UpdateLocationRequestImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.locationManagement.UpdateLocationResponseImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.subscriberInformation.AnyTimeInterrogationRequestImpl;
@@ -245,6 +247,14 @@
}
break;
+ case MAPOperationCode.checkIMEI:
+ if (acn == MAPApplicationContextName.equipmentMngtContext && vers >= 2)
{
+ if (compType == ComponentType.Invoke)
+ this.processCheckImeiRequest(parameter, mapDialogMobilityImpl,
invokeId);
+ else
+ this.processCheckImeiResponse(parameter, mapDialogMobilityImpl,
invokeId);
+ }
+ break;
default:
new MAPParsingComponentException("",
MAPParsingComponentExceptionReason.UnrecognizedOperation);
}
@@ -460,7 +470,67 @@
loger.error("Error processing
ProcessUnstructuredSSRequestIndication: " + e.getMessage(), e);
}
}
+
+ }
+
+ // - International mobile equipment identities management services
+ private void processCheckImeiRequest(Parameter parameter,
MAPDialogMobilityImpl mapDialogImpl, Long invokeId)
+ throws MAPParsingComponentException {
+
+ /*if (parameter == null)
+ throw new MAPParsingComponentException("Error while decoding
CheckImeiRequest: Parameter is mandatory but not found",
+
MAPParsingComponentExceptionReason.MistypedParameter);
+ if (parameter.getTag() != Tag.SEQUENCE || parameter.getTagClass() !=
Tag.CLASS_UNIVERSAL || parameter.isPrimitive())
+ throw new MAPParsingComponentException(
+ "Error while decoding AnyTimeInterrogationRequestIndication: Bad tag
or tagClass or parameter is primitive, received tag="
+ + parameter.getTag(),
MAPParsingComponentExceptionReason.MistypedParameter);*/
+
+ byte[] buf = parameter.getData();
+ AsnInputStream ais = new AsnInputStream(buf);
+
+ long version =
mapDialogImpl.getApplicationContext().getApplicationContextVersion().getVersion();
+ CheckImeiRequestImpl ind = new CheckImeiRequestImpl(version);
+ ind.decodeData(ais, buf.length);
+ ind.setInvokeId(invokeId);
+ ind.setMAPDialog(mapDialogImpl);
+
+ for (MAPServiceListener serLis : this.serviceListeners) {
+ try {
+ ((MAPServiceMobilityListener)
serLis).onCheckImeiRequest(ind);
+ } catch (Exception e) {
+ loger.error("Error processing
ProcessUnstructuredSSRequestIndication: " + e.getMessage(), e);
+ }
+ }
+ }
+
+ private void processCheckImeiResponse(Parameter parameter,
MAPDialogMobilityImpl mapDialogImpl, Long invokeId)
+ throws MAPParsingComponentException {
+ /*if (parameter == null)
+ throw new MAPParsingComponentException("Error while decoding
AnyTimeInterrogationResponseIndication: Parameter is mandatory but not
found",
+
MAPParsingComponentExceptionReason.MistypedParameter);
+
+ if (parameter.getTag() != Tag.SEQUENCE || parameter.getTagClass() !=
Tag.CLASS_UNIVERSAL || parameter.isPrimitive())
+ throw new MAPParsingComponentException(
+ "Error while decoding AnyTimeInterrogationResponseIndication: Bad tag
or tagClass or parameter is primitive, received tag="
+ + parameter.getTag(),
MAPParsingComponentExceptionReason.MistypedParameter);*/
+
+ byte[] buf = parameter.getData();
+ AsnInputStream ais = new AsnInputStream(buf);
+
+ long version =
mapDialogImpl.getApplicationContext().getApplicationContextVersion().getVersion();
+ CheckImeiResponseImpl ind = new CheckImeiResponseImpl(version);
+ ind.decodeData(ais, buf.length);
+ ind.setInvokeId(invokeId);
+ ind.setMAPDialog(mapDialogImpl);
+
+ for (MAPServiceListener serLis : this.serviceListeners) {
+ try {
+ ((MAPServiceMobilityListener)
serLis).onCheckImeiResponse(ind);
+ } catch (Exception e) {
+ loger.error("Error processing
ProcessUnstructuredSSRequestIndication: " + e.getMessage(), e);
+ }
+ }
}
}
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
Fri Jul 13 10:16:09 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
Wed Aug 8 17:32:42 2012
@@ -24,7 +24,6 @@
import java.io.IOException;
-import org.apache.log4j.Logger;
import org.mobicents.protocols.asn.AsnException;
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
@@ -39,7 +38,6 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.CheckImeiRequest;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
import org.mobicents.protocols.ss7.map.primitives.IMEIImpl;
-import org.mobicents.protocols.ss7.map.primitives.IMSIImpl;
import org.mobicents.protocols.ss7.map.primitives.MAPAsnPrimitive;
import
org.mobicents.protocols.ss7.map.primitives.MAPExtensionContainerImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.MobilityMessageImpl;
@@ -50,8 +48,6 @@
*/
public class CheckImeiRequestImpl extends MobilityMessageImpl implements
CheckImeiRequest, MAPAsnPrimitive {
- private static final Logger logger =
Logger.getLogger(CheckImeiRequestImpl.class.getName());
-
public static final String _PrimitiveName = "CheckImeiRequest";
private IMEI imei = null;
@@ -248,8 +244,31 @@
@Override
public String toString() {
- //TODO: Implements this
- return super.toString();
+ StringBuilder sb = new StringBuilder();
+ sb.append("CheckImeiRequest [");
+
+ sb.append("imei=");
+ sb.append(imei.toString());
+ sb.append(", ");
+
+ if (this.requestedEquipmentInfo != null) {
+ sb.append("requestedEquipmentInfo=");
+ sb.append(requestedEquipmentInfo.toString());
+ sb.append(", ");
+ }
+
+ if (this.extensionContainer != null) {
+ sb.append("extensionContainer=");
+ sb.append(extensionContainer.toString());
+ sb.append(", ");
+ }
+
+ sb.append("mapProtocolVersion=");
+ sb.append(mapProtocolVersion);
+
+ sb.append("]");
+
+ return sb.toString();
}
}
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
Fri Jul 13 10:16:09 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
Wed Aug 8 17:32:42 2012
@@ -1,3 +1,25 @@
+/*
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.protocols.ss7.map.service.mobility.imei;
import java.io.IOException;
@@ -28,9 +50,18 @@
private long mapProtocolVersion;
+ public CheckImeiResponseImpl(EquipmentStatus equipmentStatus) {
+ this.equipmentStatus = equipmentStatus;
+ }
+
public CheckImeiResponseImpl(long mapProtocolVersion) {
this.mapProtocolVersion = mapProtocolVersion;
}
+
+ public CheckImeiResponseImpl(long mapProtocolVersion, EquipmentStatus
equipmentStatus) {
+ this.mapProtocolVersion = mapProtocolVersion;
+ this.equipmentStatus = equipmentStatus;
+ }
public CheckImeiResponseImpl(long mapProtocolVersion, UESBIIu bmuef,
EquipmentStatus equipmentStatus) {
this.mapProtocolVersion = mapProtocolVersion;
@@ -91,6 +122,7 @@
int tag = ais.readTag();
+ // TODO: Implement as callhandling.SendRoutingInformationResponse, do
not use "case 0:", "case 1:" because all parameters are optional
switch(num) {
case 0:
// equipmentStatus
@@ -150,27 +182,23 @@
} catch (AsnException e) {
throw new MAPException("AsnException when encoding " + _PrimitiveName
+ ": " + e.getMessage(), e);
}
-
}
@Override
public void encodeData(AsnOutputStream asnOs) throws MAPException {
- /* Fazer as validacoes e lancar essas excecoes caso ocorram
- * if (this.hlrNumber == null)
- throw new MAPException("hlrNumber parameter must not be
null");*/
-
try {
if (mapProtocolVersion >= 3) {
} else {
+ if (this.equipmentStatus == null) {
+ throw new MAPException("equipmentStatus parameter must not be null at
version 2");
+ }
+
asnOs.writeIntegerData(this.equipmentStatus.getCode());
}
} catch (IOException e) {
throw new MAPException("IOException when encoding " + _PrimitiveName
+ ": " + e.getMessage(), e);
- } /*catch (AsnException e) {
- throw new MAPException("AsnException when encoding " + _PrimitiveName
+ ": " + e.getMessage(), e);
- }*/
-
+ }
}
@Override
@@ -200,9 +228,33 @@
@Override
public String toString() {
- //TODO: Implements this
- return super.toString();
+ StringBuilder sb = new StringBuilder();
+ sb.append("CheckImeiResponse [");
+
+ if (this.equipmentStatus != null) {
+ sb.append("equipmentStatus=");
+ sb.append(this.equipmentStatus.toString());
+ sb.append(", ");
+ }
+
+ if (this.bmuef != null) {
+ sb.append("bmuef=");
+ sb.append(bmuef.toString());
+ sb.append(", ");
+ }
+
+ if (this.extensionContainer != null) {
+ sb.append("extensionContainer=");
+ sb.append(extensionContainer.toString());
+ sb.append(", ");
+ }
+
+ sb.append("mapProtocolVersion=");
+ sb.append(mapProtocolVersion);
+
+ sb.append("]");
+
+ return sb.toString();
}
}
-
=======================================
---
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
Wed Jul 18 05:21:35 2012
+++
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
Wed Aug 8 17:32:42 2012
@@ -1,3 +1,25 @@
+/*
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.protocols.ss7.map.service.mobility.imei;
import java.util.Arrays;
@@ -5,7 +27,6 @@
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
import org.mobicents.protocols.ss7.map.primitives.IMEIImpl;
-import org.mobicents.protocols.ss7.tcap.asn.TCBeginMessageImpl;
import org.testng.annotations.Test;
@@ -20,7 +41,7 @@
// Real Trace
private byte[] getEncodedDataV2() {
- return new byte[] { 0x04, 0x0A, 0x04, 0x08, 0x53, (byte) 0x97, 0x75,
0x40, 0x31, (byte) 0x93, (byte) 0x95, (byte) 0xF0 };
+ return new byte[] { 0x04, 0x08, 0x53, 0x08, 0x19, 0x10, (byte)0x86,
0x35, 0x55, (byte)0xf0 };
}
@Test(groups = { "functional.decode", "imei" })
@@ -32,12 +53,12 @@
CheckImeiRequestImpl checkImeiImpl = new
CheckImeiRequestImpl(2);
checkImeiImpl.decodeAll(asnIS);
- assertEquals(checkImeiImpl.getIMEI().getIMEI(),
"357957041339590");
+ assertEquals(checkImeiImpl.getIMEI().getIMEI(),
"358091016853550");
}
@Test(groups = { "functional.encode", "imei" })
public void testEncode() throws Exception {
- IMEIImpl imei = new IMEIImpl("357957041339590");
+ IMEIImpl imei = new IMEIImpl("358091016853550");
CheckImeiRequestImpl checkImei = new CheckImeiRequestImpl(2, imei, null,
null);
AsnOutputStream asnOS = new AsnOutputStream();
@@ -49,45 +70,4 @@
}
-
-
-//
-// byte[] buf = new byte[]{
-//// 0x60, 0x65, 0x02, 0x09,
-// 0x60, 0x75, 0x01, 0x2B, 0x76, 0x01, 0x01, 0x79, 0x02,
0x00, 0x14,
-// 0x34, 0x00, 0x14,
-// 0x04, 0x08, 0x53, (byte) 0x86, 0x73, 0x20, 0x02, (byte) 0x95, 0x32,
(byte) 0xF0,
-// (byte) 0xFF, 0x08, 0x26, 0x34, 0x04, 0x03, 0x00, 0x53, 0x31, (byte)
0xF8,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// 0,0,0,0,0,0,0,0,0,0,
-// };
-//
-// @Test(groups = { "functional.decode", "imei" })
-// public void testA() throws Exception {
-// byte[] rawData = buf;
-// AsnInputStream asnIS = new AsnInputStream(rawData);
-// int tag = asnIS.readTag();
-//
-// TCBeginMessageImpl tm = new TCBeginMessageImpl();
-// tm.decode(asnIS);
-// }
-
-
-
}
-
-
-
==============================================================================
Revision: 2e71e70dfbdf
Author: Normandes Junior <[email protected]>
Date: Wed Aug 8 17:50:35 2012
Log: Merge remote-tracking branch 'upstream/master' into
checkImei-branch
http://code.google.com/p/jss7/source/detail?r=2e71e70dfbdf
==============================================================================
Revision: 8910107564a1
Author: Sergey Vetyutnev <[email protected]>
Date: Thu Aug 9 00:44:57 2012
Log: CheckIMEI update correction
http://code.google.com/p/jss7/source/detail?r=8910107564a1
Modified:
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/RequestedEquipmentInfoImpl.java
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/MAPServiceMobilityImpl.java
Thu Aug 9 00:44:57 2012
@@ -185,7 +185,7 @@
case MAPOperationCode.sendParameters:
return
MAPApplicationContext.getInstance(MAPApplicationContextName.infoRetrievalContext,
MAPApplicationContextVersion.version1);
- // -- International mobile equipment identities management
services
+ // -- IMEI services
case MAPOperationCode.checkIMEI:
return
MAPApplicationContext.getInstance(MAPApplicationContextName.equipmentMngtContext,
MAPApplicationContextVersion.version1);
}
@@ -247,8 +247,9 @@
}
break;
+ // -- IMEI services
case MAPOperationCode.checkIMEI:
- if (acn == MAPApplicationContextName.equipmentMngtContext && vers >= 2)
{
+ if (acn ==
MAPApplicationContextName.equipmentMngtContext) {
if (compType == ComponentType.Invoke)
this.processCheckImeiRequest(parameter, mapDialogMobilityImpl,
invokeId);
else
@@ -473,7 +474,7 @@
}
- // - International mobile equipment identities management services
+ // - IMEI services
private void processCheckImeiRequest(Parameter parameter,
MAPDialogMobilityImpl mapDialogImpl, Long invokeId)
throws MAPParsingComponentException {
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestImpl.java
Thu Aug 9 00:44:57 2012
@@ -38,7 +38,6 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.CheckImeiRequest;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
import org.mobicents.protocols.ss7.map.primitives.IMEIImpl;
-import org.mobicents.protocols.ss7.map.primitives.MAPAsnPrimitive;
import
org.mobicents.protocols.ss7.map.primitives.MAPExtensionContainerImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.MobilityMessageImpl;
@@ -46,7 +45,7 @@
* @author normandes
*
*/
-public class CheckImeiRequestImpl extends MobilityMessageImpl implements
CheckImeiRequest, MAPAsnPrimitive {
+public class CheckImeiRequestImpl extends MobilityMessageImpl implements
CheckImeiRequest {
public static final String _PrimitiveName = "CheckImeiRequest";
@@ -245,11 +244,14 @@
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("CheckImeiRequest [");
+ sb.append(_PrimitiveName);
+ sb.append(" [");
- sb.append("imei=");
- sb.append(imei.toString());
- sb.append(", ");
+ if (this.imei != null) {
+ sb.append("imei=");
+ sb.append(imei.toString());
+ sb.append(", ");
+ }
if (this.requestedEquipmentInfo != null) {
sb.append("requestedEquipmentInfo=");
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseImpl.java
Thu Aug 9 00:44:57 2012
@@ -37,10 +37,17 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.CheckImeiResponse;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.EquipmentStatus;
import org.mobicents.protocols.ss7.map.api.service.mobility.imei.UESBIIu;
-import org.mobicents.protocols.ss7.map.primitives.MAPAsnPrimitive;
+import
org.mobicents.protocols.ss7.map.primitives.MAPExtensionContainerImpl;
import
org.mobicents.protocols.ss7.map.service.mobility.MobilityMessageImpl;
-public class CheckImeiResponseImpl extends MobilityMessageImpl implements
CheckImeiResponse, MAPAsnPrimitive {
+/**
+ *
+ * @author normandes
+ *
+ */
+public class CheckImeiResponseImpl extends MobilityMessageImpl implements
CheckImeiResponse {
+
+ public static final int _ID_extensionContainer = 0;
public static final String _PrimitiveName = "CheckImeiResponse";
@@ -109,6 +116,18 @@
MAPParsingComponentExceptionReason.MistypedParameter);
}
}
+
+ public void decodeData(AsnInputStream ansIS, int length) throws
MAPParsingComponentException {
+ try {
+ this._decode(ansIS, length);
+ } catch (IOException e) {
+ throw new MAPParsingComponentException("IOException when decoding " +
_PrimitiveName + ": " + e.getMessage(), e,
+
MAPParsingComponentExceptionReason.MistypedParameter);
+ } catch (AsnException e) {
+ throw new MAPParsingComponentException("AsnException when decoding " +
_PrimitiveName + ": " + e.getMessage(), e,
+
MAPParsingComponentExceptionReason.MistypedParameter);
+ }
+ }
private void _decode(AsnInputStream ansIS, int length) throws
MAPParsingComponentException, IOException, AsnException {
@@ -122,50 +141,51 @@
int tag = ais.readTag();
- // TODO: Implement as callhandling.SendRoutingInformationResponse, do
not use "case 0:", "case 1:" because all parameters are optional
- switch(num) {
- case 0:
- // equipmentStatus
- if (tag != Tag.ENUMERATED || ais.getTagClass() != Tag.CLASS_UNIVERSAL
|| !ais.isTagPrimitive()) {
- throw new
MAPParsingComponentException(
- "Error while decoding CheckImeiResponse.requestedEquipmentInfo: bad
tag or tag class or is not primitive: TagClass=" + ais.getTagClass()
- + ", tag=" + tag,
MAPParsingComponentExceptionReason.MistypedParameter);
+ if(ais.getTagClass() == Tag.CLASS_UNIVERSAL) {
+ switch (tag) {
+ case Tag.ENUMERATED:
+ // equipmentStatus
+ if (!ais.isTagPrimitive()) {
+ throw new MAPParsingComponentException("Error while decoding " +
_PrimitiveName + ".requestedEquipmentInfo: is not primitive",
+
MAPParsingComponentExceptionReason.MistypedParameter);
+ }
+ int i1 = (int)
ansIS.readInteger();
+ this.equipmentStatus =
EquipmentStatus.getInstance(i1);
+ break;
+ case Tag.SEQUENCE:
+ // bmuef
+ // TODO: Implement
+ ais.advanceElement();
+ break;
+ default:
+ ais.advanceElement();
+ break;
}
- int i1 = (int)ansIS.readInteger();
- this.equipmentStatus =
EquipmentStatus.getInstance(i1);
- break;
- case 1:
- // bmuef
- //TODO: Implement
- break;
- case 2:
- // extensionContainer
- //TODO: Implement
- break;
- default:
+ } else if (ais.getTagClass() ==
Tag.CLASS_CONTEXT_SPECIFIC) {
+ switch (tag) {
+ case _ID_extensionContainer:
+ if (ais.isTagPrimitive()) {
+ throw new MAPParsingComponentException("Error while decoding " +
_PrimitiveName + ".extensionContainer: is primitive",
+
MAPParsingComponentExceptionReason.MistypedParameter);
+ }
+ this.extensionContainer = new
MAPExtensionContainerImpl();
+
((MAPExtensionContainerImpl)this.extensionContainer).decodeAll(ais);
+ break;
+ default:
+ ais.advanceElement();
+ break;
+ }
+ } else {
ais.advanceElement();
- break;
}
num++;
}
} else {
- int i1 = ansIS.read();
+ int i1 = (int)ansIS.readIntegerData(length);
this.equipmentStatus = EquipmentStatus.getInstance(i1);
}
}
-
- public void decodeData(AsnInputStream ansIS, int length) throws
MAPParsingComponentException {
- try {
- this._decode(ansIS, length);
- } catch (IOException e) {
- throw new MAPParsingComponentException("IOException when decoding " +
_PrimitiveName + ": " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- } catch (AsnException e) {
- throw new MAPParsingComponentException("AsnException when decoding " +
_PrimitiveName + ": " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- }
- }
@Override
public void encodeAll(AsnOutputStream asnOs) throws MAPException {
@@ -229,7 +249,8 @@
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("CheckImeiResponse [");
+ sb.append(_PrimitiveName);
+ sb.append(" [");
if (this.equipmentStatus != null) {
sb.append("equipmentStatus=");
=======================================
---
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/RequestedEquipmentInfoImpl.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/service/mobility/imei/RequestedEquipmentInfoImpl.java
Thu Aug 9 00:44:57 2012
@@ -1,20 +1,51 @@
+/*
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.protocols.ss7.map.service.mobility.imei;
-import java.io.IOException;
-
-import org.mobicents.protocols.asn.AsnException;
-import org.mobicents.protocols.asn.AsnInputStream;
-import org.mobicents.protocols.asn.AsnOutputStream;
import org.mobicents.protocols.asn.BitSetStrictLength;
-import org.mobicents.protocols.asn.Tag;
-import org.mobicents.protocols.ss7.map.api.MAPException;
-import org.mobicents.protocols.ss7.map.api.MAPParsingComponentException;
-import
org.mobicents.protocols.ss7.map.api.MAPParsingComponentExceptionReason;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
+import org.mobicents.protocols.ss7.map.primitives.BitStringBase;
-public class RequestedEquipmentInfoImpl implements RequestedEquipmentInfo {
+/**
+ * @author normandes
+ *
+ */
+public class RequestedEquipmentInfoImpl extends BitStringBase implements
RequestedEquipmentInfo {
- private BitSetStrictLength bitString = new BitSetStrictLength(2);
+ public RequestedEquipmentInfoImpl() {
+ super(2, 8, 2, "RequestedEquipmentInfo");
+ }
+
+ public RequestedEquipmentInfoImpl(boolean equipmentStatus, boolean bmuef)
{
+ super(2, 8, 2, "RequestedEquipmentInfo");
+
+
+ // TODO: implement adding equipmentStatus and bmuef into
this.bitString
+ }
+
+ public BitSetStrictLength getData() {
+ return bitString;
+ }
@Override
public boolean getEquipmentStatus() {
@@ -27,77 +58,4 @@
// TODO Auto-generated method stub
return false;
}
-
- public int getTag() throws MAPException {
- return Tag.STRING_BIT;
- }
-
- public int getTagClass() {
- return Tag.CLASS_UNIVERSAL;
- }
-
- public boolean getIsPrimitive() {
- return true;
- }
-
- public void decodeAll(AsnInputStream ansIS) throws
MAPParsingComponentException {
- try {
- int length = ansIS.readLength();
- this._decode(ansIS, length);
- } catch (IOException e) {
- throw new MAPParsingComponentException("IOException when decoding
MWStatus: " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- } catch (AsnException e) {
- throw new MAPParsingComponentException("AsnException when decoding
MWStatus: " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- }
- }
-
- public void decodeData(AsnInputStream ansIS, int length) throws
MAPParsingComponentException {
- try {
- this._decode(ansIS, length);
- } catch (IOException e) {
- throw new MAPParsingComponentException("IOException when decoding
MWStatus: " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- } catch (AsnException e) {
- throw new MAPParsingComponentException("AsnException when decoding
MWStatus: " + e.getMessage(), e,
-
MAPParsingComponentExceptionReason.MistypedParameter);
- }
- }
-
- private void _decode(AsnInputStream ansIS, int length) throws
MAPParsingComponentException, IOException, AsnException {
- //TODO: I should understand what this mean
- if (length == 0 || length > 4)
- throw new MAPParsingComponentException("Error decoding
RequestedEquipmentInfoImpl: the RequestedEquipmentInfoImpl field must
contain from 1 or 4 octets. Contains: " + length,
-
MAPParsingComponentExceptionReason.MistypedParameter);
-
- this.bitString = ansIS.readBitStringData(length);
- }
-
- public void encodeAll(AsnOutputStream asnOs) throws MAPException {
- this.encodeAll(asnOs, Tag.CLASS_UNIVERSAL, Tag.STRING_BIT);
- }
-
- public void encodeAll(AsnOutputStream asnOs, int tagClass, int tag)
throws MAPException {
- try {
- asnOs.writeTag(tagClass, true, tag);
- int pos = asnOs.StartContentDefiniteLength();
- this.encodeData(asnOs);
- asnOs.FinalizeContent(pos);
- } catch (AsnException e) { //TODO: What is the MWStatus?
- throw new MAPException("AsnException when encoding MWStatus: " +
e.getMessage(), e);
- }
- }
-
- public void encodeData(AsnOutputStream asnOs) throws MAPException {
- try {
- asnOs.writeBitStringData(this.bitString);
- } catch (IOException e) {
- throw new MAPException("IOException when encoding MWStatus: " +
e.getMessage(), e);
- } catch (AsnException e) {
- throw new MAPException("AsnException when encoding MWStatus: " +
e.getMessage(), e);
- }
- }
-
-
}
=======================================
---
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiRequestTest.java
Thu Aug 9 00:44:57 2012
@@ -26,6 +26,7 @@
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
+import org.mobicents.protocols.asn.Tag;
import org.mobicents.protocols.ss7.map.primitives.IMEIImpl;
import org.testng.annotations.Test;
@@ -50,10 +51,11 @@
AsnInputStream asnIS = new AsnInputStream(rawData);
int tag = asnIS.readTag();
+ assertEquals(tag, Tag.STRING_OCTET);
CheckImeiRequestImpl checkImeiImpl = new
CheckImeiRequestImpl(2);
checkImeiImpl.decodeAll(asnIS);
- assertEquals(checkImeiImpl.getIMEI().getIMEI(),
"358091016853550");
+
assertTrue(checkImeiImpl.getIMEI().getIMEI().equals("358091016853550"));
}
@Test(groups = { "functional.encode", "imei" })
=======================================
---
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
Wed Aug 8 17:32:42 2012
+++
/map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/service/mobility/imei/CheckImeiResponseTest.java
Thu Aug 9 00:44:57 2012
@@ -29,6 +29,7 @@
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
+import org.mobicents.protocols.asn.Tag;
import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.EquipmentStatus;
import org.testng.annotations.Test;
@@ -48,8 +49,9 @@
public void testDecode() throws Exception {
byte[] rawData = getEncodedDataV2();
AsnInputStream asnIS = new AsnInputStream(rawData);
-
+
int tag = asnIS.readTag();
+ assertEquals(tag, Tag.ENUMERATED);
CheckImeiResponseImpl checkImeiImpl = new
CheckImeiResponseImpl(2);
checkImeiImpl.decodeAll(asnIS);
==============================================================================
Revision: 5e51fa4c6f22
Author: Sergey Vetyutnev <[email protected]>
Date: Thu Aug 9 00:49:46 2012
Log: Merge branch 'checkIMEI'
http://code.google.com/p/jss7/source/detail?r=5e51fa4c6f22