Revision: 392370c42c75
Author: Sergey Vetyutnev <[email protected]>
Date: Thu Aug 22 12:26:45 2013 UTC
Log: Simulator update: empty unstructuredSSResponse,
gprsSupportIndicator in
SRI
http://code.google.com/p/jss7/source/detail?r=392370c42c75
Modified:
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerConfigurationData.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerManMBean.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerStandardManMBean.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerConfigurationData.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerConfigurationData.java
Thu Aug 22 12:26:45 2013 UTC
@@ -22,6 +22,7 @@
package org.mobicents.protocols.ss7.tools.simulator.tests.sms;
+import javolution.text.CharArray;
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
@@ -48,6 +49,7 @@
protected static final String NUMBERING_PLAN_IDENTIFICATION
= "numberingPlanIdentification";
protected static final String SMS_CODING_TYPE = "smsCodingType";
protected static final String SEND_SRSMDS_IF_ERROR
= "sendSrsmdsIfError";
+ protected static final String GPRS_SUPPORT_INDICATOR
= "gprsSupportIndicator";
protected AddressNature addressNature =
AddressNature.international_number;
protected NumberingPlan numberingPlan = NumberingPlan.ISDN;
@@ -59,6 +61,7 @@
protected NumberingPlanIdentification numberingPlanIdentification =
NumberingPlanIdentification.ISDNTelephoneNumberingPlan;
protected SmsCodingType smsCodingType = new
SmsCodingType(SmsCodingType.VAL_GSM7);
protected boolean sendSrsmdsIfError = false;
+ protected boolean gprsSupportIndicator = false;
public AddressNature getAddressNature() {
return addressNature;
@@ -140,6 +143,15 @@
sendSrsmdsIfError = val;
}
+
+ public boolean isGprsSupportIndicator() {
+ return gprsSupportIndicator;
+ }
+
+ public void setGprsSupportIndicator(boolean val) {
+ gprsSupportIndicator = val;
+
+ }
protected static final XMLFormat<TestSmsServerConfigurationData> XML =
new XMLFormat<TestSmsServerConfigurationData>(
TestSmsServerConfigurationData.class) {
@@ -148,6 +160,7 @@
xml.setAttribute(HLR_SSN, srv.hlrSsn);
xml.setAttribute(VLR_SSN, srv.vlrSsn);
xml.setAttribute(SEND_SRSMDS_IF_ERROR, srv.sendSrsmdsIfError);
+ xml.setAttribute(GPRS_SUPPORT_INDICATOR,
srv.gprsSupportIndicator);
xml.add(srv.serviceCenterAddress, SERVICE_CENTER_ADDRESS,
String.class);
@@ -163,6 +176,9 @@
srv.hlrSsn = xml.getAttribute(HLR_SSN).toInt();
srv.vlrSsn = xml.getAttribute(VLR_SSN).toInt();
srv.sendSrsmdsIfError =
xml.getAttribute(SEND_SRSMDS_IF_ERROR).toBoolean();
+ CharArray car = xml.getAttribute(GPRS_SUPPORT_INDICATOR);
+ if (car != null)
+ srv.gprsSupportIndicator = car.toBoolean();
srv.serviceCenterAddress = (String)
xml.get(SERVICE_CENTER_ADDRESS, String.class);
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
Sat Jul 20 10:07:56 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
Thu Aug 22 12:26:45 2013 UTC
@@ -279,6 +279,17 @@
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().setSendSrsmdsIfError(val);
this.testerHost.markStore();
}
+
+ @Override
+ public boolean isGprsSupportIndicator() {
+ return
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().isGprsSupportIndicator();
+ }
+
+ @Override
+ public void setGprsSupportIndicator(boolean val) {
+
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().setGprsSupportIndicator(val);
+ this.testerHost.markStore();
+ }
@Override
public void putAddressNature(String val) {
@@ -460,7 +471,8 @@
hostMessageData.mtMessageData = messageData;
curDialog.setUserObject(hostMessageData);
- curDialog.addSendRoutingInfoForSMRequest(msisdn, true,
serviceCentreAddress, null, false, null, null, null);
+ curDialog.addSendRoutingInfoForSMRequest(msisdn, true,
serviceCentreAddress, null, this.testerHost.getConfigurationData()
+ .getTestSmsServerConfigurationData().isGprsSupportIndicator(),
null,
null, null);
curDialog.send();
String sriData = createSriData(curDialog.getLocalDialogId(),
destIsdnNumber, serviceCentreAddr);
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerManMBean.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerManMBean.java
Thu Aug 22 12:26:45 2013 UTC
@@ -85,6 +85,10 @@
void setSendSrsmdsIfError(boolean val);
+ boolean isGprsSupportIndicator();
+
+ void setGprsSupportIndicator(boolean val);
+
void putAddressNature(String val);
void putNumberingPlan(String val);
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerStandardManMBean.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerStandardManMBean.java
Thu Aug 22 12:26:45 2013 UTC
@@ -77,10 +77,9 @@
"NumberingPlanIdentification parameter for SMS
tpdu origAddress", true, false, false),
new MBeanAttributeInfo("CurrentRequestDef",
String.class.getName(), "Get information of the current request",
true, false, false),
- new MBeanAttributeInfo("SmsCodingType",
SmsCodingType.class.getName(), "Character set for SMS encoding", true,
- true, false),
- new MBeanAttributeInfo("SendSrsmdsIfError",
Boolean.class.getName(), "Send reportSM-DeliveryStatus if error",
- true, true, true), };
+ new MBeanAttributeInfo("SmsCodingType",
SmsCodingType.class.getName(), "Character set for SMS encoding", true,
true, false),
+ new MBeanAttributeInfo("SendSrsmdsIfError",
Boolean.class.getName(), "Send reportSM-DeliveryStatus if error", true,
true, true),
+ new MBeanAttributeInfo("GprsSupportIndicator",
Boolean.class.getName(), "Sending GprsSupportIndicator in SRI request",
true, true, true), };
MBeanParameterInfo[] signString = new MBeanParameterInfo[] { new
MBeanParameterInfo("val", String.class.getName(),
"Index number or value") };
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java
Thu Aug 22 12:26:45 2013 UTC
@@ -467,17 +467,17 @@
return "No pending unstructured request";
MAPProvider mapProvider =
this.mapMan.getMAPStack().getMAPProvider();
- if (msg == null || msg.equals(""))
- return "USSD message is empty";
+// if (msg == null || msg.equals(""))
+// return "USSD message is empty";
USSDString ussdString = null;
- try {
- ussdString =
mapProvider.getMAPParameterFactory().createUSSDString(
- msg,
- new
CBSDataCodingSchemeImpl(this.testerHost.getConfigurationData().getTestUssdClientConfigurationData()
- .getDataCodingScheme()), null);
- } catch (MAPException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ if (msg != null && !msg.equals("")) {
+ try {
+ ussdString =
mapProvider.getMAPParameterFactory().createUSSDString(msg,
+ new
CBSDataCodingSchemeImpl(this.testerHost.getConfigurationData().getTestUssdClientConfigurationData().getDataCodingScheme()),
null);
+ } catch (MAPException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
try {
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java
Thu Aug 22 12:26:45 2013 UTC
@@ -34,6 +34,7 @@
import org.mobicents.protocols.ss7.map.api.MAPException;
import org.mobicents.protocols.ss7.map.api.MAPMessage;
import org.mobicents.protocols.ss7.map.api.MAPProvider;
+import org.mobicents.protocols.ss7.map.api.datacoding.CBSDataCodingScheme;
import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
import org.mobicents.protocols.ss7.map.api.primitives.AddressString;
import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
@@ -660,8 +661,13 @@
if (dd == null)
return;
+ String str = null;
try {
- dd.currentRequestDef += "unstrSsResp=\"" +
ind.getUSSDString().getString(null) + "\";";
+// dd.currentRequestDef += "unstrSsResp=\"" +
ind.getUSSDString().getString(null) + "\";";
+ USSDString ussdString = ind.getUSSDString();
+ if (ussdString != null)
+ str = ind.getUSSDString().getString(null);
+ dd.currentRequestDef += "unstrSsResp=\"" + str + "\";";
} catch (MAPException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -670,14 +676,12 @@
currentRequestDef = dd.currentRequestDef;
String pref = "CurDialog: ";
this.countUnstResp++;
- String uData =
this.createUssdMessageData(ind.getMAPDialog().getLocalDialogId(),
ind.getDataCodingScheme().getCode(),
- null, null);
- try {
- this.sendRcvdNotice("Rcvd: unstrSsResp: " +
ind.getUSSDString().getString(null), pref, uData);
- } catch (MAPException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ CBSDataCodingScheme dcs = ind.getDataCodingScheme();
+ int dstr = -1;
+ if (dcs != null)
+ dstr = dcs.getCode();
+ String uData =
this.createUssdMessageData(ind.getMAPDialog().getLocalDialogId(), dstr,
null, null);
+ this.sendRcvdNotice("Rcvd: unstrSsResp: " + str, pref, uData);
switch (this.getProcessSsRequestAction().intValue()) {
case ProcessSsRequestAction.VAL_MANUAL_RESPONSE: {
=======================================
---
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
Thu Aug 22 12:26:45 2013 UTC
@@ -71,6 +71,7 @@
private JTextField tbServiceCenterAddress;
private JComboBox cbSmsCodingType;
private JCheckBox cbSendSrsmdsIfError;
+ private JCheckBox cbGprsSupportIndicator;
public TestSmsServerParamForm(JFrame owner) {
super(owner, true);
@@ -78,7 +79,7 @@
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
setResizable(false);
setTitle("SMS test server settings");
- setBounds(100, 100, 539, 504);
+ setBounds(100, 100, 539, 566);
JPanel panel = new JPanel();
getContentPane().add(panel, BorderLayout.CENTER);
@@ -168,7 +169,7 @@
loadDataA();
}
});
- button.setBounds(10, 401, 246, 23);
+ button.setBounds(10, 463, 246, 23);
panel.add(button);
JButton button_1 = new JButton("Load default values for side B");
@@ -177,7 +178,7 @@
loadDataB();
}
});
- button_1.setBounds(266, 401, 255, 23);
+ button_1.setBounds(266, 463, 255, 23);
panel.add(button_1);
JButton button_2 = new JButton("Cancel");
@@ -186,7 +187,7 @@
getJFrame().dispose();
}
});
- button_2.setBounds(404, 435, 117, 23);
+ button_2.setBounds(404, 497, 117, 23);
panel.add(button_2);
JButton button_3 = new JButton("Save");
@@ -197,7 +198,7 @@
}
}
});
- button_3.setBounds(180, 435, 117, 23);
+ button_3.setBounds(180, 497, 117, 23);
panel.add(button_3);
JButton button_4 = new JButton("Reload");
@@ -206,7 +207,7 @@
reloadData();
}
});
- button_4.setBounds(10, 435, 144, 23);
+ button_4.setBounds(10, 497, 144, 23);
panel.add(button_4);
JLabel lblOriginationServiceCenter = new JLabel("Origination
Service center address string");
@@ -229,6 +230,10 @@
cbSendSrsmdsIfError = new JCheckBox("Send reportSM-DeliveryStatus
if error");
cbSendSrsmdsIfError.setBounds(8, 367, 513, 25);
panel.add(cbSendSrsmdsIfError);
+
+ cbGprsSupportIndicator = new JCheckBox("Send GprsSupportIndicator
in SRI request");
+ cbGprsSupportIndicator.setBounds(8, 397, 513, 25);
+ panel.add(cbGprsSupportIndicator);
}
public void setData(TestSmsServerManMBean smsServer) {
@@ -253,6 +258,7 @@
tbHlrSsn.setText(((Integer)
this.smsServer.getHlrSsn()).toString());
tbVlrSsn.setText(((Integer)
this.smsServer.getVlrSsn()).toString());
cbSendSrsmdsIfError.setSelected(this.smsServer.isSendSrsmdsIfError());
+
cbGprsSupportIndicator.setSelected(this.smsServer.isGprsSupportIndicator());
}
private void loadDataA() {
@@ -269,6 +275,7 @@
tbHlrSsn.setText("6");
tbVlrSsn.setText("8");
cbSendSrsmdsIfError.setSelected(false);
+ cbGprsSupportIndicator.setSelected(false);
}
private void loadDataB() {
@@ -303,6 +310,7 @@
this.smsServer.setHlrSsn(hlrSsn);
this.smsServer.setVlrSsn(vlrSsn);
this.smsServer.setSendSrsmdsIfError(cbSendSrsmdsIfError.isSelected());
+
this.smsServer.setGprsSupportIndicator(cbGprsSupportIndicator.isSelected());
return true;
}
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
