Update yasio to latest

axmolengine · Feb 1, 2024 · b6cd3e5 · b6cd3e5
1 parent 41e68fe
commit b6cd3e5
Show file tree

Hide file tree

Showing 61 changed files with 224 additions and 215 deletions.
diff --git a/thirdparty/yasio/bindings/lyasio.cpp b/thirdparty/yasio/bindings/lyasio.cpp
@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 /*
 The MIT License (MIT)
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/thirdparty/yasio/bindings/lyasio.hpp b/thirdparty/yasio/bindings/lyasio.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/bindings/yasio_axlua.cpp b/thirdparty/yasio/bindings/yasio_axlua.cpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/bindings/yasio_axlua.hpp b/thirdparty/yasio/bindings/yasio_axlua.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/bindings/yasio_ni.cpp b/thirdparty/yasio/bindings/yasio_ni.cpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/bindings/yasio_sol.hpp b/thirdparty/yasio/bindings/yasio_sol.hpp
@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 /*
 The MIT License (MIT)
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/thirdparty/yasio/buffer_alloc.hpp b/thirdparty/yasio/buffer_alloc.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/byte_buffer.hpp b/thirdparty/yasio/byte_buffer.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/compiler/feature_test.hpp b/thirdparty/yasio/compiler/feature_test.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/config.hpp b/thirdparty/yasio/config.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@ SOFTWARE.
 ** Uncomment or add compiler flag -DYASIO_HEADER_ONLY to enable yasio core implementation header
 ** only
 */
-#define YASIO_HEADER_ONLY 1
+// #define YASIO_HEADER_ONLY 1
 
 /*
 ** Uncomment or add compiler flag -DYASIO_VERBOSE_LOG to enable verbose log
@@ -74,7 +74,7 @@ SOFTWARE.
 ** 1. -DYASIO_SSL_BACKEND=1: OpenSSL
 ** 2. -DYASIO_SSL_BACKEND=2: mbedtls
 */
-#define YASIO_SSL_BACKEND 1
+// #define YASIO_SSL_BACKEND 1
 
 /*
 ** Uncomment or add compiler flag -DYASIO_DISABLE_CONCURRENT_SINGLETON to disable concurrent
@@ -205,7 +205,7 @@ SOFTWARE.
 /*
 **  The yasio version macros
 */
-#define YASIO_VERSION_NUM 0x040104
+#define YASIO_VERSION_NUM 0x050000
 
 /*
 ** The macros used by io_service.
@@ -216,9 +216,6 @@ SOFTWARE.
 // The default ttl of multicast
 #define YASIO_DEFAULT_MULTICAST_TTL (int)128
 
-// The max internet buffer size
-#define YASIO_INET_BUFFER_SIZE 65536
-
 // The max pdu buffer length, avoid large memory allocation when application decode a huge length.
 #define YASIO_MAX_PDU_BUFFER_SIZE static_cast<int>(1 * 1024 * 1024)
 

diff --git a/thirdparty/yasio/endian_portable.hpp b/thirdparty/yasio/endian_portable.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/errc.hpp b/thirdparty/yasio/errc.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/ibstream.hpp b/thirdparty/yasio/ibstream.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/ares.hpp b/thirdparty/yasio/impl/ares.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/concurrent_queue.hpp b/thirdparty/yasio/impl/concurrent_queue.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/epoll_io_watcher.hpp b/thirdparty/yasio/impl/epoll_io_watcher.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 #ifndef YASIO__EPOLL_IO_WATCHER_HPP
 #define YASIO__EPOLL_IO_WATCHER_HPP
 #include <vector>

diff --git a/thirdparty/yasio/impl/eventfd_select_interrupter.hpp b/thirdparty/yasio/impl/eventfd_select_interrupter.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 // Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
 //

diff --git a/thirdparty/yasio/impl/evport_io_watcher.hpp b/thirdparty/yasio/impl/evport_io_watcher.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 #ifndef YASIO__EVPORT_IO_WATCHER_HPP
 #define YASIO__EVPORT_IO_WATCHER_HPP
 #include <chrono>

diff --git a/thirdparty/yasio/impl/fp16.hpp b/thirdparty/yasio/impl/fp16.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/ifaddrs.hpp b/thirdparty/yasio/impl/ifaddrs.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/inet_ntop.hpp b/thirdparty/yasio/impl/inet_ntop.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/kqueue_io_watcher.hpp b/thirdparty/yasio/impl/kqueue_io_watcher.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 #ifndef YASIO__KQUEUE_IO_WATCHER_HPP
 #define YASIO__KQUEUE_IO_WATCHER_HPP
 #include <sys/types.h>

diff --git a/thirdparty/yasio/impl/mbedtls.hpp b/thirdparty/yasio/impl/mbedtls.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/object_pool.hpp b/thirdparty/yasio/impl/object_pool.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/openssl.hpp b/thirdparty/yasio/impl/openssl.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -49,7 +49,7 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
   {
     int fail_count = -1;
     if (yasio__valid_str(opts.crtfile_))
-    {
+    { // CAfile for verify
       fail_count = 0;
       yssl_splitpath(opts.crtfile_, [&](char* first, char* last) {
         yssl_split_term null_term(last);
@@ -69,6 +69,11 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
         return !ok;
       });
     }
+    /*
+    * client cert & key not implement yet, since it not common usecase
+    * SSL_CTX_use_certificate_chain_file
+    * SSL_CTX_use_PrivateKey_file
+    */
     if (!fail_count)
     {
       ::SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, ::SSL_CTX_get_verify_callback(ctx));
@@ -93,6 +98,14 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
 
     if (yasio__valid_str(opts.keyfile_) && ::SSL_CTX_use_PrivateKey_file(ctx, opts.keyfile_, SSL_FILETYPE_PEM) <= 0)
       YASIO_LOG("[gobal] load server private key file failed!");
+
+    /* 
+    * If client provide cert, then verify, otherwise skip verify
+    * Note: if SSL_VERIFY_FAIL_IF_NO_PEER_CERT specified, client must provide
+    * cert & key which is not common use, means 100% online servers doesn't require
+    * client to provide cert
+    */
+    ::SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, ::SSL_CTX_get_verify_callback(ctx));
   }
 
   return ctx;

diff --git a/thirdparty/yasio/impl/pipe_select_interrupter.hpp b/thirdparty/yasio/impl/pipe_select_interrupter.hpp
@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 // Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
 //

diff --git a/thirdparty/yasio/impl/poll_io_watcher.hpp b/thirdparty/yasio/impl/poll_io_watcher.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 #ifndef YASIO__POLL_IO_WATCHER_HPP
 #define YASIO__POLL_IO_WATCHER_HPP
 #include "yasio/pod_vector.hpp"

diff --git a/thirdparty/yasio/impl/select_interrupter.hpp b/thirdparty/yasio/impl/select_interrupter.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 // Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying

diff --git a/thirdparty/yasio/impl/select_io_watcher.hpp b/thirdparty/yasio/impl/select_io_watcher.hpp
@@ -3,7 +3,7 @@
 // client application.
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 #ifndef YASIO__SELECT_IO_WATCHER_HPP
 #define YASIO__SELECT_IO_WATCHER_HPP
 #include <vector>

diff --git a/thirdparty/yasio/impl/socket.hpp b/thirdparty/yasio/impl/socket.hpp
@@ -5,7 +5,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 HALX99
+Copyright (c) 2012-2024 HALX99
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/thirdparty/yasio/impl/socket_select_interrupter.hpp b/thirdparty/yasio/impl/socket_select_interrupter.hpp
@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 //
 //
-// Copyright (c) 2012-2023 HALX99 (halx99 at live dot com)
+// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
 // Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
 //