4 new revisions:
Revision: 8e75f1117085
Author: [email protected] <[email protected]>
Date: Wed Jul 11 07:19:19 2012
Log: changed <event-type-name> to SUBMIT_SM and DELIVER_SM
http://code.google.com/p/smscgateway/source/detail?r=8e75f1117085
Revision: b57e4f6622a2
Author: [email protected] <[email protected]>
Date: Wed Jul 11 07:50:15 2012
Log: ESME can pass null address-range in BIND request, while one
configured...
http://code.google.com/p/smscgateway/source/detail?r=b57e4f6622a2
Revision: 2acbeb5d0fd9
Author: [email protected] <[email protected]>
Date: Wed Jul 11 08:29:09 2012
Log: Show state of ESME in "smsc esme show" command
http://code.google.com/p/smscgateway/source/detail?r=2acbeb5d0fd9
Revision: 266fc584060c
Author: [email protected] <[email protected]>
Date: Wed Jul 11 08:55:35 2012
Log: changed the Delivery Report logic from RxSmppServerSbb to MtSbb
http://code.google.com/p/smscgateway/source/detail?r=266fc584060c
==============================================================================
Revision: 8e75f1117085
Author: [email protected] <[email protected]>
Date: Wed Jul 11 07:19:19 2012
Log: changed <event-type-name> to SUBMIT_SM and DELIVER_SM
http://code.google.com/p/smscgateway/source/detail?r=8e75f1117085
Modified:
/core/slee/services/events/src/main/resources/META-INF/event-jar.xml
/core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
/core/slee/services/txsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
=======================================
--- /core/slee/services/events/src/main/resources/META-INF/event-jar.xml
Sun Apr 29 14:52:56 2012
+++ /core/slee/services/events/src/main/resources/META-INF/event-jar.xml
Wed Jul 11 07:19:19 2012
@@ -4,14 +4,14 @@
<event-jar>
<event-definition>
<description>SMS event fired to Mt Service to send SMS to Mobile
User</description>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.MT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SUBMIT_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
<event-class-name>org.mobicents.smsc.slee.services.smpp.server.events.SmsEvent</event-class-name>
</event-definition>
<event-definition>
<description>SMS event fired to Rx SMPP module to be delivered to
ESME</description>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SMPP_DELIVERY_REPORT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.DELIVER_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
<event-class-name>org.mobicents.smsc.slee.services.smpp.server.events.SmsEvent</event-class-name>
=======================================
--- /core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml Tue
May 8 08:35:43 2012
+++ /core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml Wed
Jul 11 07:19:19 2012
@@ -42,7 +42,7 @@
<event event-direction="Receive" initial-event="True">
<event-name>Sms</event-name>
<event-type-ref>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.MT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SUBMIT_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
@@ -248,7 +248,7 @@
<event event-direction="Fire">
<event-name>SendDeliveryReportSms</event-name>
<event-type-ref>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SMPP_DELIVERY_REPORT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.DELIVER_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
=======================================
---
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Tue May 15 06:25:33 2012
+++
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Wed Jul 11 07:19:19 2012
@@ -19,7 +19,7 @@
<event event-direction="Receive" initial-event="True">
<event-name>SendDeliveryReportSms</event-name>
<event-type-ref>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SMPP_DELIVERY_REPORT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.DELIVER_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
=======================================
---
/core/slee/services/txsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Tue May 15 06:25:33 2012
+++
/core/slee/services/txsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Wed Jul 11 07:19:19 2012
@@ -61,7 +61,7 @@
<event event-direction="Fire">
<event-name>Sms</event-name>
<event-type-ref>
-
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.MT_SMS</event-type-name>
+
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.SUBMIT_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
==============================================================================
Revision: b57e4f6622a2
Author: [email protected] <[email protected]>
Date: Wed Jul 11 07:50:15 2012
Log: ESME can pass null address-range in BIND request, while one
configured
should be used.
Also when adding smsc emse, address-range is made compulsory for
TRANSCIEVER and RECEIVER
http://code.google.com/p/smscgateway/source/detail?r=b57e4f6622a2
Modified:
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
/core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
/core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
=======================================
---
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
Sun Jul 8 05:48:30 2012
+++
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
Wed Jul 11 07:50:15 2012
@@ -104,13 +104,20 @@
throw new
SmppProcessingException(SmppConstants.STATUS_INVBNDSTS);
}
- if ((esmeAddressRange.getAddress() == null &&
bindRequestAddressRange.getAddress() != null)
- || (esmeAddressRange.getAddress() != null &&
bindRequestAddressRange.getAddress() == null)
- |
| !(esmeAddressRange.getAddress().equals(bindRequestAddressRange.getAddress())))
{
+ //TODO : we are checking with empty String, is this correct?
+
+
System.err.println("bindRequestAddressRange.getAddress()="+bindRequestAddressRange.getAddress()+"=");
+
+ if (bindRequestAddressRange.getAddress() == null ||
bindRequestAddressRange.getAddress() == "") {
+ // If ESME doesn't know we set it up from our config
+
bindRequestAddressRange.setAddress(esmeAddressRange.getAddress());
+ } else if
(!bindRequestAddressRange.getAddress().equals(esmeAddressRange.getAddress()))
{
logger.error(String.format("Received BIND request with Address_Range=%s
but configured Address_Range=%s",
bindRequestAddressRange.getAddress(),
esmeAddressRange.getAddress()));
throw new
SmppProcessingException(SmppConstants.STATUS_INVBNDSTS);
}
+
+ sessionConfiguration.setAddressRange(bindRequestAddressRange);
// TODO More parameters to compare
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
Sat Jul 7 10:32:42 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
Wed Jul 11 07:50:15 2012
@@ -59,6 +59,8 @@
public static final String DELETE_ESME_FAILED_NO_ESME_FOUND = "No Esme
found with given systemId %s";
public static final String DELETE_ESME_SUCCESSFUL = "Successfully deleted
Esme with given systemId %s";
+
+ public static final String NULL_ESME_ADDRESS_RANGE = "esme-range is
compulsory for TRANSCEIVER and RECEIVER";
/**
* Generic constants
*/
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Sat Jul 7 10:32:42 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Wed Jul 11 07:50:15 2012
@@ -151,9 +151,14 @@
}
}
+
+ if ((SmppBindType.TRANSCEIVER == smppBindType || SmppBindType.RECEIVER
== smppBindType)
+ && esmeAddrRange == null) {
+ return SMSCOAMMessages.NULL_ESME_ADDRESS_RANGE;
+ }
Address address = new Address(esmeTonType, esmeNpiType,
esmeAddrRange);
- Esme esme = this.smscManagement.createEsme(systemId, password, host,
strPort, smppBindType, systemType, smppVersionType,
- address);
+ Esme esme = this.smscManagement.createEsme(systemId, password, host,
strPort, smppBindType, systemType,
+ smppVersionType, address);
return String.format(SMSCOAMMessages.CREATE_ESME_SUCCESSFULL,
esme.getSystemId());
}
==============================================================================
Revision: 2acbeb5d0fd9
Author: [email protected] <[email protected]>
Date: Wed Jul 11 08:29:09 2012
Log: Show state of ESME in "smsc esme show" command
http://code.google.com/p/smscgateway/source/detail?r=2acbeb5d0fd9
Modified:
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
/core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java
/core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
/core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
=======================================
---
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
Wed Jul 11 07:50:15 2012
+++
/core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
Wed Jul 11 08:29:09 2012
@@ -155,6 +155,9 @@
session.serverReady(smppSessionHandler);
this.registerMBean(sessionId, session);
+
+ Esme esme =
this.smscManagement.getEsme(session.getConfiguration().getSystemId());
+ esme.setState(session.getStateName());
}
@Override
@@ -176,6 +179,9 @@
session.destroy();
this.unregisterMBean(sessionId, session);
+
+ Esme esme =
this.smscManagement.getEsme(session.getConfiguration().getSystemId());
+ esme.setState(session.getStateName());
}
private void registerMBean(Long sessionId, SmppServerSession session) {
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java Sun Jul 8
05:48:30 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java Wed Jul 11
08:29:09 2012
@@ -29,6 +29,7 @@
import org.apache.log4j.Logger;
import com.cloudhopper.smpp.SmppBindType;
+import com.cloudhopper.smpp.SmppSession;
import com.cloudhopper.smpp.type.Address;
/**
@@ -67,6 +68,8 @@
protected SmscManagement smscManagement = null;
+ private String state = SmppSession.STATES[SmppSession.STATE_CLOSED];
+
public Esme() {
}
@@ -198,6 +201,14 @@
public void setAddress(Address address) {
this.address = address;
}
+
+ protected String getState() {
+ return state;
+ }
+
+ protected void setState(String state) {
+ this.state = state;
+ }
/**
* XML Serialization/Deserialization
@@ -210,17 +221,17 @@
esme.password = xml.getAttribute(ESME_PASSWORD, "");
esme.host = xml.getAttribute(REMOTE_HOST_IP, "");
esme.port = xml.getAttribute(REMOTE_HOST_PORT, "");
-
+
String smppBindTypeStr =
xml.getAttribute(SMPP_BIND_TYPE, "TRANSCEIVER");
-
+
if
(SmppBindType.TRANSCEIVER.toString().equals(smppBindTypeStr)) {
esme.smppBindType = SmppBindType.TRANSCEIVER;
} else if (SmppBindType.TRANSMITTER.toString().equals(smppBindTypeStr))
{
esme.smppBindType = SmppBindType.TRANSMITTER;
} else if
(SmppBindType.RECEIVER.toString().equals(smppBindTypeStr)) {
esme.smppBindType = SmppBindType.RECEIVER;
- }
-
+ }
+
esme.systemType = xml.getAttribute(ESME_SYSTEM_TYPE,
"");
esme.smppVersion =
SmppInterfaceVersionType.getInterfaceVersionType(xml.getAttribute(
ESME_INTERFACE_VERSION, ""));
@@ -251,10 +262,12 @@
};
public void show(StringBuffer sb) {
-
sb.append(SMSCOAMMessages.SHOW_ESME_SYSTEM_ID).append(this.systemId).append(SMSCOAMMessages.SHOW_ESME_PASSWORD)
-
.append(this.password).append(SMSCOAMMessages.SHOW_ESME_HOST).append(this.host)
-
.append(SMSCOAMMessages.SHOW_ESME_PORT).append(this.port).append(SMSCOAMMessages.SHOW_ESME_SYSTEM_TYPE)
-
.append(this.systemType).append(SMSCOAMMessages.SHOW_ESME_INTERFACE_VERSION).append(this.smppVersion)
+
sb.append(SMSCOAMMessages.SHOW_ESME_SYSTEM_ID).append(this.systemId).append(SMSCOAMMessages.SHOW_ESME_STATE)
+
.append(this.state).append(SMSCOAMMessages.SHOW_ESME_PASSWORD).append(this.password)
+
.append(SMSCOAMMessages.SHOW_ESME_HOST).append(this.host).append(SMSCOAMMessages.SHOW_ESME_PORT)
+
.append(this.port).append(SMSCOAMMessages.SHOW_ESME_BIND_TYPE).append(this.smppBindType)
+
.append(SMSCOAMMessages.SHOW_ESME_SYSTEM_TYPE).append(this.systemType)
+
.append(SMSCOAMMessages.SHOW_ESME_INTERFACE_VERSION).append(this.smppVersion)
.append(SMSCOAMMessages.SHOW_ADDRESS).append(this.address);
sb.append(SMSCOAMMessages.NEW_LINE);
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
Wed Jul 11 07:50:15 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
Wed Jul 11 08:29:09 2012
@@ -25,7 +25,7 @@
/**
*
* @author zaheer abbas
- *
+ *
*/
public interface SMSCOAMMessages {
@@ -34,9 +34,14 @@
*/
public static final String INVALID_COMMAND = "Invalid Command";
- /* public static final String ADD_ROUTING_RULE_SUCESSFULL = "Successfully
added Routing rule name=%s";
-
- public static final String ADD_ROUTING_RULE_FAIL_NO_SYSTEM_ID = "Creation
of Routing rule failed, as no ESME added with the System Id name=%s"; */
+ /*
+ * public static final String ADD_ROUTING_RULE_SUCESSFULL =
+ * "Successfully added Routing rule name=%s";
+ *
+ * public static final String ADD_ROUTING_RULE_FAIL_NO_SYSTEM_ID =
+ * "Creation of Routing rule failed, as no ESME added with the System Id
name=%s"
+ * ;
+ */
public static final String ESME_START_SUCCESSFULL = "Successfully started
ESME name=%s";
@@ -44,59 +49,67 @@
public static final String CREATE_ESME_SUCCESSFULL = "Successfully
created ESME name=%s";
- public static final String CREATE_EMSE_FAIL_ALREADY_EXIST = "Creation of
EMSE failed. Other ESME with name=%s already exist"; //name = systemid
+ public static final String CREATE_EMSE_FAIL_ALREADY_EXIST = "Creation of
EMSE failed. Other ESME with name=%s already exist"; // name
+
// =
+
// systemid
public static final String CREATE_ROUTING_RULE_SUCCESSFULL
= "Successfully created Routing rule name=%s";
- public static final String CREATE_ROUTING_RULE_FAIL_ALREADY_EXIST
= "Creation of Routing rule failed. Other Route with name=%s already
exist"; //name = systemid
+ public static final String CREATE_ROUTING_RULE_FAIL_ALREADY_EXIST
= "Creation of Routing rule failed. Other Route with name=%s already
exist"; // name
+
// =
+
// systemid
public static final String NOT_SUPPORTED_YET = "Not supported yet";
-
+
public static final String NO_ESME_DEFINED_YET = "No ESME defined yet";
-
+
public static final String NO_ROUTING_RULE_DEFINED_YET = "No Routing rule
defined yet";
-
+
public static final String DELETE_ESME_FAILED_NO_ESME_FOUND = "No Esme
found with given systemId %s";
-
+
public static final String DELETE_ESME_SUCCESSFUL = "Successfully deleted
Esme with given systemId %s";
-
+
public static final String NULL_ESME_ADDRESS_RANGE = "esme-range is
compulsory for TRANSCEIVER and RECEIVER";
/**
* Generic constants
*/
public static final String TAB = " ";
-
+
public static final String NEW_LINE = "\n";
-
+
public static final String COMMA = ",";
-
+
/**
* Show command specific constants
*/
public static final String SHOW_ASSIGNED_TO = "Assigned to :\n";
-
- public static final String SHOW_ESME_SYSTEM_ID = "ESME systemId = ";
-
- public static final String SHOW_ESME_PASSWORD = " password = ";
-
- public static final String SHOW_ESME_HOST = " host = ";
-
- public static final String SHOW_ESME_PORT = " port = ";
-
- public static final String SHOW_ESME_SYSTEM_TYPE = " systemType = ";
-
- public static final String SHOW_ESME_INTERFACE_VERSION = "
smppInterfaceVersion = ";
-
- public static final String SHOW_ESME_TON = " ton = ";
-
- public static final String SHOW_ESME_NPI = " npi = ";
-
- public static final String SHOW_ESME_ADDRESS_RANGE = " addressRange = ";
-
+
+ public static final String SHOW_ESME_SYSTEM_ID = "ESME systemId=";
+
+ public static final String SHOW_ESME_STATE = " state=";
+
+ public static final String SHOW_ESME_PASSWORD = " password=";
+
+ public static final String SHOW_ESME_HOST = " host=";
+
+ public static final String SHOW_ESME_PORT = " port=";
+
+ public static final String SHOW_ESME_BIND_TYPE = " bindType=";
+
+ public static final String SHOW_ESME_SYSTEM_TYPE = " systemType=";
+
+ public static final String SHOW_ESME_INTERFACE_VERSION = "
smppInterfaceVersion=";
+
+ public static final String SHOW_ESME_TON = " ton=";
+
+ public static final String SHOW_ESME_NPI = " npi=";
+
+ public static final String SHOW_ESME_ADDRESS_RANGE = " addressRange=";
+
public static final String SHOW_ROUTING_RULE_NAME = "Routing rule
name=";
-
+
public static final String SHOW_STARTED = " started=";
-
+
public static final String SHOW_ADDRESS = " address=";
-
-}
+
+}
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Wed Jul 11 07:50:15 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Wed Jul 11 08:29:09 2012
@@ -194,7 +194,6 @@
Esme esme = n.getValue();
sb.append(SMSCOAMMessages.NEW_LINE);
esme.show(sb);
- sb.append(SMSCOAMMessages.NEW_LINE);
}
return sb.toString();
}
==============================================================================
Revision: 266fc584060c
Author: [email protected] <[email protected]>
Date: Wed Jul 11 08:55:35 2012
Log: changed the Delivery Report logic from RxSmppServerSbb to MtSbb
http://code.google.com/p/smscgateway/source/detail?r=266fc584060c
Modified:
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtSbb.java
/core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
=======================================
---
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtSbb.java
Fri Jun 22 06:23:54 2012
+++
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtSbb.java
Wed Jul 11 08:55:35 2012
@@ -1,6 +1,7 @@
package org.mobicents.smsc.slee.services.mt;
import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
import javax.slee.ActivityContextInterface;
import javax.slee.EventContext;
@@ -37,12 +38,34 @@
import org.mobicents.slee.resource.map.events.ErrorComponent;
import org.mobicents.smsc.slee.services.smpp.server.events.SmsEvent;
+import com.cloudhopper.commons.charset.CharsetUtil;
import com.cloudhopper.smpp.SmppConstants;
public abstract class MtSbb extends MtCommonSbb {
private static final String className = "MtSbb";
+ private static final byte ESME_DELIVERY_ACK = 0x08;
+
+ private static final String DELIVERY_ACK_ID = "id:";
+ private static final String DELIVERY_ACK_SUB = " sub:";
+ private static final String DELIVERY_ACK_DLVRD = " dlvrd:";
+ private static final String DELIVERY_ACK_SUBMIT_DATE = " submit date:";
+ private static final String DELIVERY_ACK_DONE_DATE = " done date:";
+ private static final String DELIVERY_ACK_STAT = " stat:";
+ private static final String DELIVERY_ACK_ERR = " err:";
+ private static final String DELIVERY_ACK_TEXT = " text:";
+
+ private static final String DELIVERY_ACK_STATE_DELIVERED = "DELIVRD";
+ private static final String DELIVERY_ACK_STATE_EXPIRED = "EXPIRED";
+ private static final String DELIVERY_ACK_STATE_DELETED = "DELETED";
+ private static final String DELIVERY_ACK_STATE_UNDELIVERABLE =
"UNDELIV";
+ private static final String DELIVERY_ACK_STATE_ACCEPTED = "ACCEPTD";
+ private static final String DELIVERY_ACK_STATE_UNKNOWN = "UNKNOWN";
+ private static final String DELIVERY_ACK_STATE_REJECTED = "REJECTD";
+
+ private final SimpleDateFormat DELIVERY_ACK_DATE_FORMAT = new
SimpleDateFormat("yyMMddHHmm");
+
private MAPApplicationContext mtFoSMSMAPApplicationContext = null;
public MtSbb() {
@@ -161,8 +184,8 @@
SM_RP_OA sm_RP_OA =
this.mapParameterFactory.createSM_RP_OA_ServiceCentreAddressOA(this
.getServiceCenterAddressString());
- UserDataImpl ud = new UserDataImpl(new
String(smsEvent.getShortMessage()), new
DataCodingSchemeImpl(smsEvent.getDataCoding()),
- null, null);
+ UserDataImpl ud = new UserDataImpl(new
String(smsEvent.getShortMessage()), new DataCodingSchemeImpl(
+ smsEvent.getDataCoding()), null, null);
// TODO : Should this be SubmitDate or currentDate?
Timestamp submitDate = smsEvent.getSubmitDate();
@@ -172,8 +195,8 @@
// TODO : Can this be constant?
ProtocolIdentifierImpl pi = new
ProtocolIdentifierImpl(0);
-
- //TODO : Take care of esm_class to include UDHI. See
SMPP specs
+
+ // TODO : Take care of esm_class to include UDHI. See
SMPP specs
SmsDeliverTpduImpl smsDeliverTpduImpl = new SmsDeliverTpduImpl(false,
false, false, true,
this.getSmsTpduOriginatingAddress(smsEvent.getSourceAddrTon(),
smsEvent.getSourceAddrNpi(),
@@ -262,7 +285,19 @@
deliveryReport.setMessageId(original.getMessageId());
-
deliveryReport.setShortMessage(original.getShortMessage());
+ StringBuffer sb = new StringBuffer();
+
sb.append(DELIVERY_ACK_ID).append(original.getMessageId()).append(DELIVERY_ACK_SUB).append("001")
+
.append(DELIVERY_ACK_DLVRD).append("001").append(DELIVERY_ACK_SUBMIT_DATE)
+
.append(DELIVERY_ACK_DATE_FORMAT.format(original.getSubmitDate())).append(DELIVERY_ACK_DONE_DATE)
+ .append(DELIVERY_ACK_DATE_FORMAT.format(new
Timestamp(System.currentTimeMillis())))
+
.append(DELIVERY_ACK_STAT).append(DELIVERY_ACK_STATE_DELIVERED).append(DELIVERY_ACK_ERR)
+ .append("000").append(DELIVERY_ACK_TEXT)
+
.append(this.getFirst20CharOfSMS(original.getShortMessage()));
+
+ byte[] textBytes = CharsetUtil.encode(sb.toString(),
CharsetUtil.CHARSET_GSM);
+
+ deliveryReport.setShortMessage(textBytes);
+ deliveryReport.setEsmClass(ESME_DELIVERY_ACK);
NullActivity nullActivity =
this.sbbContext.getNullActivityFactory().createNullActivity();
ActivityContextInterface nullActivityContextInterface =
this.sbbContext
@@ -271,5 +306,13 @@
this.fireSendDeliveryReportSms(deliveryReport,
nullActivityContextInterface, null);
}
}
+
+ String getFirst20CharOfSMS(byte[] rawSms) {
+ String first20CharOfSms = new String(rawSms);
+ if (first20CharOfSms.length() > 20) {
+ first20CharOfSms = first20CharOfSms.substring(0, 20);
+ }
+ return first20CharOfSms;
+ }
}
=======================================
---
/core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
Sat Jul 7 10:32:42 2012
+++
/core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
Wed Jul 11 08:55:35 2012
@@ -1,8 +1,5 @@
package org.mobicents.smsc.slee.services.smpp.server.rx;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.slee.ActivityContextInterface;
@@ -22,7 +19,6 @@
import
org.mobicents.smsc.slee.resources.smpp.server.events.PduRequestTimeout;
import org.mobicents.smsc.slee.services.smpp.server.events.SmsEvent;
-import com.cloudhopper.commons.charset.CharsetUtil;
import com.cloudhopper.smpp.pdu.DeliverSm;
import com.cloudhopper.smpp.pdu.DeliverSmResp;
import com.cloudhopper.smpp.type.Address;
@@ -30,27 +26,6 @@
public abstract class RxSmppServerSbb implements Sbb {
- private static final byte ESME_DELIVERY_ACK = 0x08;
-
- private static final String DELIVERY_ACK_ID = "id:";
- private static final String DELIVERY_ACK_SUB = " sub:";
- private static final String DELIVERY_ACK_DLVRD = " dlvrd:";
- private static final String DELIVERY_ACK_SUBMIT_DATE = " submit date:";
- private static final String DELIVERY_ACK_DONE_DATE = " done date:";
- private static final String DELIVERY_ACK_STAT = " stat:";
- private static final String DELIVERY_ACK_ERR = " err:";
- private static final String DELIVERY_ACK_TEXT = " text:";
-
- private static final String DELIVERY_ACK_STATE_DELIVERED = "DELIVRD";
- private static final String DELIVERY_ACK_STATE_EXPIRED = "EXPIRED";
- private static final String DELIVERY_ACK_STATE_DELETED = "DELETED";
- private static final String DELIVERY_ACK_STATE_UNDELIVERABLE =
"UNDELIV";
- private static final String DELIVERY_ACK_STATE_ACCEPTED = "ACCEPTD";
- private static final String DELIVERY_ACK_STATE_UNKNOWN = "UNKNOWN";
- private static final String DELIVERY_ACK_STATE_REJECTED = "REJECTD";
-
- private final SimpleDateFormat DELIVERY_ACK_DATE_FORMAT = new
SimpleDateFormat("yyMMddHHmm");
-
private Tracer logger;
private SbbContextExt sbbContext;
@@ -61,7 +36,7 @@
// TODO Auto-generated constructor stub
}
- public void onSendDeliveryReportSms(SmsEvent event,
ActivityContextInterface aci, EventContext eventContext) {
+ public void onDeliverSm(SmsEvent event, ActivityContextInterface aci,
EventContext eventContext) {
try {
SmppServerSession smppSession =
smppServerSessions.getSmppSession(event.getDestAddrTon(),
@@ -85,19 +60,8 @@
deliverSm.setSourceAddress(new Address(event.getSourceAddrTon(),
event.getSourceAddrNpi(), event
.getSourceAddr()));
deliverSm.setDestAddress(new Address(event.getDestAddrTon(),
event.getDestAddrNpi(), event.getDestAddr()));
- deliverSm.setEsmClass(ESME_DELIVERY_ACK);
-
- StringBuffer sb = new StringBuffer();
-
sb.append(DELIVERY_ACK_ID).append(event.getMessageId()).append(DELIVERY_ACK_SUB).append("001")
-
.append(DELIVERY_ACK_DLVRD).append("001").append(DELIVERY_ACK_SUBMIT_DATE)
-
.append(DELIVERY_ACK_DATE_FORMAT.format(event.getSubmitDate())).append(DELIVERY_ACK_DONE_DATE)
- .append(DELIVERY_ACK_DATE_FORMAT.format(new
Timestamp(System.currentTimeMillis())))
-
.append(DELIVERY_ACK_STAT).append(DELIVERY_ACK_STATE_DELIVERED).append(DELIVERY_ACK_ERR)
-
.append("000").append(DELIVERY_ACK_TEXT).append(this.getFirst20CharOfSMS(event.getShortMessage()));
-
- byte[] textBytes = CharsetUtil.encode(sb.toString(),
CharsetUtil.CHARSET_GSM);
-
- deliverSm.setShortMessage(textBytes);
+ deliverSm.setEsmClass(event.getEsmClass());
+ deliverSm.setShortMessage(event.getShortMessage());
// TODO : waiting for 2 secs for window to accept our
request, is it
// good? Should time be more here?
@@ -117,7 +81,9 @@
}
public void onDeliverSmResp(DeliverSmResp event, ActivityContextInterface
aci, EventContext eventContext) {
- logger.info(String.format("onDeliverSmResp : DeliverSmResp=%s",
event));
+ if (logger.isInfoEnabled()) {
+ logger.info(String.format("onDeliverSmResp :
DeliverSmResp=%s", event));
+ }
// TODO : Handle this
}
@@ -208,17 +174,4 @@
// TODO Auto-generated method stub
}
-
- /**
- * Private
- */
-
- String getFirst20CharOfSMS(byte[] rawSms) {
- String first20CharOfSms = new String(rawSms);
- if (first20CharOfSms.length() > 20) {
- first20CharOfSms = first20CharOfSms.substring(0, 20);
- }
- return first20CharOfSms;
- }
-
-}
+}
=======================================
---
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Wed Jul 11 07:19:19 2012
+++
/core/slee/services/rxsmppserversbb/src/main/resources/META-INF/sbb-jar.xml
Wed Jul 11 08:55:35 2012
@@ -17,7 +17,7 @@
</sbb-classes>
<event event-direction="Receive" initial-event="True">
- <event-name>SendDeliveryReportSms</event-name>
+ <event-name>DeliverSm</event-name>
<event-type-ref>
<event-type-name>org.mobicents.smsc.slee.services.smpp.server.events.DELIVER_SM</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>