From 2bfa4e9b8da4da4a27a975f9bab26af234050e1f Mon Sep 17 00:00:00 2001
From: Marcin Radomski <m.radomski@avsystem.com>
Date: Tue, 13 Aug 2019 17:09:17 +0200
Subject: [PATCH] AT_CellularSMS: set "international" flag in PDU when
 applicable

Currently, create_pdu receives a destination address without '+' prefix,
and always sets the "type of address" to "unknown". That means, the
number needs to contain appropriate international number prefix (00/011)
if necessary - which is not the case if the leading + is simply
stripped.

This changes send_sms behavior so that when a SMS is sent to an
international number (indicated by leading +):

- AT+CMGS command receives the number with + prefix,
- created PDU has the "international" flag set.
---
 features/cellular/framework/AT/AT_CellularSMS.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/features/cellular/framework/AT/AT_CellularSMS.cpp b/features/cellular/framework/AT/AT_CellularSMS.cpp
index b0b0187982..c0d3c6f444 100644
--- a/features/cellular/framework/AT/AT_CellularSMS.cpp
+++ b/features/cellular/framework/AT/AT_CellularSMS.cpp
@@ -274,6 +274,10 @@ char *AT_CellularSMS::create_pdu(const char *phone_number, const char *message,
                                  uint8_t msg_part_number, uint8_t &header_size)
 {
     int totalPDULength = 0;
+    const bool is_number_international = (phone_number[0] == '+');
+    if (is_number_international) {
+        ++phone_number;
+    }
     int number_len = strlen(phone_number);
 
     totalPDULength += number_len;
@@ -313,7 +317,11 @@ char *AT_CellularSMS::create_pdu(const char *phone_number, const char *message,
     int_to_hex_str(number_len, pdu + x);
     x += 2;
     // Type of the Destination Phone Number
-    pdu[x++] = '8';
+    if (is_number_international) {
+        pdu[x++] = '9'; // international
+    } else {
+        pdu[x++] = '8'; // unknown
+    }
     pdu[x++] = '1';
 
     // phone number as reverse nibble encoded
@@ -405,12 +413,11 @@ nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const c
     _at.lock();
 
     int write_size = 0;
-    int remove_plus_sign = (phone_number[0] == '+') ? 1 : 0;
 
     ThisThread::sleep_for(_sim_wait_time);
 
     if (_mode == CellularSMSMmodeText) {
-        _at.cmd_start_stop("+CMGS", "=", "%s", phone_number + remove_plus_sign);
+        _at.cmd_start_stop("+CMGS", "=", "%s", phone_number);
 
         ThisThread::sleep_for(_sim_wait_time);
         _at.resp_start("> ", true);
@@ -463,7 +470,7 @@ nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const c
                 pdu_len = remaining_len > concatenated_sms_length ? concatenated_sms_length : remaining_len;
             }
 
-            pdu_str = create_pdu(phone_number + remove_plus_sign, message + i * concatenated_sms_length, pdu_len,
+            pdu_str = create_pdu(phone_number, message + i * concatenated_sms_length, pdu_len,
                                  sms_count, i + 1, header_len);
             if (!pdu_str) {
                 _at.unlock();