Added tests [2] --filter=[core] --verbose

Author: matyhtf

core-tests/src/coroutine/socket.cpp

@@ -1526,3 +1526,17 @@ TEST(coroutine_socket, shutdown) {
         ASSERT_ERREQ(ENOTCONN);
     });
 }
+
+TEST(coroutine_socket, recv_packet) {
+    coroutine::run([](void *arg) {
+        Socket sock(SW_SOCK_TCP);
+        ASSERT_TRUE(sock.connect(TEST_HTTP_DOMAIN, 80));
+        auto req = swoole::test::http_get_request(TEST_HTTP_DOMAIN, "/");
+        ASSERT_EQ(sock.send(req.c_str(), req.length()), req.length());
+        ASSERT_TRUE(sock.check_liveness());
+        auto n = sock.recv_packet();
+        ASSERT_GT(n, 0);
+        auto buf = sock.get_read_buffer();
+        ASSERT_TRUE(buf->contains(TEST_HTTP_EXPECT));
+    });
+}

core-tests/src/protocol/ssl.cpp

@@ -24,8 +24,8 @@
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 
-using swoole::String;
 using swoole::SSLContext;
+using swoole::String;
 
 TEST(ssl, destroy) {
     swoole_ssl_init();
@@ -38,7 +38,8 @@ TEST(ssl, get_error) {
     const char *error_str = swoole_ssl_get_error();
     EXPECT_NE(error_str, nullptr);
     String str(error_str);
-    ASSERT_TRUE(str.contains("SSL routines:func(195):reason(134)"));
+    DEBUG() << str.to_std_string() << std::endl;
+    ASSERT_TRUE(str.contains("reason(134)"));
 }
 
 TEST(ssl, password) {

core-tests/src/server/server.cpp

@@ -1941,7 +1941,7 @@ TEST(server, reactor_thread_pipe_writable) {
     port->protocol.package_max_length = 8 * 1024 * 1024;
     network::Stream::set_protocol(&port->protocol);
 
-    swoole::Mutex lock(swoole::Mutex::PROCESS_SHARED);
+    Mutex lock(Mutex::PROCESS_SHARED);
     lock.lock();
 
     ASSERT_EQ(serv.create(), SW_OK);
@@ -1986,8 +1986,11 @@ TEST(server, reactor_thread_pipe_writable) {
 
     serv.onReceive = [&](Server *serv, RecvData *req) -> int {
         uint32_t len = htonl(rdata.length);
-        serv->send(req->info.fd, &len, sizeof(len));
-        serv->send(req->info.fd, rdata.str, rdata.length);
+        EXPECT_TRUE(req->info.flags & SW_EVENT_DATA_OBJ_PTR);
+        EXPECT_TRUE(serv->send(req->info.fd, &len, sizeof(len)));
+        EXPECT_TRUE(serv->send(req->info.fd, rdata.str, rdata.length));
+        EXPECT_MEMEQ(req->data + 4, rdata.str, rdata.length);
+        EXPECT_NE(serv->get_worker_message_bus()->move_packet(), nullptr);
         return SW_OK;
     };
 

include/swoole_coroutine_socket.h

@@ -97,14 +97,18 @@ class Socket {
         return send(buf.c_str(), buf.length());
     }
 
+    /**
+     * The read()/write()/recvmsg()/sendmsg() functions currently does not support SSL
+     */
     ssize_t read(void *__buf, size_t __n);
     ssize_t write(const void *__buf, size_t __n);
+    ssize_t recvmsg(msghdr *msg, int flags);
+    ssize_t sendmsg(const msghdr *msg, int flags);
+
     ssize_t readv(network::IOVector *io_vector);
     ssize_t readv_all(network::IOVector *io_vector);
     ssize_t writev(network::IOVector *io_vector);
     ssize_t writev_all(network::IOVector *io_vector);
-    ssize_t recvmsg(struct msghdr *msg, int flags);
-    ssize_t sendmsg(const struct msghdr *msg, int flags);
     ssize_t recv_all(void *__buf, size_t __n);
     ssize_t send_all(const void *__buf, size_t __n);
     ssize_t recv_packet(double timeout = 0);