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

refine response call, 2.0.24

Browse source
This commit is contained in:
winlin 2014-11-18 17:55:38 +08:00
parent 89110d9748
commit df35f75df1
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -922,15 +922,17 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg
// @see https://github.com/winlinvip/simple-rtmp-server/issues/106 // @see https://github.com/winlinvip/simple-rtmp-server/issues/106
// TODO: FIXME: response in right way, or forward in edge mode. // TODO: FIXME: response in right way, or forward in edge mode.
SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt); SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
// only response it when transaction id not zero, if (call) {
// for the zero means donot need response. // only response it when transaction id not zero,
if (call && call->transaction_id > 0) { // for the zero means donot need response.
SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id); if (call->transaction_id > 0) {
res->command_object = SrsAmf0Any::null(); SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id);
res->response = SrsAmf0Any::null(); res->command_object = SrsAmf0Any::null();
if ((ret = rtmp->send_and_free_packet(res, 0)) != ERROR_SUCCESS) { res->response = SrsAmf0Any::null();
srs_warn("response call failed. ret=%d", ret); if ((ret = rtmp->send_and_free_packet(res, 0)) != ERROR_SUCCESS) {
return ret; srs_warn("response call failed. ret=%d", ret);
return ret;
}
} }
return ret; return ret;
} }

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 23 #define VERSION_REVISION 24
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_ROLE "origin/edge server"