plugins: mcumgr: Fix not checking full message size against MTU

Author: thedjnK

plugins/mcumgr/smp_group.h

@@ -109,10 +109,10 @@ class smp_group : public QObject
 
     bool check_message_before_send(smp_message *tmp_message)
     {
-        if (tmp_message->contents().length() > processor->max_message_data_size(smp_mtu))
+        if (tmp_message->data()->length() > processor->max_message_data_size(smp_mtu))
         {
             //Message is larger than the transport provides
-            QString response = QString("Message too large for transport, ") % QString::number(tmp_message->contents().length()) % " vs " % QString::number(processor->max_message_data_size(smp_mtu)) % " bytes";
+            QString response = QString("Message too large for transport, ") % QString::number(tmp_message->data()->length()) % " vs " % QString::number(processor->max_message_data_size(smp_mtu)) % " bytes";
 
             delete tmp_message;
             cleanup();

plugins/mcumgr/smp_group_fs_mgmt.cpp

@@ -848,8 +848,8 @@ bool smp_group_fs_mgmt::upload_chunk()
     tmp_message->writer()->append(file_upload_area);
     tmp_message->writer()->append("data");
 
-    //CBOR element header is 2 bytes with 1 byte end token
-    max_size = max_size - tmp_message->size() - 3;
+    //CBOR element header is 2 bytes with 1 byte end token for byte string data, have to include 1 byte header and 4 bytes data for 'data' element too
+    max_size = max_size - tmp_message->size() - 3 - 5;
     remaining_file_size = local_file_size - local_file.pos();
     if (max_size > remaining_file_size)
     {

plugins/mcumgr/smp_group_img_mgmt.cpp

@@ -980,8 +980,8 @@ log_error() << "Going in circles...";
         tmp_message->writer()->append(this->file_upload_area);
         tmp_message->writer()->append("data");
 
-        //CBOR element header is 2 bytes with 1 byte end token
-        max_size = max_size - tmp_message->size() - 3;
+        //CBOR element header is 2 bytes with 1 byte end token for byte string data, have to include 1 byte header and 4 bytes data for 'data' element too
+        max_size = max_size - tmp_message->size() - 3 - 5;
 
         tmp_message->writer()->append(this->file_upload_data.mid(this->file_upload_area, max_size));