修改服务器版本信息声明相关代码

src/Common/macros.h

@@ -11,6 +11,10 @@
 #ifndef ZLMEDIAKIT_MACROS_H
 #define ZLMEDIAKIT_MACROS_H
 
+#if defined(ENABLE_VERSION)
+#include "Version.h"
+#endif
+
 #if defined(__MACH__)
 #include <arpa/inet.h>
     #include <machine/endian.h>
@@ -53,7 +57,13 @@
 #define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;}
 #endif //CLEAR_ARR
 
-#define SERVER_NAME "ZLMediaKit-5.0(build in " __DATE__ " " __TIME__ ")"
+//请遵循MIT协议，勿修改服务器声明
+#if !defined(ENABLE_VERSION)
+#define SERVER_NAME "ZLMediaKit-6.0(build in " __DATE__ " " __TIME__ ")"
+#else
+#define SERVER_NAME "ZLMediaKit(git hash:" COMMIT_HASH ",branch:" BRANCH_TIME ",build time:" BUILD_TIME ")"
+#endif
+
 #define VHOST_KEY "vhost"
 #define HTTP_SCHEMA "http"
 #define RTSP_SCHEMA "rtsp"

src/Rtmp/Rtmp.h

@@ -266,7 +266,7 @@ public:
               size_t fileSize = 0,
               const map<string,string> &header = map<string,string>()){
         _metadata.set("duration", dur_sec);
-        _metadata.set("fileSize", 0);
+        _metadata.set("fileSize", (int)fileSize);
         _metadata.set("server",SERVER_NAME);
         for (auto &pr : header){
             _metadata.set(pr.first, pr.second);

src/Rtmp/RtmpMediaSource.h

@@ -101,6 +101,7 @@ public:
      */
     virtual void setMetaData(const AMFValue &metadata) {
         _metadata = metadata;
+        _metadata.set("server", SERVER_NAME);
         if (_ring) {
             regist();
         }

src/Rtsp/RtspMediaSource.h

@@ -141,11 +141,11 @@ public:
      * 设置sdp
      */
     virtual void setSdp(const string &sdp) {
-        _sdp = sdp;
         SdpParser sdp_parser(sdp);
         _tracks[TrackVideo] = sdp_parser.getTrack(TrackVideo);
         _tracks[TrackAudio] = sdp_parser.getTrack(TrackAudio);
         _have_video = (bool) _tracks[TrackVideo];
+        _sdp = sdp_parser.toString();
         if (_ring) {
             regist();
         }

src/Rtsp/RtspSession.cpp

@@ -257,7 +257,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
         _push_src = std::make_shared<RtspMediaSourceImp>(_media_info._vhost, _media_info._app, _media_info._streamid);
         _push_src->setListener(dynamic_pointer_cast<MediaSourceEvent>(shared_from_this()));
         _push_src->setProtocolTranslation(enableHls, enableMP4);
-        _push_src->setSdp(sdpParser.toString());
+        _push_src->setSdp(parser.Content());
         sendRtspResponse("200 OK");
     };