Extra fix for #245 - Do not allow charging request for submit_multi

RestComm · Jul 20, 2017 · b65feaf · b65feaf
1 parent 1cca1ab
commit b65feaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbb.java b/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbb.java
@@ -1544,9 +1544,13 @@ private void processSms(Sms sms0, PersistenceRAInterface store, Esme esme, Submi
         }
         if (withCharging && (eventSubmit == null && eventData == null)) {
             // we do not support of charging of submit_multi
-            throw new SmscProcessingException("SMSC GW does not support charging for sumbit_multi, a message is rejected",
-                    SmppConstants.STATUS_PROHIBITED, MAPErrorCode.systemFailure, SmscProcessingException.HTTP_ERROR_CODE_NOT_SET,
-                    null, SmscProcessingException.INTERNAL_ERROR_INJECT_STORE_AND_FORWARD_FAST);
+            String msg = "SMSC GW does not support charging for sumbit_multi and deliver_sm, a message is rejected";
+            logger.warning(msg);
+            SmscProcessingException e = new SmscProcessingException(msg, SmppConstants.STATUS_PROHIBITED,
+                    MAPErrorCode.systemFailure, SmscProcessingException.HTTP_ERROR_CODE_NOT_SET, null,
+                    SmscProcessingException.INTERNAL_ERROR_INJECT_STORE_AND_FORWARD_FAST);
+            e.setSkipErrorLogging(true);
+            throw e;
         }
 
         // transactional mode / or charging request

diff --git a/docs/adminguide/sources-asciidoc/src/main/asciidoc/Chapter-Configuring.adoc b/docs/adminguide/sources-asciidoc/src/main/asciidoc/Chapter-Configuring.adoc
@@ -1543,7 +1543,7 @@ error:4,message ID not exists
 
 SMSC GW can interoperate with an OCS server via Diameter protocol connection.
 
-For this case SMSC GW can be configured so any incoming SMPP, MO SS7 and Home Routing SS7 originated messages before next processing will be sent to OCS server.
+For this case SMSC GW can be configured so any incoming SMPP (only submit_sm and data_sm are supported), MO SS7 and Home Routing SS7 originated messages before next processing will be sent to OCS server.
 Then OCS server can check if SMSC GW must accept the message or not.
 If yes, SMSC GW will process the message, if not, the message will be dropped.
 OCS server can also make any charging operations as needed.