external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTMP: If port is explicity set to 0, use default 1935 (#1754)

Browse source
This commit is contained in:
Matheus Macabu 2021-10-19 02:20:28 +02:00 • committed by GitHub
parent 85131dad63
commit 9a017f4037
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -189,7 +189,7 @@ void srs_parse_hostport(string hostport, string& host, int& port)
if (hostport.find(":") == pos) {
host = hostport.substr(0, pos);
string p = hostport.substr(pos + 1);
if (!p.empty()) {
if (!p.empty() && p != "0") {
port = ::atoi(p.c_str());
}
return;
@ -204,7 +204,7 @@ void srs_parse_hostport(string hostport, string& host, int& port)
// For ipv6, [host]:port.
host = hostport.substr(1, pos - 1);
string p = hostport.substr(pos + 2);
if (!p.empty()) {
if (!p.empty() && p != "0") {
port = ::atoi(p.c_str());
}
}

8
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -4570,6 +4570,14 @@ VOID TEST(KernelUtilityTest, CoverTimeUtilityAll)
srs_parse_hostport("domain.com", host, port);
EXPECT_STREQ("domain.com", host.c_str());
}
if (true) {
string host;
int port = 1935;
srs_parse_hostport("domain.com:0", host, port);
EXPECT_EQ(1935, port);
EXPECT_STREQ("domain.com", host.c_str());
}
if (true) {
string ep = srs_any_address_for_listener();