March 2010 - rtmpdump - lists.mplayerhq.hu

r287 - trunk/rtmpdump.1
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 10:17:33 2010 New Revision: 287 Log: Add ENVIRONMENT Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 09:56:28 2010 (r286) +++ trunk/rtmpdump.1 Thu Mar 4 10:17:33 2010 (r287) @@ -268,6 +268,14 @@ Unrecoverable error. .TP .B 2 Incomplete transfer, resuming may get further. +.SH ENVIRONMENT +.TP +.B HOME +The value of +.RB $ HOME +is used as the location for the +.I .swfinfo +file. .SH FILES .TP .I $HOME/.swfinfo

1 0

AMF LongString decoding
by NhJm 04 Mar '10

04 Mar '10

Hi, Attached a patch to fix the decoding of AMF_LONG_STRINGs. Previous code treated it as a 16-bit length string. Does not fix encoding of long strings. There will probably be some nasty overflow if someone tries to encode a string that's too long, and I see no code currently preventing that (apart from buffer length restrictions).

2 2

r285 - trunk/amf.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 08:52:02 2010 New Revision: 285 Log: Fix AMF_EncodeString to handle Long Strings Modified: trunk/amf.c Modified: trunk/amf.c ============================================================================== --- trunk/amf.c Thu Mar 4 08:48:55 2010 (r284) +++ trunk/amf.c Thu Mar 4 08:52:02 2010 (r285) @@ -169,13 +169,22 @@ AMF_EncodeInt32(char *output, char *oute char * AMF_EncodeString(char *output, char *outend, const AVal * bv) { - if (output + 1 + 2 + bv->av_len > outend) + if ((bv->av_len < 65536 && output + 1 + 2 + bv->av_len > outend) || + output + 1 + 4 + bv->av_len > outend) return NULL; - *output++ = AMF_STRING; + if (bv->av_len < 65536) + { + *output++ = AMF_STRING; - output = AMF_EncodeInt16(output, outend, bv->av_len); + output = AMF_EncodeInt16(output, outend, bv->av_len); + } + else + { + *output++ = AMF_LONG_STRING; + output = AMF_EncodeInt32(output, outend, bv->av_len); + } memcpy(output, bv->av_val, bv->av_len); output += bv->av_len;

1 0

r284 - in trunk: amf.c amf.h
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 08:48:55 2010 New Revision: 284 Log: Fix decoding of Long Strings Modified: trunk/amf.c trunk/amf.h Modified: trunk/amf.c ============================================================================== --- trunk/amf.c Thu Mar 4 08:25:29 2010 (r283) +++ trunk/amf.c Thu Mar 4 08:48:55 2010 (r284) @@ -67,6 +67,13 @@ AMF_DecodeString(const char *data, AVal bv->av_val = (bv->av_len > 0) ? (char *) data + 2 : NULL; } +void +AMF_DecodeLongString(const char *data, AVal * bv) +{ + bv->av_len = AMF_DecodeInt32(data); + bv->av_val = (bv->av_len > 0) ? (char *) data + 4 : NULL; +} + double AMF_DecodeNumber(const char *data) { @@ -718,7 +725,7 @@ AMFProp_Decode(AMFObjectProperty * prop, unsigned int nStringSize = AMF_DecodeInt32(pBuffer); if (nSize < (long) nStringSize + 4) return -1; - AMF_DecodeString(pBuffer, &prop->p_vu.p_aval); + AMF_DecodeLongString(pBuffer, &prop->p_vu.p_aval); nSize -= (4 + nStringSize); prop->p_type = AMF_STRING; break; Modified: trunk/amf.h ============================================================================== --- trunk/amf.h Thu Mar 4 08:25:29 2010 (r283) +++ trunk/amf.h Thu Mar 4 08:48:55 2010 (r284) @@ -99,6 +99,7 @@ extern "C" unsigned int AMF_DecodeInt24(const char *data); unsigned int AMF_DecodeInt32(const char *data); void AMF_DecodeString(const char *data, AVal * str); + void AMF_DecodeLongString(const char *data, AVal * str); bool AMF_DecodeBoolean(const char *data); double AMF_DecodeNumber(const char *data);

1 0

r283 - in trunk: Makefile README rtmpgw.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 08:25:29 2010 New Revision: 283 Log: Renamed streams program to rtmpgw Added: trunk/rtmpgw.c - copied, changed from r263, trunk/streams.c Modified: trunk/Makefile trunk/README Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Mar 4 08:17:29 2010 (r282) +++ trunk/Makefile Thu Mar 4 08:25:29 2010 (r283) @@ -16,7 +16,7 @@ all: @echo ' "make mingw" for a MinGW32 build' @echo 'use commandline overrides if you want anything else' -progs: rtmpdump streams rtmpsrv rtmpsuck +progs: rtmpdump rtmpgw rtmpsrv rtmpsuck posix linux unix osx: @$(MAKE) $(MAKEFLAGS) progs @@ -31,7 +31,7 @@ cross: @$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs clean: - rm -f *.o *.a rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) + rm -f *.o *.a rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) librtmp.a: rtmp.o log.o amf.o hashswf.o $(AR) rs $@ $? @@ -45,12 +45,12 @@ rtmpsrv: rtmpsrv.o thread.o librtmp.a rtmpsuck: rtmpsuck.o thread.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -streams: streams.o parseurl.o thread.o librtmp.a +rtmpgw: rtmpgw.o parseurl.o thread.o librtmp.a $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) log.o: log.c log.h Makefile parseurl.o: parseurl.c parseurl.h log.h Makefile -streams.o: streams.c rtmp.h log.h hashswf.o Makefile +rtmpgw.o: rtmpgw.c rtmp.h log.h hashswf.o Makefile rtmp.o: rtmp.c rtmp.h handshake.h dh.h log.h amf.h Makefile amf.o: amf.c amf.h bytes.h log.h Makefile rtmpdump.o: rtmpdump.c rtmp.h log.h amf.h Makefile Modified: trunk/README ============================================================================== --- trunk/README Thu Mar 4 08:17:29 2010 (r282) +++ trunk/README Thu Mar 4 08:25:29 2010 (r283) @@ -1,4 +1,4 @@ -RTMP Dump v2.1d +RTMP Dump v2.2 (C) 2009 Andrej Stepanchuk (C) 2009-2010 Howard Chu (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 @@ -101,7 +101,7 @@ Example Servers Three different types of servers are also present in this distribution: rtmpsrv - a stub server rtmpsuck - a transparent proxy - streams - an RTMP to HTTP gateway + rtmpgw - an RTMP to HTTP gateway rtmpsrv - Note that this is very incomplete code, and I haven't yet decided whether or not to finish it. It is useful for obtaining all the parameters @@ -174,7 +174,7 @@ has performed real handshakes with both negotiate whatever encryption keys are needed and so record the unencrypted data. -streams - HTTP gateway: this is an HTTP server that accepts requests that +rtmpgw - HTTP gateway: this is an HTTP server that accepts requests that consist of rtmpdump parameters. It then connects to the specified RTMP server and returns the retrieved data in the HTTP response. The only valid HTTP request is "GET /" but additional options can be provided in normal Copied and modified: trunk/rtmpgw.c (from r263, trunk/streams.c) ============================================================================== --- trunk/streams.c Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/rtmpgw.c Thu Mar 4 08:25:29 2010 (r283) @@ -1,6 +1,6 @@ -/* HTTP-RTMP Stream Server +/* HTTP-RTMP Stream Gateway * Copyright (C) 2009 Andrej Stepanchuk - * Copyright (C) 2009 Howard Chu + * Copyright (C) 2009-2010 Howard Chu * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1173,7 +1173,7 @@ main(int argc, char **argv) char *httpStreamingDevice = DEFAULT_HTTP_STREAMING_DEVICE; // streaming device, default 0.0.0.0 int nHttpStreamingPort = 80; // port - LogPrintf("HTTP-RTMP Stream Server %s\n", RTMPDUMP_VERSION); + LogPrintf("HTTP-RTMP Stream Gateway %s\n", RTMPDUMP_VERSION); LogPrintf("(c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL\n\n"); // init request @@ -1243,7 +1243,7 @@ main(int argc, char **argv) { case 'h': LogPrintf - ("\nThis program dumps the media content streamed over rtmp.\n\n"); + ("\nThis program serves media content streamed from RTMP onto HTTP.\n\n"); LogPrintf("--help|-h Prints this help screen.\n"); LogPrintf ("--rtmp|-r url URL (e.g. rtmp//hotname[:port]/path)\n");

1 0

r282 - trunk/rtmpsrv.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 08:17:29 2010 New Revision: 282 Log: Fix Play/Stop responses Modified: trunk/rtmpsrv.c Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Thu Mar 4 08:10:39 2010 (r281) +++ trunk/rtmpsrv.c Thu Mar 4 08:17:29 2010 (r282) @@ -281,6 +281,8 @@ SendPlayStart(RTMP *r) enc = AMF_EncodeNamedString(enc, pend, &av_description, &av_Started_playing); enc = AMF_EncodeNamedString(enc, pend, &av_details, &r->Link.playpath); enc = AMF_EncodeNamedString(enc, pend, &av_clientid, &av_clientid); + *enc++ = 0; + *enc++ = 0; *enc++ = AMF_OBJECT_END; packet.m_nBodySize = enc - packet.m_body; @@ -311,6 +313,8 @@ SendPlayStop(RTMP *r) enc = AMF_EncodeNamedString(enc, pend, &av_description, &av_Stopped_playing); enc = AMF_EncodeNamedString(enc, pend, &av_details, &r->Link.playpath); enc = AMF_EncodeNamedString(enc, pend, &av_clientid, &av_clientid); + *enc++ = 0; + *enc++ = 0; *enc++ = AMF_OBJECT_END; packet.m_nBodySize = enc - packet.m_body;

1 0

r279 - trunk/rtmpdump.1
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 07:24:14 2010 New Revision: 279 Log: Manpage Added: trunk/rtmpdump.1 Added: trunk/rtmpdump.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/rtmpdump.1 Thu Mar 4 07:24:14 2010 (r279) @@ -0,0 +1,273 @@ +.TH RTMPDUMP 1 "2010-03-03" "RTMPDump v2.2" +.SH NAME +rtmpdump \- RTMP streaming media client +.SH SYNOPSIS +.B rtmpdump +.BI \-r \ url +[\c +.BI \-n \ hostname\fR] +[\c +.BI \-c \ port\fR] +[\c +.BI \-l \ protocol\fR] +[\c +.BI \-S \ host:port\fR] +[\c +.BI \-a \ app\fR] +[\c +.BI \-t \ tcUrl\fR] +[\c +.BI \-p \ pageUrl\fR] +[\c +.BI \-s \ swfUrl\fR] +[\c +.BI \-f \ flashVer\fR] +[\c +.BI \-u \ auth\fR] +[\c +.BI \-C \ conndata\fR] +[\c +.BI \-y \ playpath\fR] +[\c +.BR \-v ] +[\c +.BI \-d \ subscription\fR] +[\c +.BR \-e ] +[\c +.BI \-k \ skip\fR] +[\c +.BI \-A \ start\fR] +[\c +.BI \-B \ stop\fR] +[\c +.BI \-b \ buffer\fR] +[\c +.BI \-m \ timeout\fR] +[\c +.BI \-T \ key\fR] +[\c +.BI \-w \ swfHash\fR] +[\c +.BI \-x \ swfSize\fR] +[\c +.BI \-W \ swfUrl\fR] +[\c +.BI \-X \ swfAge\fR] +[\c +.BI \-o \ output\fR] +[\c +.BR \-# ] +[\c +.BR \-q ] +[\c +.BR \-V ] +[\c +.BR \-z ] +.br +.B rtmpdump \-h +.SH DESCRIPTION +.B rtmpdump +is a tool for dumping media content streamed over RTMP. +.LP +.B rtmpdump +makes a connection to the specified RTMP server and plays the media +specified by the given +.IR url . +The url should be of the form +.nf + rtmp[e]://hostname[:port][/app[/playpath]] +.fi + +Both plaintext +.I rtmp:// +and encrypted +.I rtmpe:// +sessions are supported. +.SH OPTIONS +Network Parameters + +These options define how to connect to the media server. +.TP +\fB\-\-rtmp \-r\fP\ \fIurl\fP +URL of the server and media content. +.TP +\fB\-\-host \-n\fP\ \fIhostname\fP +Overrides the hostname in the RTMP URL. +.TP +\fB\-\-port \-c\fP\ \fIport\fP +Overrides the port number in the RTMP URL. +.TP +\fB\-\-protocol \-l\fP\ \fInumber\fP +Overrides the protocol in the RTMP URL. 0 = rtmp, 3 = rtmpe +.TP +\fB\-\-socks \-S\fP\ \fIhost:port\fP +Use the specified SOCKS4 proxy. +.PP +Connection Parameters + +These options define the content of the RTMP Connect request packet. +If correct values are not provided, the media server will reject the +connection attempt. +.TP +\fB\-\-app \-a\fP\ \fIapp\fP +Name of application to connect to on the RTMP server. Overrides +the app in the RTMP URL. Sometimes the rtmpdump URL parser cannot +determine the app name automatically, so it must be given explicitly +using this option. +.TP +\fB\-\-tcUrl \-t\fP\ \fIurl\fP +URL of the target stream. Defaults to rtmp[e]://host[:port]/app/playpath. +.TP +\fB\-\-pageUrl \-p\fP\ \fIurl\fP +URL of the web page in which the media was embedded. +.TP +\fB\-\-swfUrl \-s\fP\ \fIurl\fP +URL of the SWF player for the media. +.TP +\fB\-\-flashVer \-f\fP\ \fIversion\fP +Version of the Flash plugin used to run the SWF player. The +default is "LNX 10,0,22,87". +.TP +\fB\-\-auth \-a\fP\ \fIstring\fP +An authentication string to be appended to the Connect message. Using +this option will append a Boolean TRUE and then the specified string. +This message format is only used by some particular servers and is +deprecated. The more general +.B\-\-conn +option should be used instead. +.TP +\fB\-\-conn \-C\fP\ \fItype:data\fP +Append arbitrary AMF data to be appended to the Connect message. The type +must be B for Boolean, N for number, S for string, O for object, or Z +for null. For Booleans the data must be either 0 or 1 for FALSE or TRUE, +respectively. Likewise for Objects the data must be 0 or 1 to end or +begin an object, respectively. Data items in subobjects may be named, by +prefixing the type with 'N' and specifying the name before the value, e.g. +NB:myFlag:1. This option may be used multiple times to construct arbitrary +AMF sequences. E.g. +.nf + -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NN:flag:ok -C O:0 +.fi +.PP +Session Parameters + +These options take effect after the Connect request has succeeded. +.TP +\fB\-\-playpath \-y\fP\ \fIpath\fP +Overrides the playpath parsed from the RTMP URL. Sometimes the +rtmpdump URL parser cannot determine the correct playpath +automatically, so it must be given explicitly using this option. +.TP +.B \-\-live \-v +Specify that the media is a live stream. No resuming or seeking in +live streams is possible. +.TP +\fB\-\-subscribe \-d\fP\ \fIstream\fP +Name of live stream to subscribe to. Defaults to +.IR playpath . +.TP +.B \-\-resume \-e +Resume an incomplete RTMP download. +.TP +\fB\-\-skip \-k\fP\ \fInum\fP +Skip +.I num +keyframes when looking for the last keyframe from which to resume. This +may be useful if a regular attempt to resume fails. The default is 0. +.TP +\fB\-\-start \-A\fP\ \fInum\fP +Start at +.I num +seconds into the stream. Not valid for live streams. +.TP +\fB\-\-stop \-B\fP\ \fInum\fP +Stop at +.I num +seconds into the stream. +.TP +\fB\-\-buffer \-b\fP\ \fInum\fP +Set buffer time to +.I num +milliseconds. The default is 36000000. +.TP +\fB\-\-timeout \-m\fP\ \fInum\fP +Timeout the session after +.I num +seconds without receiving any data from the server. The default is 120. +.PP +Security Parameters + +These options handle additional authentication requests from the server. +.TP +\fB\-\-token \-T\fP\ \fIkey\fP +Key for SecureToken response, used if the server requires SecureToken +authentication. +.TP +\fB\-\-swfhash \-w\fP\ \fIhexstring\fP +SHA256 hash of the decompressed SWF file. This option may be needed if +the server uses SWF Verification, but see the +.B \-\-swfVfy +option below. The hash is 32 bytes, and must be +given in hexadecimal. The +.B \-\-swfsize +option must always be used with this option. +.TP +\fB\-\-swfsize \-x\fP\ \fInum\fP +Size of the decompressed SWF file. This option may be needed if the +server uses SWF Verification, but see the +.B \-\-swfVfy +option below. The +.B \-\-swfhash +option must always be used with this option. +.TP +\fB\-\-swfVfy \-W\fP\ \fIurl\fP +URL of the SWF player for this media. This option replaces all three +of the +.BR \-\-swfURL , +.BR \-\-swfhash , +and +.B \-\-swfsize +options. When this option is used, the SWF player is retrieved from the +specified URL and the hash and size are computed automatically. Also +the information is cached in a +.I .swfinfo +file in the user's home directory, so that it doesn't need to be retrieved +and recalculated every time rtmpdump is run. The .swfinfo file records +the URL, the time it was fetched, the modification timestamp of the SWF +file, its size, and its hash. By default, the cached info will be used +for 30 days before re-checking. +.TP +\fB\-\-swfAge \-X\fP\ \fIdays\fP +Specify how many days to use the cached SWF info before re-checking. Use +0 to always check the SWF URL. Note that if the check shows that the +SWF file has the same modification timestamp as before, it will not be +retrieved again. +.PP +Miscellaneous +.TP +\fB\-\-flv \-o\fP\ \fIoutput\fP +Specify the output file name. If the name is \- or is omitted, the +stream is written to stdout. +.TP +.B \-\-hashes \-# +Display streaming progress with a hash mark for each 1% of progress, instead +of a byte counter. +.TP +.B \-\-quiet \-q +Suppress all command output. +.TP +.B \-\-verbose \-V +Verbose command output. +.TP +.B \-\-debug \-z +Debug level output. Extremely verbose, including hex dumps of all packet data. +.TP +.B \-\-help \-h +Print a summary of command options. +.SH FILES +.TP +.I $HOME/.swfinfo +Cache of SWF Verification information +.SH AUTHORS +Andrej Stepanchuk, Howard Chu, The Flvstreamer Team

3 2

r281 - trunk/rtmpdump.1
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 08:10:39 2010 New Revision: 281 Log: Fix typos Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 07:31:09 2010 (r280) +++ trunk/rtmpdump.1 Thu Mar 4 08:10:39 2010 (r281) @@ -148,7 +148,7 @@ prefixing the type with 'N' and specifyi NB:myFlag:1. This option may be used multiple times to construct arbitrary AMF sequences. E.g. .nf - -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NN:flag:ok -C O:0 + -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NS:flag:ok -C O:0 .fi .PP Session Parameters @@ -225,7 +225,7 @@ option must always be used with this opt \fB\-\-swfVfy \-W\fP\ \fIurl\fP URL of the SWF player for this media. This option replaces all three of the -.BR \-\-swfURL , +.BR \-\-swfUrl , .BR \-\-swfhash , and .B \-\-swfsize

1 0

r280 - trunk/rtmpdump.1
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 07:31:09 2010 New Revision: 280 Log: Cleanup Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 07:24:14 2010 (r279) +++ trunk/rtmpdump.1 Thu Mar 4 07:31:09 2010 (r280) @@ -120,10 +120,11 @@ using this option. URL of the target stream. Defaults to rtmp[e]://host[:port]/app/playpath. .TP \fB\-\-pageUrl \-p\fP\ \fIurl\fP -URL of the web page in which the media was embedded. +URL of the web page in which the media was embedded. By default no +value will be sent. .TP \fB\-\-swfUrl \-s\fP\ \fIurl\fP -URL of the SWF player for the media. +URL of the SWF player for the media. By default no value will be sent. .TP \fB\-\-flashVer \-f\fP\ \fIversion\fP Version of the Flash plugin used to run the SWF player. The @@ -138,7 +139,7 @@ deprecated. The more general option should be used instead. .TP \fB\-\-conn \-C\fP\ \fItype:data\fP -Append arbitrary AMF data to be appended to the Connect message. The type +Append arbitrary AMF data to the Connect message. The type must be B for Boolean, N for number, S for string, O for object, or Z for null. For Booleans the data must be either 0 or 1 for FALSE or TRUE, respectively. Likewise for Objects the data must be 0 or 1 to end or

1 0

we need help with our documentation!
by compn 04 Mar '10

04 Mar '10

as seen here: http://nylug.org/pipermail/nylug-talk/2010-March/013913.html and on the streaming media forums... dumping rtmp isnt a very user-friendly process. any help with the docs would be appreciated. some howto's for particular sites maybe? -compn

1 0