Merge pull request #452 from mfine/mfine-file-io

Update to new file_io messages

Author: mfine

libsbp

@@ -17,6 +17,7 @@
 
 #include "sbp.h"
 #include "sbp_fileio.h"
+#include "sbp_utils.h"
 #include "cfs/cfs.h"
 
 static void read_cb(u16 sender_id, u8 len, u8 msg[], void* context);
@@ -31,13 +32,13 @@ void sbp_fileio_setup(void)
 {
   static sbp_msg_callbacks_node_t read_node;
   sbp_register_cbk(
-    SBP_MSG_FILEIO_READ,
+    SBP_MSG_FILEIO_READ_REQUEST,
     &read_cb,
     &read_node
   );
   static sbp_msg_callbacks_node_t read_dir_node;
   sbp_register_cbk(
-    SBP_MSG_FILEIO_READ_DIR,
+    SBP_MSG_FILEIO_READ_DIR_REQUEST,
     &read_dir_cb,
     &read_dir_node
   );
@@ -49,57 +50,65 @@ void sbp_fileio_setup(void)
   );
   static sbp_msg_callbacks_node_t write_node;
   sbp_register_cbk(
-    SBP_MSG_FILEIO_WRITE,
+    SBP_MSG_FILEIO_WRITE_REQUEST,
     &write_cb,
     &write_node
   );
 }
 
 /** File read callback.
- * Responds to a SBP_MSG_FILEIO_READ message.
+ * Responds to a SBP_MSG_FILEIO_READ_REQUEST message.
  *
  * Reads a certain length (up to 255 bytes) from a given offset. Returns the
- * data in a SBP_MSG_FILEIO_READ message where the message length field indicates
- * how many bytes were succesfully read.
+ * data in a SBP_MSG_FILEIO_READ_RESPONSE message where the message length field
+ * indicates how many bytes were succesfully read.
  */
 static void read_cb(u16 sender_id, u8 len, u8 msg[], void* context)
 {
-  (void)sender_id;
   (void)context;
 
+  if (sender_id != SBP_SENDER_ID) {
+    puts("Invalid sender!");
+    return;
+  }
+
   if ((len < 9) || (msg[len-1] != '\0')) {
     puts("Invalid fileio read message!");
     return;
   }
 
   u32 offset = ((u32)msg[3] << 24) | ((u32)msg[2] << 16) | (msg[1] << 8) | msg[0];
-  u8 readlen = msg[4];
+  u8 readlen = MIN(msg[4], SBP_FRAMING_MAX_PAYLOAD_SIZE - len);
   u8 buf[256];
   memcpy(buf, msg, len);
   int f = cfs_open((char*)&msg[5], CFS_READ);
   cfs_seek(f, offset, CFS_SEEK_SET);
   len += cfs_read(f, buf + len, readlen);
   cfs_close(f);
 
-  sbp_send_msg(SBP_MSG_FILEIO_READ, len, buf);
+  sbp_send_msg(SBP_MSG_FILEIO_READ_RESPONSE, len, buf);
 }
 
 /** Directory listing callback.
- * Responds to a SBP_MSG_FILEIO_READ_DIR message.
+ * Responds to a SBP_MSG_FILEIO_READ_DIR_REQUEST message.
  *
  * The offset parameter can be used to skip the first n elements of the file
  * list.
  *
- * Returns a SBP_MSG_FILEIO_READ_DIR message containing the directory
+ * Returns a SBP_MSG_FILEIO_READ_DIR_RESPONSE message containing the directory
  * listings as a NULL delimited list. The listing is chunked over multiple SBP
  * packets and the end of the list is identified by an entry containing just
  * the character 0xFF.
  */
 static void read_dir_cb(u16 sender_id, u8 len, u8 msg[], void* context)
 {
-  (void)sender_id;
   (void)context;
 
+  if (sender_id != SBP_SENDER_ID) {
+    puts("Invalid sender!");
+    return;
+  }
+
   if ((len < 5) || (msg[len-1] != '\0')) {
     puts("Invalid fileio read dir message!");
     return;
@@ -114,27 +123,31 @@ static void read_dir_cb(u16 sender_id, u8 len, u8 msg[], void* context)
   while (offset && (cfs_readdir(&dir, &dirent) == 0))
     offset--;
 
-  while ((cfs_readdir(&dir, &dirent) == 0) && (len < 255)) {
-    strncpy((char*)buf + len, dirent.name, 255 - len);
+  while ((cfs_readdir(&dir, &dirent) == 0) && (len < SBP_FRAMING_MAX_PAYLOAD_SIZE)) {
+    strncpy((char*)buf + len, dirent.name, SBP_FRAMING_MAX_PAYLOAD_SIZE - len);
     len += strlen(dirent.name) + 1;
   }
 
-  if (len < 255)
+  if (len < SBP_FRAMING_MAX_PAYLOAD_SIZE)
     buf[len++] = 0xff;
 
   cfs_closedir(&dir);
 
-  sbp_send_msg(SBP_MSG_FILEIO_READ_DIR, len, buf);
+  sbp_send_msg(SBP_MSG_FILEIO_READ_DIR_RESPONSE, len, buf);
 }
 
 /* Remove file callback.
  * Responds to a SBP_MSG_FILEIO_REMOVE message.
  */
 static void remove_cb(u16 sender_id, u8 len, u8 msg[], void* context)
 {
-  (void)sender_id;
   (void)context;
 
+  if (sender_id != SBP_SENDER_ID) {
+    puts("Invalid sender!");
+    return;
+  }
+
   if ((len < 2) || (msg[len-1] != '\0')) {
     puts("Invalid fileio remove message!");
     return;
@@ -144,16 +157,21 @@ static void remove_cb(u16 sender_id, u8 len, u8 msg[], void* context)
 }
 
 /* Write to file callback.
- * Responds to a SBP_MSG_FILEIO_WRITE message.
+ * Responds to a SBP_MSG_FILEIO_WRITE_REQUEST message.
  *
  * Writes a certain length (up to 255 bytes) at a given offset. Returns a copy
- * of the original SBP_MSG_FILEIO_WRITE message to check integrity of the write.
+ * of the original SBP_MSG_FILEIO_WRITE_RESPONSE message to check integrity of
+ * the write.
  */
 static void write_cb(u16 sender_id, u8 len, u8 msg[], void* context)
 {
-  (void)sender_id;
   (void)context;
 
+  if (sender_id != SBP_SENDER_ID) {
+    puts("Invalid sender!");
+    return;
+  }
+
   if (len < 6) {
     puts("Invalid fileio write message!");
     return;
@@ -166,5 +184,5 @@ static void write_cb(u16 sender_id, u8 len, u8 msg[], void* context)
   cfs_write(f, msg + headerlen, len - headerlen);
   cfs_close(f);
 
-  sbp_send_msg(SBP_MSG_FILEIO_WRITE, headerlen, msg);
+  sbp_send_msg(SBP_MSG_FILEIO_WRITE_RESPONSE, headerlen, msg);
 }