Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the same 'client_id' error when asynchronous call #2665

Merged
merged 1 commit into from
Oct 15, 2021
Merged

fix the same 'client_id' error when asynchronous call #2665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions trunk/src/app/srs_app_http_static.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ using namespace std;
#include <srs_app_http_hooks.hpp>
#include <srs_app_statistic.hpp>
#include <srs_app_hybrid.hpp>
#include <srs_service_log.hpp>

#define SRS_CONTEXT_IN_HLS "hls_ctx"

Expand Down Expand Up @@ -194,6 +195,12 @@ srs_error_t SrsVodStream::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMes
srs_assert(hr);

SrsRequest* req = hr->to_request(hr->host())->as_http();
// discovery vhost, resolve the vhost from config
SrsConfDirective* parsed_vhost = _srs_config->get_vhost(req->vhost);
Copy link
Member Author

@duiniuluantanqin duiniuluantanqin Oct 12, 2021 •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines 199-202 search for vhost to resolve the issue of inconsistent stream IDs in the statistics information.

TRANS_BY_GPT3

if (parsed_vhost) {
req->vhost = parsed_vhost->arg0();
}

SrsAutoFree(SrsRequest, req);

string ctx = hr->query_get(SRS_CONTEXT_IN_HLS);
Expand All @@ -202,16 +209,19 @@ srs_error_t SrsVodStream::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMes
return SrsHttpFileServer::serve_m3u8_ctx(w, r, fullpath);
}

if ((err = http_hooks_on_play(req)) != srs_success) {
return srs_error_wrap(err, "HLS: http_hooks_on_play");
}

if (ctx.empty()) {
// make sure unique
do {
ctx = srs_random_str(8); // the same as cid
} while (ctx_is_exist(ctx));
}

SrsContextRestore(_srs_context->get_id());
_srs_context->set_id(SrsContextId().set_value(ctx));

if ((err = http_hooks_on_play(req)) != srs_success) {
return srs_error_wrap(err, "HLS: http_hooks_on_play");
}

std::stringstream ss;
ss << "#EXTM3U" << SRS_CONSTS_LF;
Expand Down Expand Up @@ -339,6 +349,9 @@ srs_error_t SrsVodStream::on_timer(srs_utime_t interval)
SrsRequest* req = it->second.req;
srs_utime_t hls_window = _srs_config->get_hls_window(req->vhost);
if (it->second.request_time + (2 * hls_window) < srs_get_system_time()) {
SrsContextRestore(_srs_context->get_id());
_srs_context->set_id(SrsContextId().set_value(ctx));

http_hooks_on_stop(req);
srs_freep(req);

Expand Down
92 changes: 49 additions & 43 deletions trunk/src/app/srs_app_rtc_conn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,22 +351,22 @@ srs_error_t SrsRtcPLIWorker::cycle()

return err;
}
SrsRtcAsyncCallOnStop::SrsRtcAsyncCallOnStop(SrsContextId c, SrsRequest * r)
{

Copy link
Member Author

@duiniuluantanqin duiniuluantanqin Oct 12, 2021 •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The modification here is to remove the ^M symbol, the same applies below.

TRANS_BY_GPT3

SrsRtcAsyncCallOnStop::SrsRtcAsyncCallOnStop(SrsContextId c, SrsRequest * r)
{
cid = c;
req = r->copy();
}
SrsRtcAsyncCallOnStop::~SrsRtcAsyncCallOnStop()
{
srs_freep(req);
}
srs_error_t SrsRtcAsyncCallOnStop::call()
{
srs_error_t err = srs_success;
req = r->copy();
}

SrsRtcAsyncCallOnStop::~SrsRtcAsyncCallOnStop()
{
srs_freep(req);
}

srs_error_t SrsRtcAsyncCallOnStop::call()
{
srs_error_t err = srs_success;

if (!_srs_config->get_vhost_http_hooks_enabled(req->vhost)) {
return err;
}
Expand All @@ -386,17 +386,20 @@ srs_error_t SrsRtcAsyncCallOnStop::call()
hooks = conf->args;
}

SrsContextRestore(_srs_context->get_id());
_srs_context->set_id(cid);

for (int i = 0; i < (int)hooks.size(); i++) {
std::string url = hooks.at(i);
SrsHttpHooks::on_stop(url, req);
}

return err;
}
std::string SrsRtcAsyncCallOnStop::to_string()
{
return std::string("");
return err;
}

std::string SrsRtcAsyncCallOnStop::to_string()
{
return std::string("");
}

SrsRtcPlayStream::SrsRtcPlayStream(SrsRtcConnection* s, const SrsContextId& cid)
Expand Down Expand Up @@ -997,21 +1000,21 @@ srs_error_t SrsRtcPublishTwccTimer::on_timer(srs_utime_t interval)
}


SrsRtcAsyncCallOnUnpublish::SrsRtcAsyncCallOnUnpublish(SrsContextId c, SrsRequest * r)
{
SrsRtcAsyncCallOnUnpublish::SrsRtcAsyncCallOnUnpublish(SrsContextId c, SrsRequest * r)
{
cid = c;
req = r->copy();
}
SrsRtcAsyncCallOnUnpublish::~SrsRtcAsyncCallOnUnpublish()
{
srs_freep(req);
}
srs_error_t SrsRtcAsyncCallOnUnpublish::call()
{
srs_error_t err = srs_success;
req = r->copy();
}

SrsRtcAsyncCallOnUnpublish::~SrsRtcAsyncCallOnUnpublish()
{
srs_freep(req);
}

srs_error_t SrsRtcAsyncCallOnUnpublish::call()
{
srs_error_t err = srs_success;

if (!_srs_config->get_vhost_http_hooks_enabled(req->vhost)) {
return err;
}
Expand All @@ -1031,17 +1034,20 @@ srs_error_t SrsRtcAsyncCallOnUnpublish::call()
hooks = conf->args;
}

SrsContextRestore(_srs_context->get_id());
_srs_context->set_id(cid);

for (int i = 0; i < (int)hooks.size(); i++) {
std::string url = hooks.at(i);
SrsHttpHooks::on_unpublish(url, req);
}
return err;
}
std::string SrsRtcAsyncCallOnUnpublish::to_string()
{
return std::string("");
}

return err;
}

std::string SrsRtcAsyncCallOnUnpublish::to_string()
{
return std::string("");
}

SrsRtcPublishStream::SrsRtcPublishStream(SrsRtcConnection* session, const SrsContextId& cid)
Expand Down