R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parse srs version bug

Browse Source
This commit is contained in:
winlin 2017-02-28 20:03:46 +08:00
parent c849010fe2
commit 26c20db2b3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/.gitignore vendored
View File

@ -31,4 +31,5 @@
/research/speex/ /research/speex/
/test/ /test/
.DS_Store .DS_Store
srs

19
trunk/src/protocol/srs_rtmp_stack.cpp
View File

@ -2176,16 +2176,19 @@ int SrsRtmpClient::connect_app(string app, string tcUrl, SrsRequest* r, bool dsu
if ((prop = arr->ensure_property_number("srs_pid")) != NULL) { if ((prop = arr->ensure_property_number("srs_pid")) != NULL) {
si->pid = (int)prop->to_number(); si->pid = (int)prop->to_number();
} }
if ((prop = arr->ensure_property_number("srs_version")) != NULL) { if ((prop = arr->ensure_property_string("srs_version")) != NULL) {
vector<string> versions = srs_string_split(prop->to_str(), "."); vector<string> versions = srs_string_split(prop->to_str(), ".");
if (versions.size() > 3) { if (versions.size() > 0) {
si->build = ::atoi(versions.at(3).c_str());
} else if (versions.size() > 2) {
si->revision = ::atoi(versions.at(2).c_str());
} else if (versions.size() > 1) {
si->minor = ::atoi(versions.at(1).c_str());
} else if (versions.size() > 0) {
si->major = ::atoi(versions.at(0).c_str()); si->major = ::atoi(versions.at(0).c_str());
if (versions.size() > 1) {
si->minor = ::atoi(versions.at(1).c_str());
if (versions.size() > 2) {
si->revision = ::atoi(versions.at(2).c_str());
if (versions.size() > 3) {
si->build = ::atoi(versions.at(3).c_str());
}
}
}
} }
} }
} }