Changeset 82842 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 23, 2020 10:16:23 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: Retrieving files in sub directories also works now. bugref:9646

Location:

trunk/src/VBox/Runtime

Files:

• generic/ftp-server.cpp (modified) (1 diff)
• tools/RTFTPServer.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/ftp-server.cpp

@@ -2035 +2035 @@
     if (RT_SUCCESS(rc))
     {
-        if (pClient->pDataConn)
+        if (RT_SUCCESS(rc))
         {
-            /* Note: Data connection gets created when the PORT command was sent. */
-            rc = rtFtpServerDataConnStart(pClient->pDataConn, rtFtpServerDataConnFileWriteThread, cArgs, apcszArgs);
-            if (RT_SUCCESS(rc))
-                rc = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_FILE_STS_OK_OPENING_DATA_CONN);
+            if (pClient->pDataConn == NULL)
+            {
+                rc = rtFtpServerDataConnCreate(pClient, &pClient->pDataConn);
+                if (RT_SUCCESS(rc))
+                    rc = rtFtpServerDataConnStart(pClient->pDataConn, rtFtpServerDataConnFileWriteThread, cArgs, apcszArgs);
+
+                int rc2 = rtFtpServerSendReplyRc(  pClient, RT_SUCCESS(rc)
+                                                 ? RTFTPSERVER_REPLY_DATACONN_ALREADY_OPEN
+                                                 : RTFTPSERVER_REPLY_CANT_OPEN_DATA_CONN);
+                AssertRC(rc2);
+            }
+            else
+            {
+                 int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_DATACONN_ALREADY_OPEN);
+                 AssertRC(rc2);
+            }
         }
         else
-            rc = VERR_FTP_DATA_CONN_NOT_FOUND;
+        {
+            int rc2 = rtFtpServerSendReplyRc(pClient, RTFTPSERVER_REPLY_CONN_REQ_FILE_ACTION_NOT_TAKEN);
+            AssertRC(rc2);
+        }
     }
 

trunk/src/VBox/Runtime/tools/RTFTPServer.cpp

@@ -212 +212 @@
     Assert(pData->cbUser == sizeof(FTPSERVERDATA));
 
-    return RTFileOpen(&pThis->hFile, pcszPath, fMode);
+    char *pszPathAbs = NULL;
+    if (RTStrAPrintf(&pszPathAbs, "%s/%s", pThis->szPathRootAbs, pcszPath) <= 0)
+        return VERR_NO_MEMORY;
+
+    int rc = RTFileOpen(&pThis->hFile, pszPathAbs, fMode);
+
+    RTStrFree(pszPathAbs);
+
+    return rc;
 }