March 2010 - rtmpdump - lists.mplayerhq.hu

r403 - trunk/librtmp/handshake.h
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 11:11:39 2010 New Revision: 403 Log: Downgrade from FP9 handshake on plain RTMP and non-Adobe server Modified: trunk/librtmp/handshake.h Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Thu Mar 25 08:21:52 2010 (r402) +++ trunk/librtmp/handshake.h Thu Mar 25 11:11:39 2010 (r403) @@ -468,6 +468,9 @@ HandShake(RTMP * r, bool FP9HandShake) RTMP_Log(RTMP_LOGDEBUG, "%s: FMS Version : %d.%d.%d.%d", __FUNCTION__, serversig[4], serversig[5], serversig[6], serversig[7]); + if (FP9HandShake && type == 3 && !serversig[4]) + FP9HandShake = false; + #ifdef _DEBUG RTMP_Log(RTMP_LOGDEBUG, "Server signature:"); RTMP_LogHex(RTMP_LOGDEBUG, serversig, RTMP_SIG_SIZE);

1 0

r402 - in trunk: librtmp/rtmp.c rtmpgw.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 08:21:52 2010 New Revision: 402 Log: Fix #undef CRYPTO case Modified: trunk/librtmp/rtmp.c trunk/rtmpgw.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Thu Mar 25 04:29:51 2010 (r401) +++ trunk/librtmp/rtmp.c Thu Mar 25 08:21:52 2010 (r402) @@ -37,12 +37,12 @@ #include <openssl/ssl.h> #include <openssl/rc4.h> #endif +TLS_CTX RTMP_TLS_ctx; #endif #define RTMP_SIG_SIZE 1536 #define RTMP_LARGE_HEADER_SIZE 12 -TLS_CTX RTMP_TLS_ctx; static const int packetSize[] = { 12, 8, 4, 1 }; bool RTMP_ctrlC; @@ -195,6 +195,7 @@ RTMP_LibVersion() void RTMP_TLS_Init() { +#ifdef CRYPTO #ifdef USE_GNUTLS gnutls_global_init(); RTMP_TLS_ctx = malloc(sizeof(struct tls_ctx)); @@ -210,13 +211,16 @@ RTMP_TLS_Init() SSL_CTX_set_options(RTMP_TLS_ctx, SSL_OP_ALL); SSL_CTX_set_default_verify_paths(RTMP_TLS_ctx); #endif +#endif } void RTMP_Init(RTMP *r) { +#ifdef CRYPTO if (!RTMP_TLS_ctx) RTMP_TLS_Init(); +#endif memset(r, 0, sizeof(RTMP)); r->m_sb.sb_socket = -1; @@ -474,6 +478,7 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) { if (r->Link.protocol & RTMP_FEATURE_SSL) { +#ifdef CRYPTO TLS_client(RTMP_TLS_ctx, r->m_sb.sb_ssl); TLS_setfd(r->m_sb.sb_ssl, r->m_sb.sb_socket); if (TLS_connect(r->m_sb.sb_ssl) < 0) @@ -482,6 +487,12 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) RTMP_Close(r); return false; } +#else + RTMP_Log(RTMP_LOGERROR, "%s, no CRYPTO support", __FUNCTION__); + RTMP_Close(r); + return false; + +#endif } if (r->Link.protocol & RTMP_FEATURE_HTTP) { @@ -2866,11 +2877,13 @@ RTMPSockBuf_Fill(RTMPSockBuf *sb) while (1) { nBytes = sizeof(sb->sb_buf) - sb->sb_size - (sb->sb_start - sb->sb_buf); +#ifdef CRYPTO if (sb->sb_ssl) { nBytes = TLS_read(sb->sb_ssl, sb->sb_start + sb->sb_size, nBytes); } else +#endif { nBytes = recv(sb->sb_socket, sb->sb_start + sb->sb_size, nBytes, 0); } @@ -2907,11 +2920,13 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const fwrite(buf, 1, len, netstackdump); #endif +#ifdef CRYPTO if (sb->sb_ssl) { rc = TLS_write(sb->sb_ssl, buf, len); } else +#endif { rc = send(sb->sb_socket, buf, len, 0); } @@ -2921,12 +2936,14 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const int RTMPSockBuf_Close(RTMPSockBuf *sb) { +#ifdef CRYPTO if (sb->sb_ssl) { TLS_shutdown(sb->sb_ssl); TLS_close(sb->sb_ssl); sb->sb_ssl = NULL; } +#endif return closesocket(sb->sb_socket); } Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 25 04:29:51 2010 (r401) +++ trunk/rtmpgw.c Thu Mar 25 08:21:52 2010 (r402) @@ -104,7 +104,9 @@ typedef struct uint32_t dStartOffset; uint32_t dStopOffset; +#ifdef CRYPTO unsigned char hash[HASHLEN]; +#endif } RTMP_REQUEST; #define STR2AVAL(av,str) av.av_val = str; av.av_len = strlen(av.av_val) @@ -515,11 +517,13 @@ void processTCPrequest(STREAMING_SERVER if (req.swfVfy) { +#ifdef CRYPTO if (RTMP_HashSWF(req.swfUrl.av_val, &req.swfSize, req.hash, req.swfAge) == 0) { req.swfHash.av_val = (char *)req.hash; req.swfHash.av_len = HASHLEN; } +#endif } // after validation of the http request send response header

1 0

Getting the rtmp urls Linux
by Alexi Remananov 25 Mar '10

25 Mar '10

Hello can someone tell me what i am doing wrong with getting the rtmp urls? I followed the README info and it doesnt seem to work. Created a new user called user2 with uid of 1001 Made the rtmpdump directory accessible to user2. sudo iptables -t nat -A OUTPUT -p tcp --dport 1935 -m owner --uid-owner 1001 -j REDIRECT cd rtmpdump sudo su user2 ./rtmpsvr Then i launch the browser , go to the website start the stream and this is all i get RTMP Server v2.2b (c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL Streaming on rtmp://0.0.0.0:1935 And the stream in the browser plays but rtmpsvr and rtmpsuck (tried both) just does that with no info generated. What am i doing wrong?

2 1

r401 - in trunk/librtmp: handshake.h log.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 04:29:51 2010 New Revision: 401 Log: Cleanup LogHex, just print 16 bytes per line Modified: trunk/librtmp/handshake.h trunk/librtmp/log.c Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Thu Mar 25 04:25:11 2010 (r400) +++ trunk/librtmp/handshake.h Thu Mar 25 04:29:51 2010 (r401) @@ -728,7 +728,7 @@ SHandShake(RTMP * r) return false; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Requested : %02X", __FUNCTION__, type); - RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); + RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (type == 3) { @@ -824,7 +824,7 @@ SHandShake(RTMP * r) } RTMP_Log(RTMP_LOGDEBUG2, "Serversig: "); - RTMP_LogHexString(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE); + RTMP_LogHex(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE); if (!WriteN(r, serversig-1, RTMP_SIG_SIZE + 1)) return false; @@ -948,7 +948,7 @@ SHandShake(RTMP * r) RTMP_Log(RTMP_LOGDEBUG2, "%s: Sending handshake response: ", __FUNCTION__); - RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); + RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (!WriteN(r, clientsig, RTMP_SIG_SIZE)) return false; @@ -958,7 +958,7 @@ SHandShake(RTMP * r) return false; RTMP_Log(RTMP_LOGDEBUG2, "%s: 2nd handshake: ", __FUNCTION__); - RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); + RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (FP9HandShake) { Modified: trunk/librtmp/log.c ============================================================================== --- trunk/librtmp/log.c Thu Mar 25 04:25:11 2010 (r400) +++ trunk/librtmp/log.c Thu Mar 25 04:29:51 2010 (r401) @@ -132,9 +132,11 @@ void RTMP_LogHex(int level, const char * if ( level > RTMP_debuglevel ) return; for(i=0; i<len; i++) { - RTMP_LogPrintf("%02X ", (unsigned char)data[i]); + RTMP_LogPrintf("%02X%c", (unsigned char)data[i], + ((i & 0x0f) == 0x0f) ? '\n': ' '); } - RTMP_LogPrintf("\n"); + if (i & 0x0f) + RTMP_LogPrintf("\n"); } void RTMP_LogHexString(int level, const char *data, unsigned long len)

1 0

r400 - trunk/librtmp/parseurl.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 04:25:11 2010 New Revision: 400 Log: Fix prev commit Modified: trunk/librtmp/parseurl.c Modified: trunk/librtmp/parseurl.c ============================================================================== --- trunk/librtmp/parseurl.c Thu Mar 25 04:14:34 2010 (r399) +++ trunk/librtmp/parseurl.c Thu Mar 25 04:25:11 2010 (r400) @@ -150,6 +150,7 @@ parsehost: else if(strncmp(p, "ondemand/", 9)==0) { // app = ondemand/foobar, only pass app=ondemand applen = 8; + appnamelen = 8; } else { // app!=ondemand, so app is app[/appinstance] if(slash3)

1 0

r399 - trunk/rtmpgw.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 04:14:34 2010 New Revision: 399 Log: Cleanup prev Modified: trunk/rtmpgw.c Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 25 04:08:55 2010 (r398) +++ trunk/rtmpgw.c Thu Mar 25 04:14:34 2010 (r399) @@ -448,7 +448,7 @@ void processTCPrequest(STREAMING_SERVER if (!ParseOption(ich, arg, &req)) { - status = "400 unrecognized option"; + status = "400 unknown option"; goto filenotfound; } }

1 0

r398 - trunk/rtmpsrv.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 04:08:55 2010 New Revision: 398 Log: Child process must exit if exec failed. (exec should never fail unless your PATH is messed up) Modified: trunk/rtmpsrv.c Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Thu Mar 25 04:06:12 2010 (r397) +++ trunk/rtmpsrv.c Thu Mar 25 04:08:55 2010 (r398) @@ -348,7 +348,8 @@ spawn_dumper(int argc, AVal *av, char *c argv[i][av[i].av_len] = '\0'; } argv[i] = NULL; - execvp(argv[0], argv); + if ((i = execvp(argv[0], argv))) + _exit(i); } #endif }

1 0

Unrecognized option
by Anders Hasselqvist 25 Mar '10

25 Mar '10

Hi Howard, Occasionally I have to resume a download that has failed. In those cases I just append "--resume" to the command line. On several occasions I have been a bit fast and only typed "-resume" or misspelled it in some other way. Instead of getting an error stating I provided an unknown option, my file is just overwritten. I think that from a user perspective it would be better that rtmpdump (and friends) abort when an unknown option is provided. Regards, Anders

2 1

r397 - in trunk: rtmpdump.c rtmpgw.c
by hyc 25 Mar '10

25 Mar '10

Author: hyc Date: Thu Mar 25 04:06:12 2010 New Revision: 397 Log: Abort on unrecognized options Modified: trunk/rtmpdump.c trunk/rtmpgw.c Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Wed Mar 24 19:43:30 2010 (r396) +++ trunk/rtmpdump.c Thu Mar 25 04:06:12 2010 (r397) @@ -1122,6 +1122,7 @@ main(int argc, char **argv) break; default: RTMP_LogPrintf("unknown option: %c\n", opt); + return RD_FAILED; break; } } Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Wed Mar 24 19:43:30 2010 (r396) +++ trunk/rtmpgw.c Thu Mar 25 04:06:12 2010 (r397) @@ -446,7 +446,11 @@ void processTCPrequest(STREAMING_SERVER ptr += nArgLen + 1; len -= nArgLen + 1; - ParseOption(ich, arg, &req); + if (!ParseOption(ich, arg, &req)) + { + status = "400 unrecognized option"; + goto filenotfound; + } } } } @@ -953,7 +957,7 @@ ParseOption(char opt, char *arg, RTMP_RE break; default: RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg); - break; + return false; } return true; } @@ -1142,7 +1146,8 @@ main(int argc, char **argv) } default: //RTMP_LogPrintf("unknown option: %c\n", opt); - ParseOption(opt, optarg, &defaultRTMPRequest); + if (!ParseOption(opt, optarg, &defaultRTMPRequest)) + return RD_FAILED; break; } }

1 0

RTMPDUMP: Access violation on a stream
by rtmpdump＠pepak.net 24 Mar '10

24 Mar '10

Hi! Hope you don't mind me posting a bug report. I am using the Windows version of RTMPDUMP and have just found a stream which starts to download but after 128 KB (two "Download" packets) crashes with access violation in msvcrt.dll. My debug log says it happened in memcpy, but no more details than that. It happens with the latest binary release (2.2b) as well as with the current SVN source (compiled with MINGW). The relevant command on which you can test it: rtmpdump -r "rtmp://flash.nova.nacevi.cz:80/vod" -y "nova/2010/03/2010-03-23_Ulice-1007-dil-D611027" -o test.flv Thanks, Pepak

4 3