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

move config to app, for its application level features

Browse source
This commit is contained in:
winlin 2014-03-01 15:59:55 +08:00
parent 517d346a52
commit b407021d45
14 changed files with 149 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

27
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_rtmp.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_handshake.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_config.hpp>
#include <srs_protocol_io.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_handshake.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_protocol_utility.hpp>
using namespace std;
@ -127,27 +127,6 @@ int SrsRequest::discovery_app()
srs_vhost_resolve(vhost, app);
strip();
// resolve the vhost from config
SrsConfDirective* parsed_vhost = config->get_vhost(vhost);
if (parsed_vhost) {
vhost = parsed_vhost->arg0();
}
// TODO: discovery the params of vhost.
srs_info("discovery app success. schema=%s, vhost=%s, port=%s, app=%s",
schema.c_str(), vhost.c_str(), port.c_str(), app.c_str());
if (schema.empty() || vhost.empty() || port.empty() || app.empty()) {
ret = ERROR_RTMP_REQ_TCURL;
srs_error("discovery tcUrl failed. "
"tcUrl=%s, schema=%s, vhost=%s, port=%s, app=%s, ret=%d",
tcUrl.c_str(), schema.c_str(), vhost.c_str(), port.c_str(), app.c_str(), ret);
return ret;
}
strip();
return ret;
}