Changes in protocols/ft.h [dce3903:2c2df7d]

File:

• protocols/ft.h (modified) (4 diffs)

protocols/ft.h

@@ -27 +27 @@
 #define _FT_H
 
-/*
- * One buffer is needed for each transfer. The receiver stores a message
- * in it and gives it to the sender. The sender will stall the receiver
- * till the buffer has been sent out.
- */
-#define FT_BUFFER_SIZE 2048
-
 typedef enum {
         FT_STATUS_LISTENING     = 1,
-        FT_STATUS_TRANSFERRING  = 2,
+        FT_STATUS_TRANSFERING   = 2,
         FT_STATUS_FINISHED      = 4,
-        FT_STATUS_CANCELED      = 8,
-        FT_STATUS_CONNECTING    = 16
+        FT_STATUS_CANCELED      = 8
 } file_status_t;
 
@@ -69 +61 @@
  */
 typedef struct file_transfer {
-
-        /* Are we sending something? */
-        int sending;
-
         /*
          * The current status of this file transfer.
@@ -138 +126 @@
         
         /*
-         * called by the sending side to indicate that it is writable.
-         * The callee should check if data is available and call the 
-         * function(as seen below) if that is the case.
+         * If set, called when the transfer queue is running empty and
+         * more data can be added.
          */
-        gboolean (*write_request) ( struct file_transfer *file );
-
-        /*
-         * When sending files, protocols register this function to receive data.
-         * This should only be called once after write_request is called. The caller
-         * should not read more data until write_request is called again. This technique
-         * avoids buffering.
-         */
-        gboolean (*write) (struct file_transfer *file, char *buffer, unsigned int len );
-
-        /* The send buffer associated with this transfer.
-         * Since receivers always wait for a write_request call one is enough.
-         */
-        char buffer[FT_BUFFER_SIZE];
+        void (*out_of_data) ( struct file_transfer *file );
 
 } file_transfer_t;
@@ -170 +144 @@
 void imcb_file_canceled( file_transfer_t *file, char *reason );
 
-gboolean imcb_file_recv_start( file_transfer_t *ft );
+/*
+ * The given buffer is queued for transfer and MUST NOT be freed by the caller.
+ * When the method returns false the caller should not invoke this method again
+ * until out_of_data has been called.
+ */
+gboolean imcb_file_write( file_transfer_t *file, gpointer data, size_t data_size );
+
 #endif