SRT: Fix the missing config mss. v5.0.188 v6.0.88 (#3825)

--------- Co-authored-by: john <hondaxiao@tencent.com>
ossrs · Oct 10, 2023 · 40e5962 · 40e5962
1 parent a1e4f61
commit 40e5962
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf
@@ -316,6 +316,12 @@ srt_server {
     # Overwrite by env SRS_SRT_SERVER_MAXBW
     # default: -1
     maxbw 1000000000;
+    # Maximum Segment Size. Used for buffer allocation and rate calculation using packet counter assuming fully
+    # filled packets. Each party can set its own MSS value independently. During a handshake the parties exchange
+    # MSS values, and the lowest is used.
+    # Overwrite by env SRS_SRT_SERVER_MSS
+    # default: 1500
+    mss 1500;
     # The timeout time of the SRT connection on the sender side in ms. When SRT connects to a peer costs time 
     # more than this config, it will be close.
     # Overwrite by env SRS_SRT_SERVER_CONNECT_TIMEOUT

diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2023-10-10, Merge [#3825](https://github.com/ossrs/srs/pull/3825): SRT: Fix the missing config mss. v6.0.88 (#3825)
 * v6.0, 2023-10-08, Merge [#3824](https://github.com/ossrs/srs/pull/3824): Solve the problem of inaccurate HLS TS duration. v6.0.87 (#3824)
 * v6.0, 2023-10-08, Merge [#3815](https://github.com/ossrs/srs/pull/3815): Use new cache image name. v6.0.86 (#3815)
 * v6.0, 2023-09-26, Merge [#3811](https://github.com/ossrs/srs/pull/3811): Turn off the related utests H265 option. v6.0.85 (#3811)
@@ -99,6 +100,7 @@ The changelog for SRS.
 <a name="v5-changes"></a>
 
 ## SRS 5.0 Changelog
+* v5.0, 2023-10-10, Merge [#3825](https://github.com/ossrs/srs/pull/3825): SRT: Fix the missing config mss. v5.0.188 (#3825)
 * v5.0, 2023-10-08, Merge [#3824](https://github.com/ossrs/srs/pull/3824): Solve the problem of inaccurate HLS TS duration. v5.0.187 (#3824)
 * v5.0, 2023-10-08, Merge [#3815](https://github.com/ossrs/srs/pull/3815): Use new cache image name. v5.0.186 (#3815)
 * v5.0, 2023-09-28, Merge [#3816](https://github.com/ossrs/srs/pull/3816): cherry-pick from develop, for srt utest. v5.0.185 (#3816)

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
@@ -7912,15 +7912,15 @@ int64_t SrsConfig::get_srto_maxbw()
 
 int SrsConfig::get_srto_mss()
 {
-    SRS_OVERWRITE_BY_ENV_INT("srs.srt_server.mms"); // SRS_SRT_SERVER_MMS
+    SRS_OVERWRITE_BY_ENV_INT("srs.srt_server.mss"); // SRS_SRT_SERVER_MSS
 
     static int DEFAULT = 1500;
     SrsConfDirective* conf = root->get("srt_server");
     if (!conf) {
         return DEFAULT;
     }
 
-    conf = conf->get("mms");
+    conf = conf->get("mss");
     if (!conf || conf->arg0().empty()) {
         return DEFAULT;
     }

diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    187
+#define VERSION_REVISION    188
 
 #endif
diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    87
+#define VERSION_REVISION    88
 
 #endif
diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp
@@ -4225,7 +4225,7 @@ VOID TEST(ConfigEnvTest, CheckEnvValuesSrtServer)
         SrsSetEnvConfig(srto_maxbw, "SRS_SRT_SERVER_MAXBW", "1000000000");
         EXPECT_EQ(1000000000, conf.get_srto_maxbw());
 
-        SrsSetEnvConfig(srto_mss, "SRS_SRT_SERVER_MMS", "1000");
+        SrsSetEnvConfig(srto_mss, "SRS_SRT_SERVER_MSS", "1000");
         EXPECT_EQ(1000, conf.get_srto_mss());
 
         SrsSetEnvConfig(srto_conntimeout, "SRS_SRT_SERVER_CONNECT_TIMEOUT", "2000");