From f5f58196b5dd73d85dd794e0a159e8fbdc74e0b4 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Sat, 16 Oct 2021 16:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/config.cpp | 2 +- src/Common/macros.cpp | 4 ++-- src/Common/macros.h | 2 +- src/Http/HttpClient.cpp | 2 +- src/Http/HttpSession.cpp | 2 +- src/Rtmp/Rtmp.h | 2 +- src/Rtmp/RtmpMediaSource.h | 2 +- src/Rtsp/Rtsp.h | 2 +- src/Rtsp/RtspPlayer.cpp | 4 ++-- src/Rtsp/RtspPusher.cpp | 4 ++-- src/Rtsp/RtspSession.cpp | 4 ++-- src/Shell/ShellSession.cpp | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Common/config.cpp b/src/Common/config.cpp index 84e14087..964ca497 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -138,7 +138,7 @@ onceToken token([](){ "" "

您访问的资源不存在！

" "
" - << SERVER_NAME + << kServerName << "
" "" "" diff --git a/src/Common/macros.cpp b/src/Common/macros.cpp index 55146719..25c71be0 100644 --- a/src/Common/macros.cpp +++ b/src/Common/macros.cpp @@ -37,9 +37,9 @@ void printArgs(std::ostream &out) {} //请遵循MIT协议，勿修改服务器声明 #if !defined(ENABLE_VERSION) -const char SERVER_NAME[] = "ZLMediaKit-6.0(build in " __DATE__ " " __TIME__ ")"; +const char kServerName[] = "ZLMediaKit-6.0(build in " __DATE__ " " __TIME__ ")"; #else -const char SERVER_NAME[] = "ZLMediaKit(git hash:" COMMIT_HASH ",branch:" BRANCH_NAME ",build time:" __DATE__ " " __TIME__ ")"; +const char kServerName[] = "ZLMediaKit(git hash:" COMMIT_HASH ",branch:" BRANCH_NAME ",build time:" __DATE__ " " __TIME__ ")"; #endif }//namespace mediakit \ No newline at end of file diff --git a/src/Common/macros.h b/src/Common/macros.h index 19d1b48c..8b908a20 100644 --- a/src/Common/macros.h +++ b/src/Common/macros.h @@ -74,7 +74,7 @@ extern void Assert_Throw(int failed, const char *exp, const char *func, const ch namespace mediakit { -extern const char SERVER_NAME[]; +extern const char kServerName[]; void printArgs(std::ostream &out); diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index 16c5c790..e3062a24 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -49,7 +49,7 @@ void HttpClient::sendRequest(const string &strUrl, float fTimeOutSec) { host = FindField(host.data(), NULL, ":"); } _header.emplace("Host", host_header); - _header.emplace("Tools", SERVER_NAME); + _header.emplace("Tools", kServerName); _header.emplace("Connection", "keep-alive"); _header.emplace("Accept", "*/*"); _header.emplace("Accept-Language", "zh-CN,zh;q=0.8"); diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp index 673716d4..7765dfaa 100644 --- a/src/Http/HttpSession.cpp +++ b/src/Http/HttpSession.cpp @@ -537,7 +537,7 @@ void HttpSession::sendResponse(int code, HttpSession::KeyValue &headerOut = const_cast(header); headerOut.emplace(kDate, dateStr()); - headerOut.emplace(kServer, SERVER_NAME); + headerOut.emplace(kServer, kServerName); headerOut.emplace(kConnection, bClose ? "close" : "keep-alive"); if(!bClose){ string keepAliveString = "timeout="; diff --git a/src/Rtmp/Rtmp.h b/src/Rtmp/Rtmp.h index d2ceccda..0d064e5f 100644 --- a/src/Rtmp/Rtmp.h +++ b/src/Rtmp/Rtmp.h @@ -306,7 +306,7 @@ public: const map &header = map()){ _metadata.set("duration", dur_sec); _metadata.set("fileSize", (int)fileSize); - _metadata.set("server",SERVER_NAME); + _metadata.set("server",kServerName); for (auto &pr : header){ _metadata.set(pr.first, pr.second); } diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h index c8c19cbf..56494ec1 100644 --- a/src/Rtmp/RtmpMediaSource.h +++ b/src/Rtmp/RtmpMediaSource.h @@ -101,7 +101,7 @@ public: */ virtual void setMetaData(const AMFValue &metadata) { _metadata = metadata; - _metadata.set("server", SERVER_NAME); + _metadata.set("server", kServerName); _have_video = _metadata["videocodecid"]; _have_audio = _metadata["audiocodecid"]; if (_ring) { diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index 6b201b20..07f4d161 100644 --- a/src/Rtsp/Rtsp.h +++ b/src/Rtsp/Rtsp.h @@ -346,7 +346,7 @@ public: } } else { _printer << "o=- 0 0 IN IP4 0.0.0.0\r\n"; - _printer << "s=Streamed by " << SERVER_NAME << "\r\n"; + _printer << "s=Streamed by " << kServerName << "\r\n"; _printer << "c=IN IP4 0.0.0.0\r\n"; _printer << "t=0 0\r\n"; } diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index 93c6f93b..33dc548d 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -551,7 +551,7 @@ void RtspPlayer::sendRtspRequest(const string &cmd, const string &url, const std void RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrCaseMap &header_const) { auto header = header_const; header.emplace("CSeq",StrPrinter << _cseq_send++); - header.emplace("User-Agent",SERVER_NAME); + header.emplace("User-Agent",kServerName); if(!_session_id.empty()){ header.emplace("Session", _session_id); @@ -637,7 +637,7 @@ void RtspPlayer::onBeforeRtpSorted(const RtpPacket::Ptr &rtp, int track_idx){ auto ssrc = rtp->getSSRC(); auto rtcp = rtcp_ctx->createRtcpRR(ssrc + 1, ssrc); - auto rtcp_sdes = RtcpSdes::create({SERVER_NAME}); + auto rtcp_sdes = RtcpSdes::create({kServerName}); rtcp_sdes->chunks.type = (uint8_t) SdesType::RTCP_SDES_CNAME; rtcp_sdes->chunks.ssrc = htonl(ssrc); send_rtcp(this, track_idx, std::move(rtcp)); diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index 402efb8b..a2d9604a 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -377,7 +377,7 @@ void RtspPusher::updateRtcpContext(const RtpPacket::Ptr &rtp){ auto ssrc = rtp->getSSRC(); auto rtcp = rtcp_ctx->createRtcpSR(ssrc + 1); - auto rtcp_sdes = RtcpSdes::create({SERVER_NAME}); + auto rtcp_sdes = RtcpSdes::create({kServerName}); rtcp_sdes->chunks.type = (uint8_t) SdesType::RTCP_SDES_CNAME; rtcp_sdes->chunks.ssrc = htonl(ssrc); send_rtcp(this, track_index, std::move(rtcp)); @@ -511,7 +511,7 @@ void RtspPusher::sendRtspRequest(const string &cmd, const string &url, const std void RtspPusher::sendRtspRequest(const string &cmd, const string &url,const StrCaseMap &header_const,const string &sdp ) { auto header = header_const; header.emplace("CSeq", StrPrinter << _cseq++); - header.emplace("User-Agent", SERVER_NAME); + header.emplace("User-Agent", kServerName); if (!_session_id.empty()) { header.emplace("Session", _session_id); diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index 9cb16b41..07b7607e 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -1028,7 +1028,7 @@ bool RtspSession::sendRtspResponse(const string &res_code, const StrCaseMap &hea header.emplace("Session", _sessionid); } - header.emplace("Server",SERVER_NAME); + header.emplace("Server",kServerName); header.emplace("Date",dateStr()); if(!sdp.empty()){ @@ -1163,7 +1163,7 @@ void RtspSession::updateRtcpContext(const RtpPacket::Ptr &rtp){ auto ssrc = rtp->getSSRC(); auto rtcp = _push_src ? rtcp_ctx->createRtcpRR(ssrc + 1, ssrc) : rtcp_ctx->createRtcpSR(ssrc); - auto rtcp_sdes = RtcpSdes::create({SERVER_NAME}); + auto rtcp_sdes = RtcpSdes::create({kServerName}); rtcp_sdes->chunks.type = (uint8_t)SdesType::RTCP_SDES_CNAME; rtcp_sdes->chunks.ssrc = htonl(ssrc); send_rtcp(this, track_index, std::move(rtcp)); diff --git a/src/Shell/ShellSession.cpp b/src/Shell/ShellSession.cpp index 368ee395..bd5f7fd5 100644 --- a/src/Shell/ShellSession.cpp +++ b/src/Shell/ShellSession.cpp @@ -91,7 +91,7 @@ inline bool ShellSession::onCommandLine(const string& line) { inline void ShellSession::pleaseInputUser() { SockSender::send("\033[0m"); - SockSender::send(StrPrinter << SERVER_NAME << " login: " << endl); + SockSender::send(StrPrinter << kServerName << " login: " << endl); _loginInterceptor = [this](const string &user_name) { _strUserName=user_name; pleaseInputPasswd(); @@ -108,14 +108,14 @@ inline void ShellSession::pleaseInputPasswd() { << "\033[0mAuth failed(" << errMessage << "), please try again.\r\n" - << _strUserName << "@" << SERVER_NAME + << _strUserName << "@" << kServerName << "'s password: \033[8m" << endl); return; } SockSender::send("\033[0m"); SockSender::send("-----------------------------------------\r\n"); - SockSender::send(StrPrinter<<"欢迎来到"<