Skip to content

Commit 53ebf58

Browse files
committed
SRT: Fix the missing config mss. v5.0.188 (#3825)
--------- Co-authored-by: john <[email protected]>
1 parent 75c9c5a commit 53ebf58

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

trunk/conf/full.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,12 @@ srt_server {
316316
# Overwrite by env SRS_SRT_SERVER_MAXBW
317317
# default: -1
318318
maxbw 1000000000;
319+
# Maximum Segment Size. Used for buffer allocation and rate calculation using packet counter assuming fully
320+
# filled packets. Each party can set its own MSS value independently. During a handshake the parties exchange
321+
# MSS values, and the lowest is used.
322+
# Overwrite by env SRS_SRT_SERVER_MSS
323+
# default: 1500
324+
mss 1500;
319325
# The timeout time of the SRT connection on the sender side in ms. When SRT connects to a peer costs time
320326
# more than this config, it will be close.
321327
# Overwrite by env SRS_SRT_SERVER_CONNECT_TIMEOUT

trunk/doc/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v5-changes"></a>
88

99
## SRS 5.0 Changelog
10+
* v5.0, 2023-10-10, Merge [#3825](https://github.com/ossrs/srs/pull/3825): SRT: Fix the missing config mss. v5.0.188 (#3825)
1011
* 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)
1112
* v5.0, 2023-10-08, Merge [#3815](https://github.com/ossrs/srs/pull/3815): Use new cache image name. v5.0.186 (#3815)
1213
* 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)

trunk/src/app/srs_app_config.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7912,15 +7912,15 @@ int64_t SrsConfig::get_srto_maxbw()
79127912

79137913
int SrsConfig::get_srto_mss()
79147914
{
7915-
SRS_OVERWRITE_BY_ENV_INT("srs.srt_server.mms"); // SRS_SRT_SERVER_MMS
7915+
SRS_OVERWRITE_BY_ENV_INT("srs.srt_server.mss"); // SRS_SRT_SERVER_MSS
79167916

79177917
static int DEFAULT = 1500;
79187918
SrsConfDirective* conf = root->get("srt_server");
79197919
if (!conf) {
79207920
return DEFAULT;
79217921
}
79227922

7923-
conf = conf->get("mms");
7923+
conf = conf->get("mss");
79247924
if (!conf || conf->arg0().empty()) {
79257925
return DEFAULT;
79267926
}

trunk/src/core/srs_core_version5.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 5
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 187
12+
#define VERSION_REVISION 188
1313

1414
#endif

trunk/src/utest/srs_utest_config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4225,7 +4225,7 @@ VOID TEST(ConfigEnvTest, CheckEnvValuesSrtServer)
42254225
SrsSetEnvConfig(srto_maxbw, "SRS_SRT_SERVER_MAXBW", "1000000000");
42264226
EXPECT_EQ(1000000000, conf.get_srto_maxbw());
42274227

4228-
SrsSetEnvConfig(srto_mss, "SRS_SRT_SERVER_MMS", "1000");
4228+
SrsSetEnvConfig(srto_mss, "SRS_SRT_SERVER_MSS", "1000");
42294229
EXPECT_EQ(1000, conf.get_srto_mss());
42304230

42314231
SrsSetEnvConfig(srto_conntimeout, "SRS_SRT_SERVER_CONNECT_TIMEOUT", "2000");

0 commit comments

Comments
 (0)