September 2014 - rtmpdump - lists.mplayerhq.hu

[PATCH] Free extra link data when closing connection.
by Josh Allmann 23 Sep '14

23 Sep '14

Fixes a small leak when initializing a new connection. Any extra data passed into RTMP_SetupURL is copied into the Link.extras AMF object, which should be eventually freed. This will keep leaking if RTMP_SetupURL is called without a corresponding RTMP_Close. --- librtmp/rtmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 6e788bb..c5ea68c 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -4215,6 +4215,8 @@ RTMP_Close(RTMP *r) r->m_resplen = 0; r->m_unackd = 0; + if (r->Link.extras.o_num) AMF_Reset(&r->Link.extras); + if (r->Link.lFlags & RTMP_LF_FTCU) { free(r->Link.tcUrl.av_val); -- 1.7.9.5

1 0

Download not starting only sends "ping" messages
by stefan andersson 15 Sep '14

15 Sep '14

Hello Please I need help with making this download work with a live-stream with commandline extracted with ‘rtmpsrv’. It looks to me like something is wrong with rtmpdump, but maybe somebody can tell why it fails. Thanks, Stefan rtmpdump -r "rtmp://liveplay3.malimarcdn.com/thliveedge00/_definst_/?token=ch7.stream-14… dedcd6df3ee163c440a" -a "thliveedge00/_definst_/?token=ch7.stream-1410715217000-8kib3gjeb9fcd2ade8e9-c3ca11a6a95eadedcd6df3ee163c440a" -f "WIN 15,0,0, 152" -W "http://malimar.tv/flowplayer/flowplayer.swf" -p "http://malimar.tv/watch.php?vid=3a2c41ac8" -y "ch7.stream" -o ch7.stream.flv -v -V RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL DEBUG: Protocol : RTMP DEBUG: Hostname : liveplay3.malimarcdn.com DEBUG: Port : 1935 DEBUG: Playpath : ch7.stream DEBUG: tcUrl : rtmp://liveplay3.malimarcdn.com:1935/thliveedge00/_definst_/?token=ch7.stream-1410715217000-8kib3gjeb9fcd2ade8e9-c3ca11a6a95eadedcd6 df3ee163c440a DEBUG: swfUrl : http://malimar.tv/flowplayer/flowplayer.swf DEBUG: pageUrl : http://malimar.tv/watch.php?vid=3a2c41ac8 DEBUG: app : thliveedge00/_definst_/?token=ch7.stream-1410715217000-8kib3gjeb9fcd2ade8e9-c3ca11a6a95eadedcd6df3ee163c440a DEBUG: flashVer : WIN 15,0,0,152 DEBUG: live : yes DEBUG: timeout : 30 sec DEBUG: SWFSHA256: DEBUG: 38 fc f7 6c 26 96 7b 83 04 bd 3f 38 34 65 11 d6 DEBUG: 6c 47 79 c0 56 51 a9 d6 cd b1 0f 81 95 23 1d e4 DEBUG: SWFSize : 12138 DEBUG: Setting buffer time to: 36000000ms Connecting ... DEBUG: RTMP_Connect1, ... connected, handshaking DEBUG: HandShake: Client type: 03 DEBUG: HandShake: Client digest offset: 53 DEBUG: HandShake: Initial client digest: DEBUG: 04 59 21 ee 20 30 55 9c a7 62 81 d6 ec ce de c3 DEBUG: 80 cb ec b4 50 dc 79 93 e8 2b 49 27 e4 fa 4b 86 DEBUG: HandShake: Type Answer : 03 DEBUG: HandShake: Server Uptime : 96850052 DEBUG: HandShake: FMS Version : 3.0.1.1 DEBUG: HandShake: Calculated digest key from secure key and server digest: DEBUG: 9e ed a0 e9 fc b3 3f d8 7e 08 1f 41 80 75 a1 bb DEBUG: a5 5c ec c1 5f 4c 3d f0 27 7f 69 ae b0 f9 45 47 DEBUG: HandShake: Client signature calculated: DEBUG: fd 79 74 36 2a 2c e3 8e 47 6b 78 79 fd 17 fe ce DEBUG: 3b d6 19 d8 30 cf ce a5 ab 80 01 61 a7 15 e8 28 DEBUG: HandShake: Server sent signature: DEBUG: e3 50 cf da d2 44 3a e1 77 2e 08 7f 39 25 55 85 DEBUG: 12 a1 9e a1 9b c1 16 87 cd 5a 3e 83 69 1b 6f 17 DEBUG: HandShake: Digest key: DEBUG: 30 4f 6c 6c ae d2 30 ea 66 ea 1a 59 02 16 d6 84 DEBUG: 1f d1 cd 6f 35 6b f8 5f db 0b 58 e1 ff 11 bf 83 DEBUG: HandShake: Signature calculated: DEBUG: e3 50 cf da d2 44 3a e1 77 2e 08 7f 39 25 55 85 DEBUG: 12 a1 9e a1 9b c1 16 87 cd 5a 3e 83 69 1b 6f 17 DEBUG: HandShake: Genuine Adobe Flash Media Server DEBUG: HandShake: Handshaking finished.... DEBUG: RTMP_Connect1, handshaked DEBUG: Invoking connect INFO: Connected... DEBUG: HandleServerBW: server BW = 2500000 DEBUG: HandleClientBW: client BW = 2500000 2 DEBUG: HandleCtrl, received ctrl. type: 0, len: 6 DEBUG: HandleCtrl, Stream Begin 0 DEBUG: HandleChangeChunkSize, received: chunk size change to 4096 DEBUG: RTMP_ClientPacket, received: invoke 261 bytes DEBUG: (object begin) DEBUG: (object begin) DEBUG: Property: <Name: fmsVer, STRING: FMS/3,5,7,7009> DEBUG: Property: <Name: capabilities, NUMBER: 31.00> DEBUG: Property: <Name: mode, NUMBER: 1.00> DEBUG: (object end) DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetConnection.Connect.Success> DEBUG: Property: <Name: description, STRING: Connection succeeded.> DEBUG: Property: <Name: data, ECMA_ARRAY> DEBUG: (object begin) DEBUG: Property: <Name: version, STRING: 3,5,7,7009> DEBUG: (object end) DEBUG: Property: <Name: clientid, NUMBER: 48720153.00> DEBUG: Property: <Name: objectEncoding, NUMBER: 0.00> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <_result> DEBUG: HandleInvoke, received result for method call <connect> DEBUG: sending ctrl. type: 0x0003 DEBUG: Invoking createStream DEBUG: FCSubscribe: ch7.stream DEBUG: Invoking FCSubscribe DEBUG: RTMP_ClientPacket, received: invoke 29 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object end) DEBUG: HandleInvoke, server invoking <_result> DEBUG: HandleInvoke, received result for method call <createStream> DEBUG: SendPlay, seekTime=0, stopTime=0, sending play: ch7.stream DEBUG: Invoking play DEBUG: sending ctrl. type: 0x0003 DEBUG: RTMP_ClientPacket, received: invoke 143 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetStream.Play.Start> DEBUG: Property: <Name: description, STRING: FCSubscribe to stream ch7.stream.> DEBUG: Property: <Name: clientid, NUMBER: 48720153.00> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <onFCSubscribe> DEBUG: HandleCtrl, received ctrl. type: 0, len: 6 DEBUG: HandleCtrl, Stream Begin 1 DEBUG: RTMP_ClientPacket, received: invoke 198 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetStream.Play.Reset> DEBUG: Property: <Name: description, STRING: Playing and resetting wowz://dalorigin01.malimarcdn.com:1935/thorigin00/_definst_/ch7.stream.> DEBUG: Property: <Name: clientid, NUMBER: 48720153.00> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <onStatus> DEBUG: HandleInvoke, onStatus: NetStream.Play.Reset DEBUG: RTMP_ClientPacket, received: invoke 233 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetStream.Play.Start> DEBUG: Property: <Name: description, STRING: Started playing wowz://dalorigin01.malimarcdn.com:1935/thorigin00/_definst_/ch7.stream.> DEBUG: Property: <Name: clientid, NUMBER: 48720153.00> DEBUG: Property: <Name: isFastPlay, BOOLEAN: FALSE> DEBUG: Property: <Name: timecodeOffset, STRING: 8744883L> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <onStatus> DEBUG: HandleInvoke, onStatus: NetStream.Play.Start Starting Live Stream DEBUG: RTMP_ClientPacket, received: notify 24 bytes DEBUG: (object begin) DEBUG: (object end) DEBUG: RTMP_ClientPacket, received: notify 44 bytes DEBUG: (object begin) DEBUG: (object begin) DEBUG: Property: <Name: code, STRING: NetStream.Data.Start> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleCtrl, received ctrl. type: 32, len: 6 DEBUG: HandleCtrl, Stream BufferReady 1 DEBUG: RTMP_ClientPacket, received: notify 226 bytes DEBUG: (object begin) DEBUG: (object begin) DEBUG: Property: <Name: width, NUMBER: 852.00> DEBUG: Property: <Name: height, NUMBER: 480.00> DEBUG: Property: <Name: videodatarate, NUMBER: 800.00> DEBUG: Property: <Name: framerate, NUMBER: 30.00> DEBUG: Property: <Name: videocodecid, NUMBER: 7.00> DEBUG: Property: <Name: audiodatarate, NUMBER: 64.00> DEBUG: Property: <Name: audiosamplerate, NUMBER: 44100.00> DEBUG: Property: <Name: audiosamplesize, NUMBER: 16.00> DEBUG: Property: <Name: stereo, BOOLEAN: TRUE> DEBUG: Property: <Name: audiocodecid, NUMBER: 10.00> DEBUG: (object end) DEBUG: (object end) INFO: Metadata: INFO: width 852.00 INFO: height 480.00 INFO: videodatarate 800.00 INFO: framerate 30.00 INFO: videocodecid 7.00 INFO: audiodatarate 64.00 INFO: audiosamplerate 44100.00 INFO: audiosamplesize 16.00 INFO: stereo TRUE INFO: audiocodecid 10.00 0.371 kB / 0.00 sec DEBUG: ignoring too small video packet: size: 2 DEBUG: ignoring too small video packet: size: 2 DEBUG: ignoring too small audio packet: size: 0 DEBUG: HandleCtrl, received ctrl. type: 31, len: 6 DEBUG: HandleCtrl, Stream BufferEmpty 1 DEBUG: HandleCtrl, received ctrl. type: 6, len: 6 DEBUG: HandleCtrl, Ping 20934 DEBUG: sending ctrl. type: 0x0007 DEBUG: HandleCtrl, received ctrl. type: 6, len: 6 DEBUG: HandleCtrl, Ping 41428 DEBUG: sending ctrl. type: 0x0007 DEBUG: HandleCtrl, received ctrl. type: 6, len: 6 DEBUG: HandleCtrl, Ping 61934 DEBUG: sending ctrl. type: 0x0007 DEBUG: HandleCtrl, received ctrl. type: 6, len: 6 DEBUG: HandleCtrl, Ping 82438 DEBUG: sending ctrl. type: 0x0007 DEBUG: HandleCtrl, received ctrl. type: 6, len: 6 DEBUG: HandleCtrl, Ping 103403 DEBUG: sending ctrl. type: 0x0007

1 0

[PATCH] OPENSSL crypto: SSL_load_error_strings and SSL_library_init are not reentrant
by Rafaël Carré 04 Sep '14

04 Sep '14

--- librtmp/Makefile | 2 +- librtmp/rtmp.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/librtmp/Makefile b/librtmp/Makefile index 2c1c790..861933d 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -30,7 +30,7 @@ LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) -LIB_OPENSSL=-lssl -lcrypto $(LIBZ) +LIB_OPENSSL=-lssl -lcrypto $(LIBZ) -lpthread LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 6e788bb..9f74b19 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> #include <time.h> +#include <pthread.h> #include "rtmp_sys.h" #include "log.h" @@ -240,12 +241,19 @@ RTMP_TLS_Init() "ca.pem", GNUTLS_X509_FMT_PEM); #elif !defined(NO_SSL) /* USE_OPENSSL */ /* libcrypto doesn't need anything special */ - SSL_load_error_strings(); - SSL_library_init(); - OpenSSL_add_all_digests(); - RTMP_TLS_ctx = SSL_CTX_new(SSLv23_method()); - SSL_CTX_set_options(RTMP_TLS_ctx, SSL_OP_ALL); - SSL_CTX_set_default_verify_paths(RTMP_TLS_ctx); + static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + static int initialized = 0; + pthread_mutex_lock(&lock); + if (!initialized) { + SSL_load_error_strings(); + SSL_library_init(); + OpenSSL_add_all_digests(); + RTMP_TLS_ctx = SSL_CTX_new(SSLv23_method()); + SSL_CTX_set_options(RTMP_TLS_ctx, SSL_OP_ALL); + SSL_CTX_set_default_verify_paths(RTMP_TLS_ctx); + initialized = 1; + } + pthread_mutex_unlock(&lock); #endif #endif } -- 2.0.0

2 2