From acf9c9d25b2716e7049d1ae67887d1220c9de777 Mon Sep 17 00:00:00 2001 From: "jinxue.cgh" Date: Thu, 25 Jun 2020 15:01:05 +0800 Subject: [PATCH] RTC: refine get_srtp_key parameter name --- trunk/src/app/srs_app_rtc_dtls.cpp | 6 +++--- trunk/src/app/srs_app_rtc_dtls.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp index 4c98b5ab6..895b1bdd8 100644 --- a/trunk/src/app/srs_app_rtc_dtls.cpp +++ b/trunk/src/app/srs_app_rtc_dtls.cpp @@ -429,7 +429,7 @@ srs_error_t SrsDtls::do_handshake() const int SRTP_MASTER_KEY_KEY_LEN = 16; const int SRTP_MASTER_KEY_SALT_LEN = 14; -srs_error_t SrsDtls::get_srtp_key(std::string& client_key, std::string& server_key) +srs_error_t SrsDtls::get_srtp_key(std::string& recv_key, std::string& send_key) { srs_error_t err = srs_success; @@ -449,8 +449,8 @@ srs_error_t SrsDtls::get_srtp_key(std::string& client_key, std::string& server_k offset += SRTP_MASTER_KEY_SALT_LEN; std::string server_master_salt(reinterpret_cast(material + offset), SRTP_MASTER_KEY_SALT_LEN); - client_key = client_master_key + client_master_salt; - server_key = server_master_key + server_master_salt; + recv_key = client_master_key + client_master_salt; + send_key = server_master_key + server_master_salt; return err; } diff --git a/trunk/src/app/srs_app_rtc_dtls.hpp b/trunk/src/app/srs_app_rtc_dtls.hpp index ecc1fb389..41eaa7bdb 100644 --- a/trunk/src/app/srs_app_rtc_dtls.hpp +++ b/trunk/src/app/srs_app_rtc_dtls.hpp @@ -94,7 +94,7 @@ public: srs_error_t initialize(SrsRequest* r); srs_error_t do_handshake(); srs_error_t on_dtls(char* data, int nb_data); - srs_error_t get_srtp_key(std::string& send_key, std::string& recv_key); + srs_error_t get_srtp_key(std::string& recv_key, std::string& send_key); private: SSL_CTX* build_dtls_ctx(); srs_error_t handshake();