external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

For #1657, Refine https-client code

Browse source
This commit is contained in:
winlin 2020-11-03 15:54:06 +08:00
parent d552a1a5fb
commit 5577d19b61
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/protocol/srs_service_http_client.cpp
View file

@ -118,7 +118,7 @@ srs_error_t SrsSslClient::handshake()
return srs_error_new(ERROR_HTTPS_HANDSHAKE, "BIO_reset r0=%d", r0); 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 // Receive ServerHello, Certificate, Server Key Exchange, Server Hello Done
while (true) { 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 // Send Client Key Exchange, Change Cipher Spec, Encrypted Handshake Message
if ((err = transport->write(data, size, NULL)) != srs_success) { 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); 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 // Receive New Session Ticket, Change Cipher Spec, Encrypted Handshake Message
while (true) { while (true) {
@ -180,7 +180,7 @@ srs_error_t SrsSslClient::handshake()
} }
} }
srs_trace("https: Server done"); srs_info("https: Server done");
return err; return err;
} }
@ -460,12 +460,17 @@ srs_error_t SrsHttpClient::connect()
srs_assert(!ssl_transport); srs_assert(!ssl_transport);
ssl_transport = new SrsSslClient(transport); ssl_transport = new SrsSslClient(transport);
srs_utime_t starttime = srs_update_system_time();
if ((err = ssl_transport->handshake()) != srs_success) { if ((err = ssl_transport->handshake()) != srs_success) {
disconnect(); disconnect();
return srs_error_wrap(err, "http: ssl connect %s %s:%d to=%dms, rto=%dms", 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)); 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; return err;
#endif #endif
} }