Implement recvfile and use in server and client

Author: coditva

assets/recvfile

@@ -0,0 +1 @@
+this is data

assets/sendfile

@@ -2,6 +2,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <netdb.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "../include/udt.h"
 
 #define HOST "127.0.0.1"
@@ -48,6 +50,12 @@ int main(int argc, char *argv[])
 
     freeaddrinfo(result);
 
+    /* send file */
+    int filefd = open("assets/sendfile", O_RDONLY);
+    if (filefd < -1) return 2;
+    if (udt_sendfile(sock, filefd, 0, 10, 0) < 0) return 1;
+    close(filefd);
+
     /* send, recv */
     char buffer[BUFFER_SIZE];
     size_t size;

progs/client.c

@@ -2,6 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <netdb.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "../include/udt.h"
 
@@ -70,6 +72,13 @@ int main(int argc, char *argv[])
         fprintf(stdout, "Active on %s\n", PORT);
     }
 
+    /* recv file */
+    int filefd = open("assets/recvfile", O_WRONLY | O_TRUNC | O_CREAT);
+    int64_t offset = 0;
+    if (filefd < 0) return 2;
+    if (udt_recvfile(conn, filefd, &offset, 10, 0) < 0) return 1;
+    close(filefd);
+
     /* send, recv */
     char buffer[BUFFER_SIZE];
     char msg[] = "Servito ergo sum";

progs/server.c

@@ -109,8 +109,16 @@ int udt_close(socket_t sock)
 int64_t udt_recvfile(socket_t sock, int file, int64_t *offset, int64_t filesize,
                      int blocksize)
 {
-    if (!connection.is_connected) return -1;
-    return recv_file_buffer_read(file, offset, filesize, blocksize);
+    int num_read = 0;
+
+    do {
+        if (connection.is_open == 0 && connection.is_connected == 0)
+            return 0;
+
+        num_read = recv_file_buffer_read(file, offset, filesize, blocksize);
+    } while (num_read == 0);
+
+    return num_read;
 }
 
 int64_t udt_sendfile(socket_t sock, int file, int64_t offset, int64_t filesize,

src/api.c

@@ -1,4 +1,5 @@
 #include <unistd.h>
+#include <stdio.h>
 
 #include "packet.h"
 #include "buffer.h"
@@ -25,14 +26,19 @@ int64_t recv_file_buffer_read(int fd, int64_t *offset, int64_t size, int64_t blo
     char data[PACKET_DATA_SIZE];
     int retval = 0;
     int len = 0;
+    int read;
 
     if (fd < 0) return -1;
 
     while (size > 0) {
-        buffer_read(&buffer, data, PACKET_DATA_SIZE);
+
+        read = buffer_read(&buffer, data, PACKET_DATA_SIZE);
+        if (read == 0) continue;
+
         len = pwrite(fd, &data, PACKET_DATA_SIZE, *offset);
-        if (len < 0) return -1;
+        if (len < 1) return len;
 
+        *offset += len;
         retval += len;
         size -= len;
     }