Changeset 82665 in vbox

Timestamp:

Jan 8, 2020 9:32:19 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: First commit of FTP server code, along with a tool to run a standalone server. Work in progress. bugref:9437

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• include/iprt/ftp.h (added)
• include/iprt/log.h (modified) (6 diffs)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/generic/ftp-server.cpp (added)
• src/VBox/Runtime/include/internal/magics.h (modified) (2 diffs)
• src/VBox/Runtime/tools/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/tools/RTFTPServer.cpp (added)

trunk/include/iprt/err.h

@@ -2710 +2710 @@
 /** @} */
 
+/** @name FTP status codes
+ * @{ */
+/** FTP Internal Server Error. */
+#define VERR_FTP_STATUS_SERVER_ERROR                            (-26400)
+/** FTP initialization failed. */
+#define VERR_FTP_INIT_FAILED                                    (-26401)
+/** @} */
+
 /* SED-END */
 

trunk/include/iprt/log.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2019 Oracle Corporation
+ * Copyright (C) 2006-2020 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
     RTLOGGROUP_FILE,
     RTLOGGROUP_FS,
+    RTLOGGROUP_FTP,
     RTLOGGROUP_HTTP,
     RTLOGGROUP_IOQUEUE,
@@ -90 +91 @@
  *         If anyone might be wondering what the alphabet looks like:
  *              a b c d e f g h i j k l m n o p q r s t u v w x y z
+ *
+ * The RT_XX log group names are placeholders for new modules being added,
+ * to make sure that there always is a total of 32 log group entries.
  */
 #define RT_LOGGROUP_NAMES \
@@ -99 +103 @@
     "RT_FILE", \
     "RT_FS", \
+    "RT_FTP", \
     "RT_HTTP", \
     "RT_IOQUEUE", \
@@ -111 +116 @@
     "RT_TIMER", \
     "RT_VFS", \
-    "RT_19", \
     "RT_20", \
     "RT_21", \
@@ -123 +127 @@
     "RT_29", \
     "RT_30", \
-    "RT_ZIP"  \
+    "RT_ZIP"
 
 

trunk/include/iprt/mangling.h

@@ -11 +11 @@
 
 /*
- * Copyright (C) 2011-2019 Oracle Corporation
+ * Copyright (C) 2011-2020 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1035 +1035 @@
 # define RTFsIsoMakerCmdEx                              RT_MANGLER(RTFsIsoMakerCmdEx)
 # define RTFsNtfsVolOpen                                RT_MANGLER(RTFsNtfsVolOpen)
+# define RTFTPServerCreate                              RT_MANGLER(RTFTPServerCreate)
+# define RTFTPServerDestroy                             RT_MANGLER(RTFTPServerDestroy)
 # define RTFuzzCmdMaster                                RT_MANGLER(RTFuzzCmdMaster)
 # define RTFuzzCtxCfgGetBehavioralFlags                 RT_MANGLER(RTFuzzCtxCfgGetBehavioralFlags)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2019 Oracle Corporation
+# Copyright (C) 2006-2020 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -674 +674 @@
         generic/critsectrw-generic.cpp \
         generic/env-generic.cpp \
+        generic/ftp-server.cpp \
         generic/RTDirCreateUniqueNumbered-generic.cpp \
         generic/RTEnvDupEx-generic.cpp \

trunk/src/VBox/Runtime/include/internal/magics.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2019 Oracle Corporation
+ * Copyright (C) 2007-2020 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -84 +84 @@
 /** The value of RTFILEAIOREQINT::u32Magic. (Stephen Edwin King)  */
 #define RTFILEAIOREQ_MAGIC              UINT32_C(0x19470921)
+/** The magic value for RTFTPSERVERINTERNAL::u32Magic. */
+#define RTFTPSERVER_MAGIC               UINT32_C(0xfeed0004) /**< @todo find a value */
+/** The value of RTFTPSERVERINTERNAL::u32Magic after close. */
+#define RTFTPSERVER_MAGIC_DEAD          (~RTFTPSERVER_MAGIC)
 /** The value of RTENVINTERNAL::u32Magic. (Rumiko Takahashi) */
 #define RTENV_MAGIC                     UINT32_C(0x19571010)

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2019 Oracle Corporation
+# Copyright (C) 2006-2020 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -131 +131 @@
  RTLdrFlt_SOURCES = RTLdrFlt.cpp
 
+ # RTFTPServer implements a simple FTP server.
+ PROGRAMS += RTFTPServer
+ RTFTPServer_TEMPLATE = VBoxR3Tool
+ RTFTPServer_SOURCES = RTFTPServer.cpp
+
  # RTGzip - our gzip clone (for testing the gzip/gunzip streaming code)
  PROGRAMS += RTGzip