Changeset 82770 in vbox for trunk/include/iprt

Timestamp:

Jan 15, 2020 2:34:38 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: More work on data connection handling. bugref:9646

Location:

trunk/include/iprt

Files:

• err.h (modified) (1 diff)
• ftp.h (modified) (3 diffs)

trunk/include/iprt/err.h

@@ -2716 +2716 @@
 /** FTP initialization failed. */
 #define VERR_FTP_INIT_FAILED                                    (-26401)
+/** Data connection not found. */
+#define VERR_FTP_DATA_CONN_INIT_FAILED                          (-26402)
+/** Data connection not found. */
+#define VERR_FTP_DATA_CONN_NOT_FOUND                            (-26403)
+/** Data connection limit has been reached. */
+#define VERR_FTP_DATA_CONN_LIMIT_REACHED                        (-26404)
+/** Client not found. */
+#define VERR_FTP_CLIENT_NOT_FOUND                               (-26405)
+/** Client limit has been reached. */
+#define VERR_FTP_CLIENT_LIMIT_REACHED                           (-26406)
 /** @} */
 

trunk/include/iprt/ftp.h

@@ -134 +134 @@
     /** Closing data connection. */
     RTFTPSERVER_REPLY_CLOSING_DATA_CONN              = 226,
+    /** "PATHNAME" ok (created / exists). */
+    RTFTPSERVER_REPLY_PATHNAME_OK                    = 257,
     /** User logged in, proceed. */
     RTFTPSERVER_REPLY_LOGGED_IN_PROCEED              = 230,
@@ -165 +167 @@
 typedef struct RTFTPSERVERCLIENTSTATE
 {
-    /** User name. */
+    /** Authenticated user (name). If NULL, no user has been logged in (yet). */
     char                       *pszUser;
     /** Number of failed login attempts. */
@@ -300 +302 @@
      * Callback which gets invoked when the client wants to list a directory or file.
      *
+     * @returns VBox status code. VINF_EOF if listing is complete.
      * @param   pData           Pointer to generic callback data.
      * @param   pcszPath        Path of file / directory to list. Optional. If NULL, the current directory will be listed.
-     * @param   ppvData         Where to return the listing data. Must be free'd by the caller.
-     * @param   pcbvData        Where to return the listing data size in bytes.
-     * @returns VBox status code.
-     */
-    DECLCALLBACKMEMBER(int,  pfnOnList)(PRTFTPCALLBACKDATA pData, const char *pcszPath, void **ppvData, size_t *pcbData);
+     * @param   pvData          Buffer where to return the listing data.
+     * @param   cbData          Size (in bytes) of buffer where to return the listing data.
+     * @param   pcbRead         How many bytes were read.
+     */
+    DECLCALLBACKMEMBER(int,  pfnOnList)(PRTFTPCALLBACKDATA pData, const char *pcszPath, void *pvData, size_t cbData, size_t *pcbRead);
 } RTFTPSERVERCALLBACKS;
 /** Pointer to a FTP server callback data table. */