NPE when provider not return protocol version on bind response + SMPP providers may be use long passwords over SMPP 3.4 standard (like t-sms.ru)

.gitignore

@@ -2,6 +2,7 @@
 target/
 out/
 classes/
+stress/logs/
 syntax:glob
 *.swp
 
@@ -10,6 +11,16 @@ syntax:glob
 .gwt/
 .project
 .classpath
+.externalToolBuilders
+
+# IntelliJ Project Files
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# MAC_OSX
+*.DS_Store
 
 version.properties
 git.properties

.travis.yml

@@ -0,0 +1,5 @@
+language: java
+jdk:
+  - oraclejdk9
+  - oraclejdk8
+  - openjdk7

CHANGES.txt

@@ -1,60 +1,113 @@
 Changes:
 
-2.0 beta 3
+2.3.6
+- Add descriptions to negative response exceptions.
+- Added custom delivery receipt examples
+- Fix NPE in DeliveryReceipt constructor when date was blank
+- Removed unused code
+- Fix typo in composeSmeManualAcknowledgment method name
 
-- Add SMPP Server component
-- Add Optional Parameter support (contribution from [email protected])
-- Handling PDU processing concurrently (performance improvement)
-- Add data_sm support
-- Add cancel_sm support
-- Add replace_sm support
-- Add alert_notification support
-- Add CapacityPolicy to PDUByteBuffer (performance improvement, minimize array 
-  of byte creation)
-
-2.0 beta 4
+2.3.5
+- Rewrote the GSM 03.38 class
+- Don't check explicitly the sequence 1, but the session state
+- Add custom delivery receipt stripper
 
-- Modify Optional Parameter API (currently for TLV related to message 
-  concatenation case)
-- Add ServerResponseDeliveryListener (listener to receive success or failure 
-  event of submit_sm_resp/submit_multi_resp delivery)
-- Change license from LGPL to "Apache License, Version 2.0"
-- Add license notice on every sources.
+2.3.4
+- Removed synchronized from close to prevent deadlock
+- When stopping the enquire_link sender, only stop when still alive
+- Use slf4j-simple in test case, instead of log4j and System.Out
+- Improve the SMPP server simulator example
+
+2.3.3
+- Change the close of session method, to fix deadlock in Apache Camel SMPP component
+
+2.3.2
+- Process optional seconds in delivery receipt
+- Change log level for not recognized optional parameter
+- Allow replace_sm in state OUTBOUND_TRX (as it is allowed in SMPP 5.0)
+- Add ENROUTE in DeliveryReceiptState enum
+- Add SCHEDULED and SKIPPED (SMPP 5.0) message_state
+
+2.3.1
+- Allow replace_sm for state OUTBOUND_TRX
+
+2.3.0
+- Add outbind processing
+
+2.2.4
+- Fixed some logging
+- Add PriorityFlag enum
+- Add SSL connection factory implementation
+- Fixed SMSCDeliveryReceipt.SUCCESS to FAILURE
+- Fix RelativeTimeFormatter test
+- Multiple lexical and code improvements
+
+2.2.3
+- Use StringBuilder instead of StringBuffer
+- Use OctetString for unknown OptionalParameter
+
+2.2.2
+- Fixed some logging
+- Added SMPP 5.0 message states
+- Fixed NullPointerException when OptionaParameters are empty in a BindResp
+- Fixed invalid command length (<4) throws an IndexOutOfBoundsException
+- Added RelativeTimeFormatter
+
+2.2.1
+- Fix examples
+- Use StrictBufferedInputStream for better performance
+- Provide source for onAcceptDataSm
+
+2.2.0
+- New DataCoding API.
+  Removed the old class (since I could not make the change backwards compatible)
+  Added some new classes instead:
+  1. DataCodings
+  2. DataCoding (GeneralDataCoding, MessageWaitingDataCoding, SimpleDataCoding, RawDataCoding)
+- Expose remote InetAddress on server side API via SMPPServerSession
+  Add new method: InetAddress SMPPServerSession#getInetAddress()
+- Ensure command execution is in valid state. Checking done on local side (remote side also does the checking)
+- Make Command and its subclasses serializable
+
+2.1.0
+- set connection timeout when binding
+- provide source (the session) for onAcceptDataSm
+- use StrictBufferedInputStream
+
+2.0.1
+- Bug fix, MessageReceiverListener should be subclass of GenericMessageReceiverListener
+
+2.0 beta 6
+- Change the max length of short message to 254, referring to SMPP 3.4
+  Previously using 255 (taken from SMPP 5.0)
 
 2.0 beta 5
 - Bug fix for type on OptionalParameters class
 - Update the SessionState way to return the value from:
   1. isBound()
   2. isTransmittable()
   3. isReceiveable()
-- Add examples for auto-reconnect gateway
-  it can be found on org.jsmpp.examples.gateway
+- Add examples for auto-reconnect gateway (found in the org.jsmpp.examples.gateway package)
 - Fix the destination addresses on SMPPSession#submitMultiple
   Some classes and interfaces created to support the bug fixes.
 - Fix the date parsing on delivery receipt
 - Referring to Appendix C of SMPP 3.4 for year parsing rule
 
-2.0 beta 6
-- Change the max length of short message to 254, referring to SMPP 3.4
-  Previously using  255 (taken from SMPP 5.0)
-
-2.0.1
-- Bug fix, MessageReceiverListener should be subclass of 
-  GenericMessageReceiverListener 
-
-2.1.0
-- set connection timeout when binding
-- provide source (the session) for onAcceptDataSm
-- use StrictBufferedInputStream
-
+2.0 beta 4
+- Modify Optional Parameter API (currently for TLV related to message 
+  concatenation case)
+- Add ServerResponseDeliveryListener (listener to receive success or failure 
+  event of submit_sm_resp/submit_multi_resp delivery)
+- Change license from LGPL to "Apache License, Version 2.0"
+- Add license notice to every source file
 
-2.2.0
-- New DataCoding API.
-  Remove the old class (since I can't make backward compatibility)
-  Add some class:
-  1. DataCodings
-  2. DataCoding (GeneralDataCoding, MessageWatingDataCoding, SimpleDataCoding, RawDataCoding)
-- Expose remote InetAddress on server side API via SMPPServerSession
-  Add new method: InetAddress SMPPServerSession#getInetAddress()
-- Ensure command execution is in valid state. Checking done on local side (remote side do the checking also).
-- Make Command and it's subclasses serializeable
+2.0 beta 3
+- Add SMPP Server component
+- Add Optional Parameter support (contribution from [email protected])
+- Handling PDU processing concurrently (performance improvement)
+- Add data_sm support
+- Add cancel_sm support
+- Add replace_sm support
+- Add alert_notification support
+- Add CapacityPolicy to PDUByteBuffer (performance improvement, minimize ByteArray 
+  creation)

README.md

@@ -0,0 +1,48 @@
+Introduction
+------------
+
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jsmpp/jsmpp/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jsmpp/jsmpp)
+
+jSMPP is a java implementation (SMPP API) of the SMPP protocol (currently supports
+SMPP v3.4). It provides interfaces to communicate with a Message Center or
+an ESME (External Short Message Entity) and is able to handle
+traffic of 3000-5000 messages per second. 
+
+jSMPP is not a high-level library. People looking for a quick way to
+get started with SMPP may be better of using an abstraction layer such
+as the Apache Camel SMPP component:
+  http://camel.apache.org/smpp.html
+
+Travis-CI status:
+-----------------
+
+[![Build Status](https://travis-ci.org/opentelecoms-org/jsmpp.svg?branch=master)](https://travis-ci.org/opentelecoms-org/jsmpp)
+
+History
+-------
+
+The project started on Google Code:  http://code.google.com/p/jsmpp/
+
+It was maintained by uudashr on Github until 2013.
+
+It is now a community project maintained at http://jsmpp.org
+
+Release procedure
+-----------------
+
+  mvn deploy -DperformRelease=true -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -Dgpg.passphrase=\<yourpassphrase\>
+
+  * log in here: https://oss.sonatype.org
+  * click the 'Staging Repositories' link
+  * select the repository and click close
+  * select the repository and click release
+
+License
+-------
+
+Copyright (C) 2007-2013, Nuruddin Ashr <[email protected]>
+Copyright (C) 2012-2013, Denis Kostousov <[email protected]>
+Copyright (C) 2014, Daniel Pocock http://danielpocock.com
+Copyright (C) 2016, Pim Moerenhout <[email protected]>
+
+This project is licensed under the Apache Software License 2.0.

jsmpp-examples/pom.xml

@@ -3,12 +3,14 @@
     <parent>
         <artifactId>jsmpp-pom</artifactId>
         <groupId>org.jsmpp</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.3.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jsmpp-examples</artifactId>
 
+    <name>jSMPP - Examples</name>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -17,13 +19,13 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>compile</scope>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
     </dependencies>
 
-</project>
+</project>

jsmpp-examples/src/main/java/org/jsmpp/examples/AcceptingConnectionAndBindExample.java

@@ -17,61 +17,60 @@
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.log4j.BasicConfigurator;
 import org.jsmpp.PDUStringException;
 import org.jsmpp.SMPPConstant;
 import org.jsmpp.session.BindRequest;
 import org.jsmpp.session.SMPPServerSession;
 import org.jsmpp.session.SMPPServerSessionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author uudashr
  *
  */
 public class AcceptingConnectionAndBindExample {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AcceptingConnectionAndBindExample.class);
 
     public static void main(String[] args) {
-        BasicConfigurator.configure();
         try {
-            System.out.println("Listening ...");
+            LOGGER.info("Listening ...");
             SMPPServerSessionListener sessionListener = new SMPPServerSessionListener(8056);
 
             // accepting connection, session still in OPEN state
             SMPPServerSession session = sessionListener.accept();
-            System.out.println("Accept connection");
+            LOGGER.info("Accept connection");
 
             try {
                 BindRequest request = session.waitForBind(5000);
-                System.out.println("Receive bind request");
+                LOGGER.info("Receive bind request");
 
-                if (request.getSystemId().equals("test") && 
-                        request.getPassword().equals("test")) {
-                    
+                if ("test".equals(request.getSystemId()) &&
+                        "test".equals(request.getPassword())) {
+
                     // accepting request and send bind response immediately
-                    System.out.println("Accepting bind request, interface version is " + request.getInterfaceVersion());
+                    LOGGER.info("Accepting bind request, interface version is " + request.getInterfaceVersion());
                     request.accept("sys");
 
                     try { Thread.sleep(20000); } catch (InterruptedException e) {}
                 } else {
-                    System.out.println("Rejecting bind request");
+                    LOGGER.info("Rejecting bind request");
                     request.reject(SMPPConstant.STAT_ESME_RINVPASWD);
                 }
             } catch (TimeoutException e) {
-                System.out.println("No binding request made after 5000 millisecond");
-                e.printStackTrace();
+                LOGGER.error("No binding request made after 5000 millisecond", e);
             }
 
-
             if (session.getSessionState().isBound()) {
-                System.out.println("Closing session");
+                LOGGER.info("Closing session");
                 session.unbindAndClose();
             }
-            System.out.println("Closing session listener");
+            LOGGER.info("Closing session listener");
             sessionListener.close();
         } catch (PDUStringException e) {
-            e.printStackTrace();
+            LOGGER.error("PDUStringException", e);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("IOException", e);
         }
 
     }