From 86d849c54e26951e313d1dcb4b220055f79aacc0 Mon Sep 17 00:00:00 2001 From: Paul Cuttler Date: Wed, 7 Oct 2015 14:50:27 +1100 Subject: [PATCH] FS-7924: [mod_rtmp] Modify initStream & createStream responses Moved the response message mistakenly placed in the initStream handler to the createStream handler --- src/mod/endpoints/mod_rtmp/rtmp_sig.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mod/endpoints/mod_rtmp/rtmp_sig.c b/src/mod/endpoints/mod_rtmp/rtmp_sig.c index 711d368736..c319fc7881 100644 --- a/src/mod/endpoints/mod_rtmp/rtmp_sig.c +++ b/src/mod/endpoints/mod_rtmp/rtmp_sig.c @@ -127,6 +127,13 @@ RTMP_INVOKE_FUNCTION(rtmp_i_connect) RTMP_INVOKE_FUNCTION(rtmp_i_createStream) { + rtmp_send_invoke_free(rsession, amfnumber, 0, 0, + amf0_str("_result"), + amf0_number_new(transaction_id), + amf0_null_new(), + amf0_number_new(rsession->next_streamid), + NULL); + switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rsession->uuid), SWITCH_LOG_INFO, "Replied to createStream (%u)\n", amf0_get_number(argv[1])); rsession->next_streamid++; @@ -136,13 +143,6 @@ RTMP_INVOKE_FUNCTION(rtmp_i_createStream) RTMP_INVOKE_FUNCTION(rtmp_i_initStream) { - rtmp_send_invoke_free(rsession, amfnumber, 0, 0, - amf0_str("_result"), - amf0_number_new(transaction_id), - amf0_null_new(), - amf0_number_new(rsession->next_streamid), - NULL); - switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rsession->uuid), SWITCH_LOG_INFO, "Received initStream (%u)\n", rsession->next_streamid); rsession->next_streamid++;