From 5577d19b617fac0fd0ab0e5adc249a7d40cc30b3 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 3 Nov 2020 15:54:06 +0800 Subject: [PATCH] For #1657, Refine https-client code --- trunk/src/protocol/srs_service_http_client.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/trunk/src/protocol/srs_service_http_client.cpp b/trunk/src/protocol/srs_service_http_client.cpp index 2b9e717f4..e09f9470a 100644 --- a/trunk/src/protocol/srs_service_http_client.cpp +++ b/trunk/src/protocol/srs_service_http_client.cpp @@ -118,7 +118,7 @@ srs_error_t SrsSslClient::handshake() return srs_error_new(ERROR_HTTPS_HANDSHAKE, "BIO_reset r0=%d", r0); } - srs_trace("https: ClientHello done"); + srs_info("https: ClientHello done"); // Receive ServerHello, Certificate, Server Key Exchange, Server Hello Done while (true) { @@ -145,7 +145,7 @@ srs_error_t SrsSslClient::handshake() } } - srs_trace("https: ServerHello done"); + srs_info("https: ServerHello done"); // Send Client Key Exchange, Change Cipher Spec, Encrypted Handshake Message if ((err = transport->write(data, size, NULL)) != srs_success) { @@ -155,7 +155,7 @@ srs_error_t SrsSslClient::handshake() return srs_error_new(ERROR_HTTPS_HANDSHAKE, "BIO_reset r0=%d", r0); } - srs_trace("https: Client done"); + srs_info("https: Client done"); // Receive New Session Ticket, Change Cipher Spec, Encrypted Handshake Message while (true) { @@ -180,7 +180,7 @@ srs_error_t SrsSslClient::handshake() } } - srs_trace("https: Server done"); + srs_info("https: Server done"); return err; } @@ -460,12 +460,17 @@ srs_error_t SrsHttpClient::connect() srs_assert(!ssl_transport); ssl_transport = new SrsSslClient(transport); + srs_utime_t starttime = srs_update_system_time(); + if ((err = ssl_transport->handshake()) != srs_success) { disconnect(); return srs_error_wrap(err, "http: ssl connect %s %s:%d to=%dms, rto=%dms", schema_.c_str(), host.c_str(), port, srsu2msi(timeout), srsu2msi(recv_timeout)); } + int cost = srsu2msi(srs_update_system_time() - starttime); + srs_trace("https: connected to %s://%s:%d, cost=%dms", schema_.c_str(), host.c_str(), port, cost); + return err; #endif }