Refactor ssl backends (#391)

Author: halx99

CHANGELOG.md

@@ -5,6 +5,10 @@ yasio-3.39.7
       - Use `event->packet_view()` receive packet event
       - No upack
       - No deferred event
+  2. Refactor ssl backends, add follow new option and channel kind
+ 
+      - `YOPT_S_SSL_CERT`: to specific ssl server `cert` and `private_key` files
+      - `YCK_SSL_SERVER`: open a channel as ssl server, notes: require specific valid `cert` and `private_key` file with option `YOPT_S_SSL_CERT`
 
 
 yasio-3.39.6

CMakeLists.txt

@@ -21,6 +21,33 @@ option(YASIO_BUILD_TESTS "Build yasio tests and examples" ON)
 option(YASIO_BUILD_LUA_EXAMPLE "Build yasio lua example" ON)
 option(YAISO_BUILD_NI "Build yasio with native interface for interop" OFF)
 
+
+# --- The C/C++ standard
+if (NOT MSVC)
+    if (NOT CXX_STD)
+        set(CXX_STD 11)
+    endif()
+    set(CMAKE_CXX_STANDARD ${CXX_STD})
+else()
+    if (CXX_STD)
+        set(CMAKE_CXX_STANDARD ${CXX_STD})
+    else()
+        include(CheckCXXCompilerFlag)
+        check_cxx_compiler_flag("/std:c++latest" YASIO_HAVE_CXX_LATEST)
+        if (YASIO_HAVE_CXX_LATEST)
+            set(CXX_STD latest)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest")
+        else()
+            set(CXX_STD 11)
+        endif()
+    endif()
+endif()
+
+set (CMAKE_C_STANDARD 99)
+set (CMAKE_C_STANDARD_REQUIRED ON)
+
+message(STATUS "Building yasio with C++${CXX_STD} support")
+
 function(yasio_config_target_outdir target)
     set_target_properties(${target} PROPERTIES
         ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
@@ -60,23 +87,6 @@ if (NOT DEFINED YASIO_HAVE_HALF_FLOAT)
     set(YASIO_HAVE_HALF_FLOAT ON)
 endif()
 
-# --- The C++ standard
-if (NOT MSVC)
-    if (NOT CXX_STD)
-        set(CXX_STD 11)
-    endif()
-    set(CMAKE_CXX_STANDARD ${CXX_STD})
-else()
-    if (CXX_STD)
-        set(CMAKE_CXX_STANDARD ${CXX_STD})
-    else()
-        set(CXX_STD latest)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest")
-    endif()
-endif()
-
-message(STATUS "Building yasio with C++${CXX_STD} support")
-
 # The compiler flags
 if(BUILD_SHARED_LIBS AND LINUX)
    set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wall -fPIC")
@@ -129,7 +139,7 @@ if (YASIO_HAVE_CARES)
 endif()
 
 ### The yasio core library project
-file(GLOB_RECURSE YASIO_CORE yasio/detail/*.hpp)
+file(GLOB_RECURSE YASIO_CORE yasio/detail/*.hpp;yasio/detail/*.inl)
 list (APPEND YASIO_CORE
     yasio/compiler/feature_test.hpp
     yasio/cxx17/memory.hpp
@@ -310,9 +320,8 @@ macro(yasio_config_app_depends target_name)
 endmacro()
 
 # checking build system have openssl
-if(OPENSSL_INCLUDE_DIR)
-   set(YASIO_SSL_BACKEND 1)
-   target_include_directories(${yasio_target_name} PRIVATE "${OPENSSL_INCLUDE_DIR}")
+if(OPENSSL_INCLUDE_DIR AND (YASIO_SSL_BACKEND EQUAL 1))
+    target_include_directories(${yasio_target_name} PRIVATE "${OPENSSL_INCLUDE_DIR}")
 endif()
 
 # checking build system have c-ares

certs/server.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID/TCCAuWgAwIBAgIUVNVLYleT3wxWtQJRzUeCVa8ynAgwDQYJKoZIhvcNAQEL
+BQAwgYwxCzAJBgNVBAYTAkNOMRIwEAYDVQQIDAlHdWFuZ2RvbmcxETAPBgNVBAcM
+CFNoZW56aGVuMREwDwYDVQQKDAhTaW1kc29mdDETMBEGA1UECwwKTmV0d29ya2lu
+ZzEOMAwGA1UEAwwFeWFzaW8xHjAcBgkqhkiG9w0BCQEWD2hhbHg5OUBsaXZlLmNv
+bTAgFw0yMzAxMDIxMTA4MThaGA8yMTIyMDgzMTExMDgxOFowgYwxCzAJBgNVBAYT
+AkNOMRIwEAYDVQQIDAlHdWFuZ2RvbmcxETAPBgNVBAcMCFNoZW56aGVuMREwDwYD
+VQQKDAhTaW1kc29mdDETMBEGA1UECwwKTmV0d29ya2luZzEOMAwGA1UEAwwFeWFz
+aW8xHjAcBgkqhkiG9w0BCQEWD2hhbHg5OUBsaXZlLmNvbTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALCpQ2EhtNIg6oGWyADWQC+9bjTosZaeZusHfKq2
+AWodceSdFau5spSZgCIi1wwCX20rORS1c0+sz0f8edlcpIQSg2h36ZnzF0fgHZLt
+ZdMgTEtG2CaU6EUFHgrOSuaPz5R1nJHtf+6cFJo185/KRUQLwv/nBIfPSKfjKTHZ
+YORl3stQkKvY4Ndk9NhJC72o4ExdBq3tRw9WCpEvdCOxpx57LNncWisokWWsK7kJ
+FwyVf6Jt2kR8WhQIe+H46w5FTc6UZ5tGvBIQjYtHzTrGCwtVHAIvw+eb9Tq2y7IK
+iBDdYTvM1y3Y4dWKziHdeuxkAPXGFlLOEU4XNnL3Yr0cXzUCAwEAAaNTMFEwHQYD
+VR0OBBYEFH05YvqBGbKKcMfmQtrXRzxrWHuNMB8GA1UdIwQYMBaAFH05YvqBGbKK
+cMfmQtrXRzxrWHuNMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
+ADtDGcqcgvisiiDN6/P5EEtoyAteFJb1zvbByWI2fdWLKGUa7D9qtBuqAZFix7UN
+NPZjOuWNhlGh+cQ/jZZA60CqaWmAxWBK+VWw9VKHiLtJIJv0ce7+iiGPpe78M6Ii
+ObN3kV3MTLVSRgo7mmFLvECv+AFCZV6D/JYISkLtEHf2Qj8s3xwZ5tD+1SP3TyAm
+sHzmkqkkKLwtrf3lRk3PimO6QDS61PiNd846zFiHUlnl6UcmH3mOjibt0d021nwb
+XAPs3twYPn6/FMtcTwNdXSFsCfmXQsBatv3u6nanXR43hSRbUBNAyKOe8HuxoUgH
+0fGct/3yRPGynNr1QXYqT/o=
+-----END CERTIFICATE-----

certs/server.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwqUNhIbTSIOqB
+lsgA1kAvvW406LGWnmbrB3yqtgFqHXHknRWrubKUmYAiItcMAl9tKzkUtXNPrM9H
+/HnZXKSEEoNod+mZ8xdH4B2S7WXTIExLRtgmlOhFBR4Kzkrmj8+UdZyR7X/unBSa
+NfOfykVEC8L/5wSHz0in4ykx2WDkZd7LUJCr2ODXZPTYSQu9qOBMXQat7UcPVgqR
+L3QjsaceeyzZ3ForKJFlrCu5CRcMlX+ibdpEfFoUCHvh+OsORU3OlGebRrwSEI2L
+R806xgsLVRwCL8Pnm/U6tsuyCogQ3WE7zNct2OHVis4h3XrsZAD1xhZSzhFOFzZy
+92K9HF81AgMBAAECggEAA+GBv/+ma0PkIvHMvv7RWrshLPIXslumwyXfPmH1Mf9M
+Kzk96qHY2i7azOUtU6Z/aHSLe51ERTr0oaB/IDJvYsiEMMsKuUbI+0k80/CeA79V
+m3LiHUtvkkAEh4H0qGtsWx/9vNODs6zIY6dyDKspvBgXMf5Bgl2yhFbOC3DfWy47
+yvq/Uf1FL5+YfM+aY31lYSD25guesKmVkVdTWTTbOyI0N84BrRhdW2kUFLw88y7D
+tsHaRGfmXFfBxQT6akODSfJdK9cbNxHkg+KUrHbWByeWHcH0rqO0FLUBpuIIQG4z
+lRcOh/7o59G1TiV7+f+umqvLE3+OGnjx5ei76uSSGQKBgQDiUmHpYLyyJ0P8ELfh
+ey4NeUnerZ1RVINOJ8jk0h+KABve0eqKi1+C+y1YqmL7EFf/lj1FqnHEyZ4Smzfs
+jdZ7IUoWRAvZVgfoedHFy6ejcy6FcWAeJQtF1f3m2bXocwyFF14FGx+xcPGiIz/K
+qdNrDDoRPYFX+Xj3EWZhYtr+qwKBgQDH08ZdFy9uY66+yn9fqc1TnsmWa9+NiCyE
+G+si9hZuNAN3ITR0y14iugcEn70G5zUcTaa4X1VU4RQgYywwX5NhLQWVr65GyVnA
+IqQcOu3MsgcRK4vmEsQ5dK86aw6eD5Yg53TU/CoRK+TSZxSZInd7ooDjUrX1YCrb
+c2NDDqyZnwKBgG8ymvjXlt7RfA21CSO4KgBkv26xTsJPC9Syp3oF44kiVI8+BEbe
+A6ePUdBmpwtEFHh3kNNR02Qky43IxclsRx1oVcZq2IeIRYprkC3myg784Laf5eHp
+wYgmhAGQplf3bwdVW9SWZxP/sjk/qHAi0MWf1Ef0OEDJSi3aVrsynvbRAoGAWI91
+yUn+Pmk1R99M5iPGGPo1k1HJqNsiB4asBjmUJVEt+/0eV2jOFovlkloNF2MeuaV8
+bxfpJI4AMn5hVir1kUq3v+g1T6/q8+kmXFCNlXuNAEIRZW0JxAD/q99IgiqcOYb6
+023SYvvWFJ2Ulm2dEJErmBPPCqmNNOcFpfF58zcCgYEAz0f3+Zg3I8pUsfzg167G
+72knEKT8CJD6D5Y3oqDgQAXDtrqb66EHljWQXcg+thdYBWf7srN11YgXtF0J4P1O
+QD/3IAqA23eUNGVYk5sLtK0xfMHYQc9XKC2FtNAkbN0aRIO5h/KJFYe0WSPRZh5G
+wcIvONfPXh3WZN37TcNkvMI=
+-----END PRIVATE KEY-----

ci/build.ps1

@@ -1,6 +1,6 @@
 # Install latest cmake version for appveyor ci
 if (!($env:GITHUB_CI -eq "true")) {
-    $cmake_ver="3.22.2"
+    $cmake_ver="3.25.1"
     curl "https://github.com/Kitware/CMake/releases/download/v$cmake_ver/cmake-$cmake_ver-windows-x86_64.zip" -o "cmake-$cmake_ver-windows-x86_64.zip"
     Expand-Archive -Path cmake-$cmake_ver-windows-x86_64.zip -DestinationPath .\
     $cmake_bin = (Resolve-Path .\cmake-$cmake_ver-windows-x86_64\bin).Path

examples/ftp_server

@@ -18,6 +18,8 @@ using namespace yasio;
 Test detail, please see: https://github.com/yasio/yasio/blob/master/benchmark.md
 */
 
+#define SPEEDTEST_VIA_SSL 0
+
 #if defined(YASIO_ENABLE_UDS) && YASIO__HAS_UDS
 #  define SPEEDTEST_VIA_UDS 1 // Now only support TCP/SOCK_STREAM
 #else
@@ -28,10 +30,17 @@ Test detail, please see: https://github.com/yasio/yasio/blob/master/benchmark.md
 #define SPEEDTEST_PROTO_UDP 2
 #define SPEEDTEST_PROTO_KCP 3
 
-#define SPEEDTEST_TRANSFER_PROTOCOL SPEEDTEST_PROTO_KCP
+#if SPEEDTEST_VIA_SSL
+#define SPEEDTEST_SSL_MASK YCM_SSL
+#else
+#  define SPEEDTEST_SSL_MASK 0
+#endif
+
+
+#define SPEEDTEST_TRANSFER_PROTOCOL SPEEDTEST_PROTO_TCP
 
 #if SPEEDTEST_TRANSFER_PROTOCOL == SPEEDTEST_PROTO_TCP
-#  define SPEEDTEST_DEFAULT_KIND YCK_TCP_CLIENT
+#  define SPEEDTEST_DEFAULT_KIND YCK_TCP_CLIENT | SPEEDTEST_SSL_MASK
 #elif SPEEDTEST_TRANSFER_PROTOCOL == SPEEDTEST_PROTO_UDP
 #  define SPEEDTEST_DEFAULT_KIND YCK_UDP_CLIENT
 #elif SPEEDTEST_TRANSFER_PROTOCOL == SPEEDTEST_PROTO_KCP
@@ -48,7 +57,7 @@ enum
   RECEIVER_PORT = 3001,
   SENDER_PORT   = RECEIVER_PORT,
 #  if !SPEEDTEST_VIA_UDS
-  RECEIVER_CHANNEL_KIND = YCK_TCP_SERVER,
+  RECEIVER_CHANNEL_KIND = YCK_TCP_SERVER | SPEEDTEST_SSL_MASK,
   SENDER_CHANNEL_KIND   = SPEEDTEST_DEFAULT_KIND,
 #  else
   RECEIVER_CHANNEL_KIND = YCK_TCP_SERVER | YCM_UDS,

tests/speed/main.cpp

@@ -21,7 +21,7 @@ void yasioTest()
   deadline_timer udp_heartbeat;
   int total_bytes_transferred = 0;
 
-  int max_request_count = 3;
+  int max_request_count = 1;
 
   service.set_option(YOPT_S_FORWARD_EVENT, 1);
 

tests/ssl/main.cpp

@@ -206,13 +206,6 @@ SOFTWARE.
 // The default max listen count of tcp server.
 #define YASIO_SOMAXCONN 19
 
-// The max wait duration in microseconds when io_service nothing to do.
-#define YASIO_MAX_WAIT_DURATION (5LL * 60LL * 1000LL * 1000LL)
-
-// The min wait duration in microseconds when io_service have outstanding work to do.
-// !!!Only affects Single Core CPU
-#define YASIO_MIN_WAIT_DURATION 10LL
-
 // The default ttl of multicast
 #define YASIO_DEFAULT_MULTICAST_TTL (int)128
 
@@ -238,4 +231,7 @@ SOFTWARE.
 #define YASIO_SSL_PIN "yasio_ssl_client"
 #define YASIO_SSL_PIN_LEN (sizeof(YASIO_SSL_PIN) - 1)
 
+#define YASIO_SSL_PON "yasio_ssl_server"
+#define YASIO_SSL_PON_LEN (sizeof(YASIO_SSL_PON) - 1)
+
 #endif