RESTCOM-1927: Workaround, hardcode submit_sm encoding to UTF-8. Fix d…

…ecoding.
RestComm · Mar 16, 2018 · 79ff863 · 79ff863
1 parent a4123d2
commit 79ff863
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/SmsSession.java b/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/SmsSession.java
@@ -188,6 +188,8 @@ private void inbound(final Object message) throws IOException {
             if(request.getSmppEncoding().equals(CharsetUtil.CHARSET_UCS_2)) {
                 encoding = SmsSessionRequest.Encoding.UCS_2;
             } else {
+                //FIXME: unused, due to hardcoded encoding in SmppMessageHandler
+                //quick fix for https://telestax.atlassian.net/browse/RESTCOMM-1927
                 encoding = SmsSessionRequest.Encoding.GSM;
             }
             // Store the last sms event.

diff --git a/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppClientOpsThread.java b/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppClientOpsThread.java
@@ -352,15 +352,18 @@ public PduResponse firePduRequestReceived(PduRequest pduRequest) {
 
                 DeliverSm deliverSm = (DeliverSm) pduRequest;
                 try {
-                    String decodedPduMessage = CharsetUtil.CHARSET_MODIFIED_UTF8.decode(deliverSm.getShortMessage());
+                    String decodedPduMessage;
                     String destSmppAddress = deliverSm.getDestAddress().getAddress();
                     String sourceSmppAddress = deliverSm.getSourceAddress().getAddress();
                     Charset charset;
                     if (DataCoding.DATA_CODING_UCS2 == deliverSm.getDataCoding()) {
                         charset = CharsetUtil.CHARSET_UCS_2;
                     } else {
-                        charset = CharsetUtil.CHARSET_GSM;
+                        //FIXME: quick fix for https://telestax.atlassian.net/browse/RESTCOMM-1927
+                        charset = CharsetUtil.CHARSET_UTF_8;
                     }
+                    //FIXME: Workaround RESTCOMM-1927
+                    decodedPduMessage = charset.decode(deliverSm.getShortMessage());
                     //send received SMPP PDU message to restcomm
                     try {
                         sendSmppMessageToRestcomm(decodedPduMessage, destSmppAddress, sourceSmppAddress, charset);

diff --git a/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java b/restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java
@@ -361,7 +361,9 @@ public void outbound(SmppOutboundMessageEntity request) throws SmppInvalidArgume
             textBytes = CharsetUtil.encode(request.getSmppContent(), CharsetUtil.CHARSET_UCS_2);
         } else {
             submit0.setDataCoding(DataCoding.DATA_CODING_GSM7);
-            textBytes = CharsetUtil.encode(request.getSmppContent(), request.getSmppEncoding());
+
+            //FIXME: quick fix for https://telestax.atlassian.net/browse/RESTCOMM-1927
+            textBytes = CharsetUtil.encode(request.getSmppContent(), CharsetUtil.CHARSET_UTF_8);
         }
 
         //TODO reverted from https://telestax.atlassian.net/browse/RESTCOMM-1595 as it caused SMS loop at SMSC