Merge pull request #3 from UtkarshMe/send_recv_file

Implement sendfile and recvfile

Author: coditva

assets/recvfile

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

assets/sendfile

@@ -43,4 +43,7 @@ int send_buffer_write           (char *data, int len);
 int send_packet_buffer_write    (packet_t *);
 int send_packet_buffer_read     (packet_t *);
 
+int64_t recv_file_buffer_read   (int, int64_t *, int64_t, int64_t);
+int64_t send_file_buffer_write  (int, int64_t, int64_t, int64_t);
+
 #endif /* end of include guard: BUFFER_H_IBSOFJRY */

include/buffer.h

@@ -101,25 +101,25 @@ int         udt_send    (socket_t, char *, int, int);
  * Receive a file from the socket
  *
  * @param   socket_t    The socket to receive from
- * @param   void*       Pointer to the file to store incoming data
+ * @param   int         The file descriptor to a writable open file
  * @param   int64_t     The offset position to store. After transfer, contains
  *                      new offset
  * @param   int64_t     The total size to be received
  * @param   int         The size of data block
  * @return  int64_t     Size of data sent, -1 on error
  */
-int64_t     udt_recvfile(socket_t, void *, int64_t *, int64_t, int);
+int64_t     udt_recvfile(socket_t, int, int64_t *, int64_t, int);
 
 /**
  * Send a file to the socket
  *
  * @param   socket_t    The socket to send to
- * @param   void*       The file buffer to send
+ * @param   int         The file descriptor to a readable open file
  * @param   int64_t     The offset position to read data
  * @param   int64_t     The total size to be sent
  * @param   int         The size of data block
  * @return  int64_t     Size of data sent, -1 on error
  */
-int64_t     udt_sendfile(socket_t, void *, int64_t, int64_t, int);
+int64_t     udt_sendfile(socket_t, int, int64_t, int64_t, int);
 
 #endif /* end of include guard: UDT_H_JDNRQTZQ */

include/udt.h

@@ -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 */
     size_t size;
     char *line;

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];
     while (udt_recv(conn, buffer, BUFFER_SIZE, 0)) {

progs/server.c

@@ -105,3 +105,25 @@ int udt_close(socket_t sock)
     while (connection.is_open);
     return close(sock);
 }
+
+int64_t udt_recvfile(socket_t sock, int file, int64_t *offset, int64_t filesize,
+                     int 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,
+                     int blocksize)
+{
+    if (!connection.is_connected) return -1;
+    return send_file_buffer_write(file, offset, filesize, blocksize);
+}

src/api.c

@@ -49,9 +49,7 @@ int buffer_read(buffer_t *buffer, char *data, int len)
 
         last = block -> last;
         if (pos >= len) {
-            free(block -> data);
-            free(block);
-            continue;
+            break;
         }
 
         int n = ((len - pos) < block -> len) ? len - pos : block -> len;

src/buffer.c

@@ -1,4 +1,7 @@
-#include <pthread.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include "packet.h"
 #include "buffer.h"
 
 static buffer_t buffer;
@@ -17,3 +20,28 @@ int recv_buffer_read(char *data, int len)
 {
     return buffer_read(&buffer, data, len);
 }
+
+int64_t recv_file_buffer_read(int fd, int64_t *offset, int64_t size, int64_t blocksize)
+{
+    char data[PACKET_DATA_SIZE];
+    int retval = 0;
+    int len = 0;
+    int read;
+
+    if (fd < 0) return -1;
+
+    while (size > 0) {
+
+        read = buffer_read(&buffer, data, PACKET_DATA_SIZE);
+        if (read == 0) continue;
+
+        len = pwrite(fd, &data, PACKET_DATA_SIZE, *offset);
+        if (len < 1) return len;
+
+        *offset += len;
+        retval += len;
+        size -= len;
+    }
+
+    return retval;
+}

src/recv_buffer.c

@@ -1,4 +1,8 @@
-#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include "buffer.h"
 #include "packet.h"
 
@@ -66,3 +70,58 @@ int send_buffer_write(char *data, int len)
 
     return retval;
 }
+
+int64_t send_file_buffer_write(int fd, int64_t offset, int64_t size, int64_t blocksize)
+{
+
+    packet_t packet;
+
+    int retval;
+    int seqnum;
+    char buffer[PACKET_DATA_SIZE];
+    int boundary;
+    int len;
+
+    retval 		= 0;
+    seqnum 		= 2142894844;  /* TODO: generate random number */
+    boundary 	= PACKET_BOUNDARY_START;	
+
+    if (fd < 0) return -1;
+
+    while (size > 0)
+    {
+        len = pread(fd, buffer, PACKET_DATA_SIZE, offset);
+        if (len < 0) break;
+        retval += len;
+        size -= len;
+
+        boundary |= (size > 0) ? PACKET_BOUNDARY_NONE : PACKET_BOUNDARY_END;
+
+        packet_clear_header (packet);
+        packet_set_data     (packet);
+        packet_set_seqnum   (packet, seqnum++);
+        packet_set_boundary (packet, boundary);
+        packet_set_order    (packet, 1);
+        packet_set_msgnum   (packet, 1);
+        packet_set_timestamp(packet, 0x0000051c); /* TODO: calculate time */
+        packet_set_id       (packet, 0x08c42c74); /* TODO: generate an id */
+
+        packet_new(&packet, buffer, len);
+        send_packet_buffer_write(&packet);
+
+        boundary = PACKET_BOUNDARY_NONE;
+
+        offset += len;
+    }
+
+    packet_clear_header (packet);
+    packet_set_ctrl     (packet);
+    packet_set_type     (packet, PACKET_TYPE_ACK);
+    packet_set_timestamp(packet, 0x0000051c); /* TODO: calculate time */
+    packet_set_id       (packet, 0x08c42c74); /* TODO: generate an id */
+
+    packet_new(&packet, NULL, 0);
+    send_packet_buffer_write(&packet);
+
+    return retval;
+}