KangLin/tigervnc fd32c28515c83ec3db6b812f2ee8f5fbbcf29b33

common/os/Mutex.cxx

@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef WIN32
 #include <windows.h>
 #else

common/os/Thread.cxx

@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef WIN32
 #include <windows.h>
 #else
@@ -46,6 +50,12 @@ Thread::~Thread()
 {
 #ifdef WIN32
   delete (HANDLE*)threadId;
+#elif ANDROID
+    if (isRunning()) {
+        // See: https://github.com/Hax4us/Hax4us.github.io/blob/master/Pthread_patches/Bpthread.h
+        pthread_kill(*(pthread_t*)threadId, SIGUSR1);
+    }
+    delete (pthread_t*)threadId;
 #else
   if (isRunning())
     pthread_cancel(*(pthread_t*)threadId);

common/rdr/CMakeLists.txt

@@ -43,7 +43,6 @@ set(RDR_HEADS
     ${CMAKE_CURRENT_SOURCE_DIR}/TLSOutStream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ZlibInStream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ZlibOutStream.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/types.h
     )
 
 set(RDR_LIBRARIES ${ZLIB_LIBRARIES})

common/rdr/FdOutStream.cxx

@@ -44,7 +44,6 @@
 #include <sys/select.h>
 #endif
 
-#include <os/os.h>
 #include <rdr/FdOutStream.h>
 #include <rdr/Exception.h>
 #include <rfb/util.h>

common/rdr/FileInStream.cxx

@@ -18,6 +18,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 
 #include <rdr/Exception.h>

common/rdr/HexInStream.cxx

@@ -17,10 +17,14 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <algorithm>
 #include <rdr/HexInStream.h>
 #include <rdr/Exception.h>
 #include <rfb/util.h>
-#include <algorithm>
 
 using namespace rdr;
 
@@ -32,11 +36,10 @@ HexInStream::HexInStream(InStream& is)
 HexInStream::~HexInStream() {
 }
 
-
 bool HexInStream::fillBuffer() {
   if (!in_stream.hasData(2))
     return false;
-  
+
   size_t length = std::min(in_stream.avail()/2, availSpace());
   const uint8_t* iptr = in_stream.getptr(length*2);
 

common/rdr/HexOutStream.cxx

@@ -20,10 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
+#include <algorithm>
 #include <rdr/HexOutStream.h>
 #include <rfb/util.h>
-#include <algorithm>
 
 using namespace rdr;
 
@@ -40,7 +39,7 @@ bool HexOutStream::flushBuffer()
 {
   while (sentUpTo != ptr) {
     uint8_t* optr = out_stream.getptr(2);
-    size_t length = std::min(ptr-sentUpTo, (int64_t)out_stream.avail()/2);
+    size_t length = std::min((size_t)(ptr-sentUpTo), out_stream.avail()/2);
 
     for (size_t i=0; i<length; i++)
       rfb::binToHex(&sentUpTo[i], 1, (char*)&optr[i*2], 2);
@@ -63,4 +62,3 @@ void HexOutStream::cork(bool enable)
   BufferedOutStream::cork(enable);
   out_stream.cork(enable);
 }
-

common/rdr/RandomStream.cxx

@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <rdr/RandomStream.h>
 #include <rdr/Exception.h>
 #include <rfb/LogWriter.h>

common/rdr/RandomStream.h

@@ -22,9 +22,8 @@
 #include <stdio.h>
 #include <rdr/BufferedInStream.h>
 
-#include <os/os.h>
-
 #ifdef WIN32
+#include <windows.h>
 #include <wincrypt.h>
 #ifdef WINCRYPT32API
 #define RFB_HAVE_WINCRYPT

common/rdr/ZlibInStream.cxx

@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 
 #include <rdr/ZlibInStream.h>

common/rfb/Blacklist.cxx

@@ -15,6 +15,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  * USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <rfb/Blacklist.h>
 #include <rfb/Configuration.h>
 

common/rfb/CConnection.cxx

@@ -16,6 +16,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  * USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
@@ -327,7 +332,7 @@ bool CConnection::processSecurityResultMsg()
 
   if (server.beforeVersion(3,8)) {
     state_ = RFBSTATE_INVALID;
-    throw AuthFailureException();
+    throw AuthFailureException("Authentication failed");
   }
 
   state_ = RFBSTATE_SECURITY_REASON;

common/rfb/CConnection.h

@@ -37,6 +37,18 @@ namespace rfb {
   class CSecurity;
   class IdentityVerifier;
 
+  enum class MsgBoxFlags{
+      M_OK = 0,
+      M_OKCANCEL = 1,
+      M_YESNO = 4,
+      M_ICONERROR = 0x10,
+      M_ICONQUESTION = 0x20,
+      M_ICONWARNING = 0x30,
+      M_ICONINFORMATION = 0x40,
+      M_DEFBUTTON1 = 0,
+      M_DEFBUTTON2 = 0x100
+  };
+
   class CConnection : public CMsgHandler {
   public:
 
@@ -75,16 +87,11 @@ namespace rfb {
     // there is data to read on the InStream.
     void initialiseProtocol();
 
-    // processMsg() should be called whenever there is either:
-    // - data available on the underlying network stream
-    //   In this case, processMsg may return without processing an RFB message,
-    //   if the available data does not result in an RFB message being ready
-    //   to handle. e.g. if data is encrypted.
-    // NB: This makes it safe to call processMsg() in response to select()
-    // - data available on the CConnection's current InStream
-    //   In this case, processMsg should always process the available RFB
-    //   message before returning.
-    // NB: In either case, you must have called initialiseProtocol() first.
+    // processMsg() should be called whenever there is data available on
+    // the CConnection's current InStream. It will process at most one
+    // RFB message before returning. If there was insufficient data,
+    // then it will return false and should be called again once more
+    // data is available.
     bool processMsg();
 
     // close() gracefully shuts down the connection to the server and
@@ -126,7 +133,20 @@ namespace rfb {
 
 
     // Methods to be overridden in a derived class
-
+
+    // getUserPasswd gets the username and password.  This might involve a
+    // dialog, getpass(), etc.  The user buffer pointer can be null, in which
+    // case no user name will be retrieved.
+    virtual void getUserPasswd(bool secure, std::string* user,
+                               std::string* password) = 0;
+    /*!
+     * Get x509 authentication CA and CRL file, the file format is pem.
+     * \param ca: certificate authority, the file format is pem.
+     * \param crl: certificate revocation list, the file format is pem.
+     */
+    virtual int getX509File(std::string* ca, std::string* crl) = 0;
+    virtual bool showMsgBox(MsgBoxFlags flags, const char *title, const char *text) = 0;
+
     // authSuccess() is called when authentication has succeeded.
     virtual void authSuccess();
 

common/rfb/CMakeLists.txt

@@ -160,7 +160,6 @@ set(RFB_HEADS ${RFB_HEADS}
     ${CMAKE_CURRENT_SOURCE_DIR}/Exception.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Hostname.h
     ${CMAKE_CURRENT_SOURCE_DIR}/UserMsgBox.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/InputHandler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/obfuscate.h
     )
 
@@ -183,7 +182,7 @@ endif(WIN32)
 
 set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY})
 
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT ANDROID)
     list(APPEND RFB_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/UnixPasswordValidator.cxx)
     list(APPEND RFB_HEADS
@@ -232,19 +231,20 @@ if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE")
         ${CMAKE_CURRENT_SOURCE_DIR}/H264WinDecoderContext.cxx)
   endif()
 endif()
-set(RabbitVNC_INCLUDE_DIR ${RabbitVNC_INCLUDE_DIR}
+
+set(TIGERVNC_INCLUDE_DIR ${TIGERVNC_INCLUDE_DIR}
     ${RFB_INCLUDE_DIR}
     PARENT_SCOPE)
 
-set(RabbitVNC_SOURCES ${RabbitVNC_SOURCES}
+set(TIGERVNC_SOURCES ${TIGERVNC_SOURCES}
     ${RFB_SOURCES}
     PARENT_SCOPE)
 
-set(RabbitVNC_HEADS ${RabbitVNC_HEADS}
+set(TIGERVNC_HEADS ${TIGERVNC_HEADS}
     ${RFB_HEADS}
     PARENT_SCOPE)
 
-set(RabbitVNC_LIBS ${RabbitVNC_LIBS}
+set(TIGERVNC_LIBS ${TIGERVNC_LIBS}
     ${RFB_LIBRARIES}
     PARENT_SCOPE)
 

common/rfb/CMsgHandler.cxx

@@ -16,6 +16,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  * USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #include <rfb/Exception.h>
@@ -54,11 +59,6 @@ void CMsgHandler::setExtendedDesktopSize(unsigned reason, unsigned result,
   server.setDimensions(width, height, layout);
 }
 
-void CMsgHandler::setPixelFormat(const PixelFormat& pf)
-{
-  server.setPF(pf);
-}
-
 void CMsgHandler::setName(const char* name)
 {
   server.setName(name);