From 4cd03a7c060a59f58e8356aa4f1483e1960a5087 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 30 Nov 2019 17:31:27 +0800 Subject: [PATCH] Refine debug info for edge. 3.0.64 --- README.md | 1 + trunk/src/app/srs_app_rtmp_conn.cpp | 3 ++- trunk/src/core/srs_core.hpp | 2 +- trunk/src/service/srs_service_rtmp_conn.cpp | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index acee07779..40b51c000 100755 --- a/README.md +++ b/README.md @@ -152,6 +152,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2019-11-30, Refine debug info for edge. 3.0.64 * v3.0, 2019-10-30, Cover protocol stack RTMP. 3.0.63 * v3.0, 2019-10-23, Cover JSON codec. 3.0.62 * v3.0, 2019-10-13, Use http://ossrs.net:8000 as homepage. diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index e1dabc1c3..d91417715 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -1179,7 +1179,8 @@ srs_error_t SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client) } // for token tranverse, always take the debug info(which carries token). - if ((err = client->connect_app(req->app, req->tcUrl, req, true, NULL)) != srs_success) { + SrsServerInfo si; + if ((err = client->connect_app(req->app, req->tcUrl, req, true, &si)) != srs_success) { return srs_error_wrap(err, "rtmp: connect tcUrl"); } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 8f4e8f406..44eaadb76 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // The version config. #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 63 +#define VERSION_REVISION 64 // The macros generated by configure script. #include diff --git a/trunk/src/service/srs_service_rtmp_conn.cpp b/trunk/src/service/srs_service_rtmp_conn.cpp index 366af9839..b5525e4fa 100644 --- a/trunk/src/service/srs_service_rtmp_conn.cpp +++ b/trunk/src/service/srs_service_rtmp_conn.cpp @@ -139,7 +139,8 @@ srs_error_t SrsBasicRtmpClient::do_connect_app(string local_ip, bool debug) // upnode server identity will show in the connect_app of client. // @see https://github.com/ossrs/srs/issues/160 // the debug_srs_upnode is config in vhost and default to true. - if ((err = client->connect_app(req->app, tc_url, req, debug, NULL)) != srs_success) { + SrsServerInfo si; + if ((err = client->connect_app(req->app, tc_url, req, debug, &si)) != srs_success) { return srs_error_wrap(err, "connect app tcUrl=%s, debug=%d", tc_url.c_str(), debug); }