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

For #1638, #307, should set err in return value.

Browse source
This commit is contained in:
winlin 2020-03-17 18:33:05 +08:00
parent 0ff8a3761b
commit 28c1c57854
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,7 @@ public:
virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf) = 0; virtual srs_error_t on_udp_packet(const sockaddr* from, const int fromlen, char* buf, int nb_buf) = 0;
}; };
// TODO: FIXME: Add comments?
class ISrsUdpMuxHandler class ISrsUdpMuxHandler
{ {
public: public:

15
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -166,7 +166,7 @@ srs_error_t SrsSdp::decode(const string& sdp_str)
break; break;
} }
case 'a' :{ case 'a' :{
if (parse_attr(line) != srs_success) { if ((err = parse_attr(line)) != srs_success) {
return srs_error_wrap(err, "decode sdp line=%s failed", line.c_str()); return srs_error_wrap(err, "decode sdp line=%s failed", line.c_str());
} }
break; break;
@ -466,11 +466,11 @@ srs_error_t SrsDtlsSession::srtp_initialize()
client_key = client_master_key + client_master_salt; client_key = client_master_key + client_master_salt;
server_key = server_master_key + server_master_salt; server_key = server_master_key + server_master_salt;
if (srtp_send_init() != srs_success) { if ((err = srtp_send_init()) != srs_success) {
return srs_error_wrap(err, "srtp send init failed"); return srs_error_wrap(err, "srtp send init failed");
} }
if (srtp_recv_init() != srs_success) { if ((err = srtp_recv_init()) != srs_success) {
return srs_error_wrap(err, "srtp recv init failed"); return srs_error_wrap(err, "srtp recv init failed");
} }
@ -658,7 +658,7 @@ srs_error_t SrsRtcSenderThread::cycle()
// TODO: FIXME: Should refactor it, directly use http server as handler. // TODO: FIXME: Should refactor it, directly use http server as handler.
ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); ISrsSourceHandler* handler = _srs_hybrid->srs()->instance();
if (_srs_sources->fetch_or_create(&rtc_session->request, handler, &source) != srs_success) { if ((err = _srs_sources->fetch_or_create(&rtc_session->request, handler, &source)) != srs_success) {
return srs_error_wrap(err, "rtc fetch source failed"); return srs_error_wrap(err, "rtc fetch source failed");
} }
@ -666,7 +666,7 @@ srs_error_t SrsRtcSenderThread::cycle()
rtc_session->request.get_stream_url().c_str(), source->source_id(), source->source_id()); rtc_session->request.get_stream_url().c_str(), source->source_id(), source->source_id());
SrsConsumer* consumer = NULL; SrsConsumer* consumer = NULL;
if (source->create_consumer(NULL, consumer) != srs_success) { if ((err = source->create_consumer(NULL, consumer)) != srs_success) {
return srs_error_wrap(err, "rtc create consumer, source url=%s", rtc_session->request.get_stream_url().c_str()); return srs_error_wrap(err, "rtc create consumer, source url=%s", rtc_session->request.get_stream_url().c_str());
} }
@ -684,7 +684,7 @@ srs_error_t SrsRtcSenderThread::cycle()
#endif #endif
int msg_count = 0; int msg_count = 0;
if (consumer->dump_packets(&msgs, msg_count) != srs_success) { if ((err = consumer->dump_packets(&msgs, msg_count)) != srs_success) {
continue; continue;
} }
@ -771,7 +771,6 @@ srs_error_t SrsRtcSession::check_source()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
// TODO: FIXME: Check return error.
if (source == NULL) { if (source == NULL) {
// TODO: FIXME: Should refactor it, directly use http server as handler. // TODO: FIXME: Should refactor it, directly use http server as handler.
ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); ISrsSourceHandler* handler = _srs_hybrid->srs()->instance();
@ -1205,7 +1204,7 @@ srs_error_t SrsRtcServer::initialize()
srs_error_t err = srs_success; srs_error_t err = srs_success;
rttrd = new SrsRtcTimerThread(this, _srs_context->get_id()); rttrd = new SrsRtcTimerThread(this, _srs_context->get_id());
if (rttrd->start() != srs_success) { if ((err = rttrd->start()) != srs_success) {
return srs_error_wrap(err, "rtc timer thread init failed"); return srs_error_wrap(err, "rtc timer thread init failed");
} }