Changeset 82843 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

IPRT/tools/FTPServer: Implemented VFS support for files also. bugref:9646

File:

• trunk/src/VBox/Runtime/tools/RTFTPServer.cpp (modified) (11 diffs)

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

@@ -73 +73 @@
     /** The relative current working directory (CWD) to szRootDir. */
     char szCWD[RTPATH_MAX];
-    RTFILE hFile;
 } FTPSERVERDATA;
 typedef FTPSERVERDATA *PFTPSERVERDATA;
 
-typedef struct FTPDIRHANDLE
-{
-    /** The VFS (chain) handle to use for this directory. */
-    RTVFSDIR hVfsDir;
-} FTPDIRHANDLE;
-typedef FTPDIRHANDLE *PFTPDIRHANDLE;
+/**
+ * Enumeration specifying the VFS handle type of the FTP server.
+ */
+typedef enum FTPSERVERVFSHANDLETYPE
+{
+    FTPSERVERVFSHANDLETYPE_INVALID    = 0,
+    FTPSERVERVFSHANDLETYPE_FILE,
+    FTPSERVERVFSHANDLETYPE_DIR,
+    /** The usual 32-bit hack. */
+    FTPSERVERVFSHANDLETYPE_32BIT_HACK = 0x7fffffff
+} FTPSERVERVFSHANDLETYPE;
+
+/**
+ * Structure for keeping a VFS handle of the FTP server.
+ */
+typedef struct FTPSERVERVFSHANDLE
+{
+    /** The type of the handle, stored in the union below. */
+    FTPSERVERVFSHANDLETYPE enmType;
+    union
+    {
+        /** The VFS (chain) handle to use for this file. */
+        RTVFSFILE hVfsFile;
+        /** The VFS (chain) handle to use for this directory. */
+        RTVFSDIR  hVfsDir;
+    } u;
+} FTPSERVERVFSHANDLE;
+typedef FTPSERVERVFSHANDLE *PFTPSERVERVFSHANDLE;
 
 
@@ -207 +228 @@
 static DECLCALLBACK(int) onFileOpen(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint32_t fMode, void **ppvHandle)
 {
-    RT_NOREF(ppvHandle);
-
     PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
     Assert(pData->cbUser == sizeof(FTPSERVERDATA));
+
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)RTMemAllocZ(sizeof(FTPSERVERVFSHANDLE));
+    if (!pHandle)
+        return VERR_NO_MEMORY;
 
     char *pszPathAbs = NULL;
@@ -216 +239 @@
         return VERR_NO_MEMORY;
 
-    int rc = RTFileOpen(&pThis->hFile, pszPathAbs, fMode);
+    int rc = RTVfsChainOpenFile(pszPathAbs, fMode, &pHandle->u.hVfsFile, NULL /*poffError */, NULL /* pErrInfo */);
+    if (RT_SUCCESS(rc))
+    {
+        pHandle->enmType = FTPSERVERVFSHANDLETYPE_FILE;
+
+        *ppvHandle = pHandle;
+    }
+    else
+        RTMemFree(pHandle);
 
     RTStrFree(pszPathAbs);
@@ -225 +256 @@
 static DECLCALLBACK(int) onFileRead(PRTFTPCALLBACKDATA pData, void *pvHandle, void *pvBuf, size_t cbToRead, size_t *pcbRead)
 {
-    RT_NOREF(pvHandle);
-
-    PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
-    Assert(pData->cbUser == sizeof(FTPSERVERDATA));
-
-    return RTFileRead(pThis->hFile, pvBuf, cbToRead, pcbRead);
+    RT_NOREF(pData);
+
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)pvHandle;
+    AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
+    AssertReturn(pHandle->enmType == FTPSERVERVFSHANDLETYPE_FILE, VERR_INVALID_PARAMETER);
+
+    return RTVfsFileRead(pHandle->u.hVfsFile, pvBuf, cbToRead, pcbRead);
 }
 
 static DECLCALLBACK(int) onFileClose(PRTFTPCALLBACKDATA pData, void *pvHandle)
 {
-    RT_NOREF(pvHandle);
-
-    PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
-    Assert(pData->cbUser == sizeof(FTPSERVERDATA));
-
-    int rc = RTFileClose(pThis->hFile);
+    RT_NOREF(pData);
+
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)pvHandle;
+    AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
+    AssertReturn(pHandle->enmType == FTPSERVERVFSHANDLETYPE_FILE, VERR_INVALID_PARAMETER);
+
+    int rc = RTVfsFileRelease(pHandle->u.hVfsFile);
     if (RT_SUCCESS(rc))
     {
-        pThis->hFile = NIL_RTFILE;
+        RTMemFree(pvHandle);
+        pvHandle = NULL;
     }
 
@@ -342 +376 @@
     Assert(pData->cbUser == sizeof(FTPSERVERDATA));
 
-    PFTPDIRHANDLE pHandle = (PFTPDIRHANDLE)RTMemAllocZ(sizeof(FTPDIRHANDLE));
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)RTMemAllocZ(sizeof(FTPSERVERVFSHANDLE));
     if (!pHandle)
         return VERR_NO_MEMORY;
@@ -353 +387 @@
     RTPrintf("Opening directory '%s'\n", pszPathAbs);
 
-    int rc = RTVfsChainOpenDir(pszPathAbs, 0 /*fFlags*/, &pHandle->hVfsDir, NULL /* poffError */, NULL /* pErrInfo */);
+    int rc = RTVfsChainOpenDir(pszPathAbs, 0 /*fFlags*/, &pHandle->u.hVfsDir, NULL /* poffError */, NULL /* pErrInfo */);
     if (RT_SUCCESS(rc))
     {
+        pHandle->enmType = FTPSERVERVFSHANDLETYPE_DIR;
+
         *ppvHandle = pHandle;
     }
@@ -372 +408 @@
     RT_NOREF(pData);
 
-    PFTPDIRHANDLE pHandle = (PFTPDIRHANDLE)pvHandle;
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)pvHandle;
     AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
-
-    RTVfsDirRelease(pHandle->hVfsDir);
+    AssertReturn(pHandle->enmType == FTPSERVERVFSHANDLETYPE_DIR, VERR_INVALID_PARAMETER);
+
+    RTVfsDirRelease(pHandle->u.hVfsDir);
 
     RTMemFree(pHandle);
@@ -389 +426 @@
     RT_NOREF(ppszTarget); /* No symlinks yet */
 
-    PFTPDIRHANDLE pHandle = (PFTPDIRHANDLE)pvHandle;
+    PFTPSERVERVFSHANDLE pHandle = (PFTPSERVERVFSHANDLE)pvHandle;
     AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
+    AssertReturn(pHandle->enmType == FTPSERVERVFSHANDLETYPE_DIR, VERR_INVALID_PARAMETER);
 
     size_t          cbDirEntryAlloced = sizeof(RTDIRENTRYEX);
@@ -402 +440 @@
     {
         size_t cbDirEntry = cbDirEntryAlloced;
-        rc = RTVfsDirReadEx(pHandle->hVfsDir, pDirEntry, &cbDirEntry, RTFSOBJATTRADD_UNIX);
+        rc = RTVfsDirReadEx(pHandle->u.hVfsDir, pDirEntry, &cbDirEntry, RTFSOBJATTRADD_UNIX);
         if (RT_FAILURE(rc))
         {
@@ -422 +460 @@
             {
                 RTFSOBJINFO OwnerInfo;
-                rc = RTVfsDirQueryPathInfo(pHandle->hVfsDir,
+                rc = RTVfsDirQueryPathInfo(pHandle->u.hVfsDir,
                                            pDirEntry->szName, &OwnerInfo, RTFSOBJATTRADD_UNIX_OWNER, RTPATH_F_ON_LINK);
                 if (   RT_SUCCESS(rc)
@@ -437 +475 @@
             {
                 RTFSOBJINFO GroupInfo;
-                rc = RTVfsDirQueryPathInfo(pHandle->hVfsDir,
+                rc = RTVfsDirQueryPathInfo(pHandle->u.hVfsDir,
                                            pDirEntry->szName, &GroupInfo, RTFSOBJATTRADD_UNIX_GROUP, RTPATH_F_ON_LINK);
                 if (   RT_SUCCESS(rc)