Improve sync process logic

Author: r3n33

command_interface.c

@@ -78,23 +78,39 @@ void command_interface_process_byte(char incoming)
         {
             NRF_LOG_INFO("ACK handler >%s<", command_input_buffer);
             NRF_LOG_FLUSH();
-            command_interface_continue_transfer( command_input_buffer );
+            if (sync_in_progress)
+            {
+                command_interface_continue_transfer( command_input_buffer );
+            }
+            else
+            {
+                NRF_LOG_WARNING("ACK received while !sync_in_progress");
+                NRF_LOG_FLUSH();
+            }
         }
         else if( strncmp(&command_input_buffer[strlen(command_input_buffer)-4], "nack", 4) == 0)
         {
             NRF_LOG_INFO("NACK handler >%s<", command_input_buffer);
             NRF_LOG_FLUSH();
             if (sync_in_progress)
             {
-                // For a cat command we want to seek to the byte the client last received
-                if(strncmp(command_input_buffer, "cat", 3) == 0)
+                if (cat_in_progress)
                 {
-                    // Set the file position to what we've received on the client side
-                    lfs_file_seek(m_lfs, &file_command_interface, atoi(command_input_buffer+4), LFS_SEEK_SET);
+                    // For a cat command we want to seek to the byte the client last received
+                    if(strncmp(command_input_buffer, "cat", 3) == 0)
+                    {
+                        // Set the file position to what we've received on the client side
+                        lfs_file_seek(m_lfs, &file_command_interface, atoi(command_input_buffer+4), LFS_SEEK_SET);
+                    }
                 }
                 // Continue to send data to the client
                 command_interface_continue_transfer(command_input_buffer);
             }
+            else
+            {
+                NRF_LOG_WARNING("NACK received while !sync_in_progress");
+                NRF_LOG_FLUSH();
+            }
         }
         else if(strncmp(command_input_buffer, "log", 3) == 0)
         {
@@ -191,6 +207,7 @@ void command_interface_process_byte(char incoming)
             }
             if(lfs_file_opencfg(m_lfs, &file_command_interface, filename, LFS_O_RDONLY, &lfs_file_config) >= 0)
             {
+                lfs_file_seek(m_lfs, &file_command_interface, 0, LFS_SEEK_SET); //TODO: Testing rewind on open, necessary?
                 sprintf((char *)command_response_buffer, "cat,%s", filename);
                 m_ble_tx_logbuffer(command_response_buffer, (size_t)strlen((const char *)command_response_buffer));
                 bytes_sent = 0;
@@ -448,22 +465,30 @@ void command_interface_continue_transfer(char* command)
     }
     else if(strncmp(command_input_buffer, "cat", 3) == 0)
     {
+        if (!cat_in_progress)
+        {
+            NRF_LOG_WARNING("CAT ACK/NACK received while !cat_in_progress");
+            NRF_LOG_FLUSH();
+            return;
+        }
         NRF_LOG_INFO("command_interface_continue_transfer(TRANSFER_MODE_CAT)");
         NRF_LOG_FLUSH();
 
         if(bytes_sent >= file_command_interface.ctz.size)
         {
             m_ble_tx_logbuffer((unsigned char *)"cat,complete", strlen("cat,complete"));
 
-            NRF_LOG_INFO("finished cat");
+            NRF_LOG_INFO("sending cat,complete");
             NRF_LOG_FLUSH();
 
+            //NOTE: Leaving file open in case the client needs to ACK/NACK
+            //NOTE: File will be closed upon request of the next file or syncstop
+            /*
             int close_result = lfs_file_close(m_lfs, &file_command_interface);
-
             NRF_LOG_INFO("cat close result: %d", close_result);
             NRF_LOG_FLUSH();
-
             cat_in_progress = false;
+            */
         }
         else if(bytes_sent < file_command_interface.ctz.size)
         {