Changeset 82715 in vbox for trunk/src/VBox/Runtime/tools/RTFTPServer.cpp

Timestamp:

Jan 10, 2020 2:04:36 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: More protocol handling and callback work. bugref:9437

File:

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

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

@@ -23 +23 @@
  * You may elect to license modified versions of this file under the
  * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+/*
+ * Use this setup to best see what's going on:
+ *
+ *    VBOX_LOG=rt_ftp=~0
+ *    VBOX_LOG_DEST="nofile stderr"
+ *    VBOX_LOG_FLAGS="unbuffered enabled thread msprog"
+ *
  */
 
@@ -54 +63 @@
 
 /*********************************************************************************************************************************
+*   Definitations                                                                                                                *
+*********************************************************************************************************************************/
+typedef struct FTPSERVERDATA
+{
+    char szRootDir[RTPATH_MAX];
+    char szCWD[RTPATH_MAX];
+} FTPSERVERDATA;
+typedef FTPSERVERDATA *PFTPSERVERDATA;
+
+
+/*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
 /** Set by the signal handler when the FTP server shall be terminated. */
 static volatile bool  g_fCanceled  = false;
-static char          *g_pszRootDir = NULL;
+static FTPSERVERDATA  g_FTPServerData;
 
 
@@ -150 +170 @@
     RT_NOREF(pData, pcszUser);
 
-    RTPrintf("User '%s' connected", pcszUser);
+    RTPrintf("User '%s' connected\n", pcszUser);
 
     return VINF_SUCCESS;
@@ -159 +179 @@
     RT_NOREF(pData, pcszUser, pcszPassword);
 
-    RTPrintf("Authenticating user '%s' ...", pcszUser);
+    RTPrintf("Authenticating user '%s' ...\n", pcszUser);
 
     return VINF_SUCCESS;
@@ -168 +188 @@
     RT_NOREF(pData);
 
-    RTPrintf("User disconnected");
+    RTPrintf("User disconnected\n");
 
     return VINF_SUCCESS;
@@ -175 +195 @@
 static DECLCALLBACK(int) onPathSetCurrent(PRTFTPCALLBACKDATA pData, const char *pcszCWD)
 {
-    RT_NOREF(pData, pcszCWD);
+    PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
+    Assert(pData->cbUser == sizeof(FTPSERVERDATA));
 
     RTPrintf("Setting current directory to '%s'\n", pcszCWD);
 
-    return VINF_SUCCESS;
+    /** @todo BUGBUG Santiy checks! */
+
+    return RTStrCopy(pThis->szCWD, sizeof(pThis->szCWD), pcszCWD);
 }
 
 static DECLCALLBACK(int) onPathGetCurrent(PRTFTPCALLBACKDATA pData, char *pszPWD, size_t cbPWD)
 {
-    RT_NOREF(pData, pszPWD, cbPWD);
-
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) onList(PRTFTPCALLBACKDATA pData, void **ppvData, size_t *pcbData)
-{
-    RT_NOREF(pData, ppvData, pcbData);
+    PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
+    Assert(pData->cbUser == sizeof(FTPSERVERDATA));
+
+    RTPrintf("Current directory is: '%s'\n", pThis->szCWD);
+
+    RTStrPrintf(pszPWD, cbPWD, "%s", pThis->szCWD);
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) onPathUp(PRTFTPCALLBACKDATA pData)
+{
+    RT_NOREF(pData);
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) onList(PRTFTPCALLBACKDATA pData, const char *pcszPath, void **ppvData, size_t *pcbData)
+{
+    RT_NOREF(pData, pcszPath, ppvData, pcbData);
 
     return VINF_SUCCESS;
@@ -203 +238 @@
 
     /* Use some sane defaults. */
-    char     szAddress[64]         = "localhost";
-    uint16_t uPort                 = 2121;
+    char     szAddress[64] = "localhost";
+    uint16_t uPort         = 2121;
+
+    RT_ZERO(g_FTPServerData);
 
     /*
@@ -238 +275 @@
 
             case 'r':
-                g_pszRootDir = RTStrDup(ValueUnion.psz);
+                RTStrCopy(g_FTPServerData.szRootDir, sizeof(g_FTPServerData.szRootDir), ValueUnion.psz);
                 break;
 
@@ -273 +310 @@
     }
 
-    if (!g_pszRootDir)
-    {
-        char szRootDir[RTPATH_MAX];
-
+    if (!strlen(g_FTPServerData.szRootDir))
+    {
         /* By default use the current directory as serving root directory. */
-        rc = RTPathGetCurrent(szRootDir, sizeof(szRootDir));
+        rc = RTPathGetCurrent(g_FTPServerData.szRootDir, sizeof(g_FTPServerData.szRootDir));
         if (RT_FAILURE(rc))
             return RTMsgErrorExit(RTEXITCODE_FAILURE, "Retrieving current directory failed: %Rrc", rc);
-
-        g_pszRootDir = RTStrDup(szRootDir);
-        if (!g_pszRootDir)
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "Allocating current directory failed");
-    }
+    }
+
+    /* Initialize CWD. */
+    RTStrPrintf2(g_FTPServerData.szCWD, sizeof(g_FTPServerData.szCWD), "/");
 
     /* Install signal handler. */
@@ -296 +330 @@
         RTFTPSERVERCALLBACKS Callbacks;
         RT_ZERO(Callbacks);
+
+        Callbacks.pvUser                = &g_FTPServerData;
+        Callbacks.cbUser                = sizeof(g_FTPServerData);
+
         Callbacks.pfnOnUserConnect      = onUserConnect;
         Callbacks.pfnOnUserAuthenticate = onUserAuthenticate;
@@ -301 +339 @@
         Callbacks.pfnOnPathSetCurrent   = onPathSetCurrent;
         Callbacks.pfnOnPathGetCurrent   = onPathGetCurrent;
+        Callbacks.pfnOnPathUp           = onPathUp;
+        Callbacks.pfnOnList             = onList;
         Callbacks.pfnOnList             = onList;
 
@@ -308 +348 @@
         {
             RTPrintf("Starting FTP server at %s:%RU16 ...\n", szAddress, uPort);
-            RTPrintf("Root directory is '%s'\n", g_pszRootDir);
+            RTPrintf("Root directory is '%s'\n", g_FTPServerData.szRootDir);
 
             RTPrintf("Running FTP server ...\n");
@@ -336 +376 @@
     }
 
-    RTStrFree(g_pszRootDir);
-
     /* Set rcExit on failure in case we forgot to do so before. */
     if (RT_FAILURE(rc))