Changeset 87004 in vbox

Timestamp:

Nov 27, 2020 4:18:47 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141574

Message:

Shared Clipboard/Transfers: Initial commit for HTTP server. Work in progress. bugref:9874

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• include/iprt/http-common.h (added)
• include/iprt/http-server.h (added)
• include/iprt/http.h (modified) (2 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• src/VBox/Runtime/common/rest/RTCRestClientApiBase.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (1 diff)
• src/VBox/Runtime/include/internal/magics.h (modified) (2 diffs)
• src/VBox/Runtime/r3/http-server.cpp (added)
• src/VBox/Runtime/tools/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/tools/RTHttpServer.cpp (added)

trunk/include/VBox/VBoxGuestLib.h

@@ -625 +625 @@
     uint32_t                    cParmsRecived;
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    /** Data related to Shared Clipboard file transfers. */
     VBGLR3SHCLTRANSFERCMDCTX    Transfers;
 # endif

trunk/include/iprt/http.h

@@ -32 +32 @@
 
 #include <iprt/types.h>
+#include <iprt/http-common.h>
 
 RT_C_DECLS_BEGIN
@@ -206 +207 @@
  */
 RTR3DECL(int) RTHttpGetFile(RTHTTP hHttp, const char *pszUrl, const char *pszDstFile);
-
-/** HTTP methods. */
-typedef enum RTHTTPMETHOD
-{
-    RTHTTPMETHOD_INVALID = 0,
-    RTHTTPMETHOD_GET,
-    RTHTTPMETHOD_PUT,
-    RTHTTPMETHOD_POST,
-    RTHTTPMETHOD_PATCH,
-    RTHTTPMETHOD_DELETE,
-    RTHTTPMETHOD_HEAD,
-    RTHTTPMETHOD_OPTIONS,
-    RTHTTPMETHOD_TRACE,
-    RTHTTPMETHOD_END,
-    RTHTTPMETHOD_32BIT_HACK = 0x7fffffff
-} RTHTTPMETHOD;
-
-/**
- * Returns the name of the HTTP method.
- * @returns Read only string.
- * @param   enmMethod       The HTTP method to name.
- */
-RTR3DECL(const char *) RTHttpMethodName(RTHTTPMETHOD enmMethod);
 
 /**

trunk/include/iprt/mangling.h

@@ -1174 +1174 @@
 # define RTHttpSetFollowRedirects                       RT_MANGLER(RTHttpSetFollowRedirects)
 # define RTHttpGetVerifyPeer                            RT_MANGLER(RTHttpGetVerifyPeer)
+# define RTHttpHeaderListInit                           RT_MANGLER(RTHttpHeaderListInit)
+# define RTHttpHeaderListDestroy                        RT_MANGLER(RTHttpHeaderListDestroy)
+# define RTHttpHeaderListSet                            RT_MANGLER(RTHttpHeaderListSet)
+# define RTHttpHeaderListAddRaw                         RT_MANGLER(RTHttpHeaderListAddRaw)
+# define RTHttpHeaderListAdd                            RT_MANGLER(RTHttpHeaderListAdd)
+# define RTHttpHeaderListGet                            RT_MANGLER(RTHttpHeaderListGet)
+# define RTHttpHeaderListGetCount                       RT_MANGLER(RTHttpHeaderListGetCount)
+# define RTHttpHeaderListGetByOrdinal                   RT_MANGLER(RTHttpHeaderListGetByOrdinal)
+# define RTHttpMethodToStr                              RT_MANGLER(RTHttpMethodToStr)
 # define RTHttpSetVerifyPeer                            RT_MANGLER(RTHttpSetVerifyPeer)
 # define RTHttpUseSystemProxySettings                   RT_MANGLER(RTHttpUseSystemProxySettings)
+# define RTHttpServerCreate                             RT_MANGLER(RTHttpServerCreate)
+# define RTHttpServerDestroy                            RT_MANGLER(RTHttpServerDestroy)
+# define RTHttpStatusToStr                              RT_MANGLER(RTHttpStatusToStr)
 # define RTIniFileCreateFromVfsFile                     RT_MANGLER(RTIniFileCreateFromVfsFile)
 # define RTIniFileRetain                                RT_MANGLER(RTIniFileRetain)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -80 +80 @@
  #
  ifndef VBOX_ONLY_EXTPACKS
-  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+  #include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  endif
  include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
@@ -697 +697 @@
         generic/critsectrw-generic.cpp \
         generic/env-generic.cpp \
+        generic/http.cpp \
         generic/RTDirCreateUniqueNumbered-generic.cpp \
         generic/RTEnvDupEx-generic.cpp \
@@ -730 +731 @@
         r3/fs.cpp \
         r3/ftp-server.cpp \
+        r3/http-server.cpp \
         r3/init.cpp \
         r3/memsafer-r3.cpp \

trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBase.cpp

@@ -196 +196 @@
                                  RTCRestClientResponseBase *a_pResponse, const char *a_pszMethod, uint32_t a_fFlags) RT_NOEXCEPT
 {
-    LogFlow(("doCall: %s %s\n", a_pszMethod, RTHttpMethodName(a_enmHttpMethod)));
+    LogFlow(("doCall: %s %s\n", a_pszMethod, RTHttpMethodToStr(a_enmHttpMethod)));
 
 

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -3832 +3832 @@
 
 
-RTR3DECL(const char *) RTHttpMethodName(RTHTTPMETHOD enmMethod)
-{
-    switch (enmMethod)
-    {
-        case RTHTTPMETHOD_INVALID:  return "invalid";
-        case RTHTTPMETHOD_GET:      return "GET";
-        case RTHTTPMETHOD_PUT:      return "PUT";
-        case RTHTTPMETHOD_POST:     return "POST";
-        case RTHTTPMETHOD_PATCH:    return "PATCH";
-        case RTHTTPMETHOD_DELETE:   return "DELETE";
-        case RTHTTPMETHOD_HEAD:     return "HEAD";
-        case RTHTTPMETHOD_OPTIONS:  return "OPTIONS";
-        case RTHTTPMETHOD_TRACE:    return "TRACE";
-
-        case RTHTTPMETHOD_END:
-        case RTHTTPMETHOD_32BIT_HACK:
-            break;
-    }
-    return "unknown";
-}
-
-
 /*********************************************************************************************************************************
 *   Callback APIs.                                                                                                               *

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

@@ -85 +85 @@
 #define RTFILEAIOREQ_MAGIC              UINT32_C(0x19470921)
 /** The magic value for RTFTPSERVERINTERNAL::u32Magic. */
-#define RTFTPSERVER_MAGIC               UINT32_C(0xfeed0004) /**< @todo find a value */
+#define RTFTPSERVER_MAGIC               UINT32_C(0x20170610)
 /** The value of RTFTPSERVERINTERNAL::u32Magic after close. */
 #define RTFTPSERVER_MAGIC_DEAD          (~RTFTPSERVER_MAGIC)
+/** The magic value for RTFTPSERVERINTERNAL::u32Magic. */
+#define RTHTTPSERVER_MAGIC              UINT32_C(0x20200602)
+/** The value for RTFTPSERVERINTERNAL::u32Magic after close. */
+#define RTHTTPSERVER_MAGIC_DEAD         (~RTHTTPSERVER_MAGIC)
 /** The value of RTENVINTERNAL::u32Magic. (Rumiko Takahashi) */
 #define RTENV_MAGIC                     UINT32_C(0x19571010)
@@ -104 +108 @@
 /** The value of RTHTTPINTERNAL::u32Magic after close. */
 #define RTHTTP_MAGIC_DEAD               UINT32_C(0x19120330)
+/** The magic value for RTHTTPHEADERLISTINTERNAL::u32Magic. (Ken Follett) */
+#define RTHTTPHEADERLIST_MAGIC          UINT32_C(0x19490605)
+/** The value of RTHTTPHEADERLISTINTERNAL::u32Magic after close. */
+#define RTHTTPHEADERLIST_MAGIC_DEAD     (~RTHTTPHEADERLIST_MAGIC)
 /** The value of RTINIFILEINT::u32Magic. (Jane Austen) */
 #define RTINIFILE_MAGIC                 UINT32_C(0x17751216)

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

@@ -158 +158 @@
  endif
 
+ # RTHttpServer implements a simple HTTP server.
+ PROGRAMS += RTHttpServer
+ RTHttpServer_TEMPLATE = VBoxR3Tool
+ RTHttpServer_SOURCES = RTHttpServer.cpp
+
  # RTLdrCheckImports - import checker.
  PROGRAMS += RTLdrCheckImports