external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

For #1657, refine code

Browse source
This commit is contained in:
winlin 2020-11-05 21:25:55 +08:00
parent c3d290013e
commit 2fedb683e8
2 changed files with 59 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
trunk/src/app/srs_app_http_conn.cpp
View file

@ -165,9 +165,6 @@ srs_error_t SrsHttpConn::do_cycle()
// @see https://github.com/ossrs/srs/issues/398 // @see https://github.com/ossrs/srs/issues/398
skt->set_recv_timeout(SRS_HTTP_RECV_TIMEOUT); skt->set_recv_timeout(SRS_HTTP_RECV_TIMEOUT);
SrsRequest* last_req = NULL;
SrsAutoFree(SrsRequest, last_req);
// initialize parser // initialize parser
if ((err = parser->initialize(HTTP_REQUEST)) != srs_success) { if ((err = parser->initialize(HTTP_REQUEST)) != srs_success) {
return srs_error_wrap(err, "init parser for %s", ip.c_str()); return srs_error_wrap(err, "init parser for %s", ip.c_str());
@ -178,12 +175,34 @@ srs_error_t SrsHttpConn::do_cycle()
return srs_error_wrap(err, "start"); return srs_error_wrap(err, "start");
} }
// process http messages. SrsRequest* last_req = NULL;
for (int req_id = 0; (err = trd->pull()) == srs_success; req_id++) { SrsAutoFree(SrsRequest, last_req);
// process all http messages.
err = process_requests(&last_req);
srs_error_t r0 = srs_success;
if ((r0 = on_disconnect(last_req)) != srs_success) {
err = srs_error_wrap(err, "on disconnect %s", srs_error_desc(r0).c_str());
srs_freep(r0);
}
return err;
}
srs_error_t SrsHttpConn::process_requests(SrsRequest** preq)
{
srs_error_t err = srs_success;
for (int req_id = 0; ; req_id++) {
if ((err = trd->pull()) != srs_success) {
return srs_error_wrap(err, "pull");
}
// get a http message // get a http message
ISrsHttpMessage* req = NULL; ISrsHttpMessage* req = NULL;
if ((err = parser->parse_message(skt, &req)) != srs_success) { if ((err = parser->parse_message(skt, &req)) != srs_success) {
break; return srs_error_wrap(err, "parse message");
} }
// if SUCCESS, always NOT-NULL. // if SUCCESS, always NOT-NULL.
@ -196,23 +215,23 @@ srs_error_t SrsHttpConn::do_cycle()
hreq->set_connection(this); hreq->set_connection(this);
// copy request to last request object. // copy request to last request object.
srs_freep(last_req); srs_freep(*preq);
last_req = hreq->to_request(hreq->host()); *preq = hreq->to_request(hreq->host());
// may should discard the body. // may should discard the body.
SrsHttpResponseWriter writer(skt); SrsHttpResponseWriter writer(skt);
if ((err = handler_->on_http_message(req, &writer)) != srs_success) { if ((err = handler_->on_http_message(req, &writer)) != srs_success) {
break; return srs_error_wrap(err, "on http message");
} }
// ok, handle http request. // ok, handle http request.
if ((err = process_request(&writer, req)) != srs_success) { if ((err = process_request(&writer, req)) != srs_success) {
break; return srs_error_wrap(err, "process request");
} }
// After the request is processed. // After the request is processed.
if ((err = handler_->on_message_done(req, &writer)) != srs_success) { if ((err = handler_->on_message_done(req, &writer)) != srs_success) {
break; return srs_error_wrap(err, "on message done");
} }
// donot keep alive, disconnect it. // donot keep alive, disconnect it.
@ -222,12 +241,6 @@ srs_error_t SrsHttpConn::do_cycle()
} }
} }
srs_error_t r0 = srs_success;
if ((r0 = on_disconnect(last_req)) != srs_success) {
err = srs_error_wrap(err, "on disconnect %s", srs_error_desc(r0).c_str());
srs_freep(r0);
}
return err; return err;
} }

1
trunk/src/app/srs_app_http_conn.hpp
View file

@ -118,6 +118,7 @@ public:
virtual srs_error_t cycle(); virtual srs_error_t cycle();
private: private:
virtual srs_error_t do_cycle(); virtual srs_error_t do_cycle();
virtual srs_error_t process_requests(SrsRequest** preq);
private: private:
virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
// When the connection disconnect, call this method. // When the connection disconnect, call this method.