From 6dbe79ad024f608ea04b63af368048d08bf7a488 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 30 Apr 2019 08:43:12 +0800 Subject: [PATCH] Remove noisy informations. --- trunk/src/app/srs_app_config.cpp | 6 +----- trunk/src/app/srs_app_http_api.cpp | 1 - trunk/src/app/srs_app_source.cpp | 1 - trunk/src/core/srs_core.hpp | 3 --- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/protocol/srs_rtmp_handshake.cpp | 3 +++ trunk/src/protocol/srs_rtmp_stack.cpp | 2 -- trunk/src/service/srs_service_rtmp_conn.cpp | 2 -- 8 files changed, 5 insertions(+), 15 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index ede53a66a..c70cdb80f 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -3433,9 +3433,8 @@ srs_error_t SrsConfig::parse_argv(int& i, char** argv) void SrsConfig::print_help(char** argv) { printf( - RTMP_SIG_SRS_SERVER "\n" + RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_URL "\n" "License: " RTMP_SIG_SRS_LICENSE "\n" - "Primary: " RTMP_SIG_SRS_PRIMARY "\n" "Build: " SRS_AUTO_BUILD_DATE " Configuration:" SRS_AUTO_USER_CONFIGURE "\n" "Features:" SRS_AUTO_CONFIGURE "\n""\n" "Usage: %s [-h?vVgG] [[-t] -c ]\n" @@ -3447,9 +3446,6 @@ void SrsConfig::print_help(char** argv) " -t : test configuration file, exit(error_code).\n" " -c filename : use configuration file for SRS\n" "\n" - RTMP_SIG_SRS_URL "\n" - "Email: " RTMP_SIG_SRS_EMAIL "\n" - "\n" "For example:\n" " %s -v\n" " %s -t -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n" diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 8671fcc62..a41d74d01 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -550,7 +550,6 @@ srs_error_t SrsGoApiAuthors::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa SrsJsonObject* data = SrsJsonAny::object(); obj->set("data", data); - data->set("primary", SrsJsonAny::str(RTMP_SIG_SRS_PRIMARY)); data->set("license", SrsJsonAny::str(RTMP_SIG_SRS_LICENSE)); data->set("contributors", SrsJsonAny::str(SRS_AUTO_CONSTRIBUTORS)); diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 7115c3db9..22b267d02 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1590,7 +1590,6 @@ srs_error_t SrsMetaCache::update_data(SrsMessageHeader* header, SrsOnMetaDataPac // add server info to metadata metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); - metadata->metadata->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); // version, for example, 1.0.0 // add version to metadata, please donot remove it, for debug. diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 95cd3c018..2da67cc29 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -35,11 +35,8 @@ // The project informations, may sent to client in HTTP header or RTMP metadata. #define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_CODE "OuXuli" -#define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com" #define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs" #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" -#define RTMP_SIG_SRS_PRIMARY RTMP_SIG_SRS_KEY "/" VERSION_STABLE_BRANCH -#define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY "(" RTMP_SIG_SRS_VERSION ")" #define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR) "." SRS_XSTR(VERSION_MINOR) "." SRS_XSTR(VERSION_REVISION) #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY "/" RTMP_SIG_SRS_VERSION "(" RTMP_SIG_SRS_CODE ")" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 339af3357..7bbc75998 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -118,7 +118,7 @@ srs_error_t do_main(int argc, char** argv) } // config already applied to log. - srs_trace(RTMP_SIG_SRS_SERVER ", stable is " RTMP_SIG_SRS_PRIMARY); + srs_trace(RTMP_SIG_SRS_SERVER); srs_trace("license: " RTMP_SIG_SRS_LICENSE); srs_trace("contributors: " SRS_AUTO_CONSTRIBUTORS); srs_trace("build: %s, configure:%s, uname: %s", SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME); diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp index 5fd526cf7..87b9ea67b 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.cpp +++ b/trunk/src/protocol/srs_rtmp_handshake.cpp @@ -42,6 +42,9 @@ using namespace _srs_internal; // for openssl_generate_key #include +// For randomly generate the handshake bytes. +#define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY "(" RTMP_SIG_SRS_VERSION ")" + #if OPENSSL_VERSION_NUMBER < 0x10100000L static HMAC_CTX *HMAC_CTX_new(void) diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 5ea56cbbf..af9850a21 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -2387,8 +2387,6 @@ srs_error_t SrsRtmpServer::response_connect_app(SrsRequest *req, const char* ser data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); data->set("srs_version", SrsAmf0Any::str(RTMP_SIG_SRS_VERSION)); - data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); - data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); if (server_ip) { data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); diff --git a/trunk/src/service/srs_service_rtmp_conn.cpp b/trunk/src/service/srs_service_rtmp_conn.cpp index c447ea020..366af9839 100644 --- a/trunk/src/service/srs_service_rtmp_conn.cpp +++ b/trunk/src/service/srs_service_rtmp_conn.cpp @@ -120,8 +120,6 @@ srs_error_t SrsBasicRtmpClient::do_connect_app(string local_ip, bool debug) data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); data->set("srs_version", SrsAmf0Any::str(RTMP_SIG_SRS_VERSION)); - data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); - data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); // for edge to directly get the id of client. data->set("srs_pid", SrsAmf0Any::number(getpid())); data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));