March 2010 - rtmpdump - lists.mplayerhq.hu

r294 - in trunk: rtmpdump.1 rtmpgw.8
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 18:07:21 2010 New Revision: 294 Log: Manpage for rtmpgw Added: trunk/rtmpgw.8 Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 18:04:17 2010 (r293) +++ trunk/rtmpdump.1 Thu Mar 4 18:07:21 2010 (r294) @@ -1,4 +1,4 @@ -.TH RTMPDUMP 1 "2010-03-03" "RTMPDump v2.2" +.TH RTMPDUMP 1 "2010-03-04" "RTMPDump v2.2" .SH NAME rtmpdump \- RTMP streaming media client .SH SYNOPSIS @@ -280,5 +280,7 @@ file. .TP .I $HOME/.swfinfo Cache of SWF Verification information +.SH "SEE ALSO" +.BR rtmpgw (8) .SH AUTHORS Andrej Stepanchuk, Howard Chu, The Flvstreamer Team Added: trunk/rtmpgw.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/rtmpgw.8 Thu Mar 4 18:07:21 2010 (r294) @@ -0,0 +1,272 @@ +.TH RTMPGW 1 "2010-03-04" "RTMPDump v2.2" +.SH NAME +rtmpgw \- RTMP streaming media gateway +.SH SYNOPSIS +.B rtmpgw +[\c +.BI \-r \ url\fR] +[\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 \-D \ address\fR] +[\c +.BI \-g \ port\fR] +[\c +.BR \-q ] +[\c +.BR \-V ] +[\c +.BR \-z ] +.br +.B rtmpgw \-h +.SH DESCRIPTION +.B rtmpgw +is a server for streaming media content from RTMP out to HTTP. +.LP +.B rtmpgw +listens for HTTP requests that specify RTMP stream parameters and +then returns the RTMP data in the HTTP response. The only valid +HTTP request is "GET /" but additional options can be provided +in URL-encoded fashion. Options specified on the command line will +be used as defaults, which can be overridden by options in the HTTP +request. +.SH OPTIONS +.SS "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. +.SS "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. By default no +value will be sent. +.TP +\fB\-\-swfUrl \-s\fP\ \fIurl\fP +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 +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 option 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 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 NS:flag:ok -C O:0 +.fi +.SS "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 +\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 20000. +.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. +.SS "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. +.SS Miscellaneous +.TP +\fB\-\-device \-D\fP\ \fIaddress\fP +Listener IP address. The default is 0.0.0.0, i.e., any IP address. +.TP +\fB\-\-sport \-g\fP\ \fIport\fP +Listener port. The default is 80. +.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 EXAMPLES +The HTTP request +.nf + GET /?r=rtmp:%2f%2fserver%2fmyapp&y=somefile HTTP/1.0 +.fi +is equivalent to the +.BR rtrmpdump (1) +invocation +.nf + rtmpdump -r rtmp://server/myapp -y somefile +.fi + +Note that only the shortform (single letter) options are supported. +.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 +Cache of SWF Verification information +.SH "SEE ALSO" +.BR rtmpdump (1) +.SH AUTHORS +Andrej Stepanchuk, Howard Chu, The Flvstreamer Team

1 0

r293 - trunk/rtmpgw.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 18:04:17 2010 New Revision: 293 Log: Add socks option Modified: trunk/rtmpgw.c Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 4 17:28:16 2010 (r292) +++ trunk/rtmpgw.c Thu Mar 4 18:04:17 2010 (r293) @@ -82,7 +82,7 @@ typedef struct int protocol; bool bLiveStream; // is it a live stream? then we can't seek/resume - long int timeout; // timeout connection afte 300 seconds + long int timeout; // timeout connection after 120 seconds uint32_t bufferTime; char *rtmpurl; @@ -96,6 +96,7 @@ typedef struct AVal flashVer; AVal token; AVal subscribepath; + char *sockshost; AMFObject extras; int edepth; uint32_t swfSize; @@ -739,7 +740,7 @@ void processTCPrequest(STREAMING_SERVER Log(LOGDEBUG, "Setting buffer time to: %dms", req.bufferTime); RTMP_Init(&rtmp); RTMP_SetBufferMS(&rtmp, req.bufferTime); - RTMP_SetupStream(&rtmp, req.protocol, req.hostname, req.rtmpport, NULL, // sockshost + RTMP_SetupStream(&rtmp, req.protocol, req.hostname, req.rtmpport, req.sockshost, &req.playpath, &req.tcUrl, &req.swfUrl, &req.pageUrl, &req.app, &req.auth, &req.swfHash, req.swfSize, &req.flashVer, &req.subscribepath, dSeek, -1, // length req.bLiveStream, req.timeout); /* backward compatibility, we always sent this as true before */ @@ -1146,6 +1147,8 @@ ParseOption(char opt, char *arg, RTMP_RE case 'T': STR2AVAL(req->token, arg); break; + case 'S': + req->sockshost = arg; case 'q': debuglevel = LOGCRIT; break; @@ -1183,7 +1186,7 @@ main(int argc, char **argv) defaultRTMPRequest.protocol = RTMP_PROTOCOL_UNDEFINED; defaultRTMPRequest.bLiveStream = false; // is it a live stream? then we can't seek/resume - defaultRTMPRequest.timeout = 300; // timeout connection afte 300 seconds + defaultRTMPRequest.timeout = 120; // timeout connection after 120 seconds defaultRTMPRequest.bufferTime = 20 * 1000; defaultRTMPRequest.swfAge = 30; @@ -1193,6 +1196,7 @@ main(int argc, char **argv) {"help", 0, NULL, 'h'}, {"host", 1, NULL, 'n'}, {"port", 1, NULL, 'c'}, + {"socks", 1, NULL, 'S'}, {"protocol", 1, NULL, 'l'}, {"playpath", 1, NULL, 'y'}, {"rtmp", 1, NULL, 'r'}, @@ -1236,7 +1240,7 @@ main(int argc, char **argv) while ((opt = getopt_long(argc, argv, - "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:", longopts, + "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:S:", longopts, NULL)) != -1) { switch (opt) @@ -1252,6 +1256,8 @@ main(int argc, char **argv) LogPrintf ("--port|-c port Overrides the port in the rtmp url\n"); LogPrintf + ("--socks|-S host:port Use the specified SOCKS proxy\n"); + LogPrintf ("--protocol|-l Overrides the protocol in the rtmp url (0 - RTMP, 3 - RTMPE)\n"); LogPrintf ("--playpath|-y Overrides the playpath parsed from rtmp url\n");

1 0

r292 - trunk/rtmpgw.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 17:28:16 2010 New Revision: 292 Log: More typos Modified: trunk/rtmpgw.c Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 4 17:19:21 2010 (r291) +++ trunk/rtmpgw.c Thu Mar 4 17:28:16 2010 (r292) @@ -1306,7 +1306,7 @@ main(int argc, char **argv) nHttpStreamingPort); LogPrintf ("--quiet|-q Suppresses all command output.\n"); - LogPrintf("--verbose|-x Verbose command output.\n"); + LogPrintf("--verbose|-V Verbose command output.\n"); LogPrintf("--debug|-z Debug level command output.\n"); LogPrintf ("If you don't pass parameters for swfUrl, pageUrl, or auth these properties will not be included in the connect ");

1 0

r291 - in trunk: rtmpdump.c rtmpgw.c
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 17:19:21 2010 New Revision: 291 Log: Fix typos Modified: trunk/rtmpdump.c trunk/rtmpgw.c Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Thu Mar 4 17:02:17 2010 (r290) +++ trunk/rtmpdump.c Thu Mar 4 17:19:21 2010 (r291) @@ -1312,10 +1312,10 @@ main(int argc, char **argv) { case 'h': LogPrintf - ("\nThis program dumps the media content streamed over rtmp.\n\n"); + ("\nThis program dumps the media content streamed over RTMP.\n\n"); LogPrintf("--help|-h Prints this help screen.\n"); LogPrintf - ("--rtmp|-r url URL (e.g. rtmp//hotname[:port]/path)\n"); + ("--rtmp|-r url URL (e.g. rtmp//host[:port]/path)\n"); LogPrintf ("--host|-n hostname Overrides the hostname in the rtmp url\n"); LogPrintf @@ -1330,7 +1330,7 @@ main(int argc, char **argv) LogPrintf ("--tcUrl|-t url URL to played stream (default: \"rtmp://host[:port]/app\")\n"); LogPrintf("--pageUrl|-p url Web URL of played programme\n"); - LogPrintf("--app|-a app Name of player used\n"); + LogPrintf("--app|-a app Name of target app on server\n"); #ifdef CRYPTO LogPrintf ("--swfhash|-w hexstring SHA256 hash of the decompressed SWF file (32 bytes)\n"); @@ -1378,7 +1378,7 @@ main(int argc, char **argv) ("--skip|-k num Skip num keyframes when looking for last keyframe to resume from. Useful if resume fails (default: %d)\n\n", nSkipKeyFrames); LogPrintf - ("--quiet|-q Supresses all command output.\n"); + ("--quiet|-q Suppresses all command output.\n"); LogPrintf("--verbose|-V Verbose command output.\n"); LogPrintf("--debug|-z Debug level command output.\n"); LogPrintf Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 4 17:02:17 2010 (r290) +++ trunk/rtmpgw.c Thu Mar 4 17:19:21 2010 (r291) @@ -1246,7 +1246,7 @@ main(int argc, char **argv) ("\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"); + ("--rtmp|-r url URL (e.g. rtmp//host[:port]/path)\n"); LogPrintf ("--host|-n hostname Overrides the hostname in the rtmp url\n"); LogPrintf @@ -1259,7 +1259,7 @@ main(int argc, char **argv) LogPrintf ("--tcUrl|-t url URL to played stream (default: \"rtmp://host[:port]/app\")\n"); LogPrintf("--pageUrl|-p url Web URL of played programme\n"); - LogPrintf("--app|-a app Name of player used\n"); + LogPrintf("--app|-a app Name of target app in server\n"); #ifdef CRYPTO LogPrintf ("--swfhash|-w hexstring SHA256 hash of the decompressed SWF file (32 bytes)\n"); @@ -1282,7 +1282,7 @@ main(int argc, char **argv) ("--flashVer|-f string Flash version string (default: \"%s\")\n", DEFAULT_FLASH_VER); LogPrintf - ("--live|-v Get a live stream, no --resume (seeking) of live strems possible\n"); + ("--live|-v Get a live stream, no --resume (seeking) of live streams possible\n"); LogPrintf ("--subscribe|-d string Stream name to subscribe to (otherwise defaults to playpath if live is specifed)\n"); LogPrintf @@ -1305,11 +1305,11 @@ main(int argc, char **argv) ("--sport|-g Streaming port (default: %d)\n\n", nHttpStreamingPort); LogPrintf - ("--quiet|-q Supresses all command output.\n"); + ("--quiet|-q Suppresses all command output.\n"); LogPrintf("--verbose|-x Verbose command output.\n"); LogPrintf("--debug|-z Debug level command output.\n"); LogPrintf - ("If you don't pass parameters for swfUrl, pageUrl, app or auth these propertiews will not be included in the connect "); + ("If you don't pass parameters for swfUrl, pageUrl, or auth these properties will not be included in the connect "); LogPrintf("packet.\n\n"); return RD_SUCCESS; break;

1 0

r290 - trunk/ChangeLog
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 17:02:17 2010 New Revision: 290 Log: streams -> rtmpgw Modified: trunk/ChangeLog Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Thu Mar 4 16:02:31 2010 (r289) +++ trunk/ChangeLog Thu Mar 4 17:02:17 2010 (r290) @@ -11,6 +11,7 @@ http://rtmpdump.mplayerhq.hu/ - fix AMF_LONG_STRING handling - more FlashPlayer 10 handshake support - in rtmpsrv fix Play Start/Stop messages +- rename "streams" program to "rtmpgw" 20 February 2010, v2.1d - extend .swfinfo file format, add --swfAge rtmpdump parameter

1 0

how to fetch this stream with rtmpdump?
by Tomasz Chmielewski 04 Mar '10

04 Mar '10

I have a FMS stream which I'm able to play successfully with flash player, but not with rtmpdump. I tried different rtmpdump parameters, but it usually ends like this, but doesn't dump anything: RTMPDump v2.1d (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL Connecting ... ERROR: rtmp server sent error Starting Live Stream The URL to the page which plays fine with flash player in a browser can be found here: http://www1.wpkg.org/stream.html Could anyone help me dump this stream with rtmpdump? -- Tomasz Chmielewski http://wpkg.org

2 2

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

04 Mar '10

Author: hyc Date: Thu Mar 4 09:56:28 2010 New Revision: 286 Log: Add Exit Status info Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 08:52:02 2010 (r285) +++ trunk/rtmpdump.1 Thu Mar 4 09:56:28 2010 (r286) @@ -85,8 +85,7 @@ and encrypted .I rtmpe:// sessions are supported. .SH OPTIONS -Network Parameters - +.SS "Network Parameters" These options define how to connect to the media server. .TP \fB\-\-rtmp \-r\fP\ \fIurl\fP @@ -103,9 +102,7 @@ Overrides the protocol in the RTMP URL. .TP \fB\-\-socks \-S\fP\ \fIhost:port\fP Use the specified SOCKS4 proxy. -.PP -Connection Parameters - +.SS "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. @@ -150,9 +147,7 @@ AMF sequences. E.g. .nf -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 - +.SS "Session Parameters" These options take effect after the Connect request has succeeded. .TP \fB\-\-playpath \-y\fP\ \fIpath\fP @@ -196,9 +191,7 @@ milliseconds. The default is 36000000. Timeout the session after .I num seconds without receiving any data from the server. The default is 120. -.PP -Security Parameters - +.SS "Security Parameters" These options handle additional authentication requests from the server. .TP \fB\-\-token \-T\fP\ \fIkey\fP @@ -244,8 +237,7 @@ Specify how many days to use the cached 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 +.SS Miscellaneous .TP \fB\-\-flv \-o\fP\ \fIoutput\fP Specify the output file name. If the name is \- or is omitted, the @@ -266,6 +258,16 @@ Debug level output. Extremely verbose, i .TP .B \-\-help \-h Print a summary of command options. +.SH EXIT STATUS +.TP +.B 0 +Successful program execution. +.TP +.B 1 +Unrecoverable error. +.TP +.B 2 +Incomplete transfer, resuming may get further. .SH FILES .TP .I $HOME/.swfinfo

3 2

r289 - in trunk: ChangeLog Makefile amf.c amf.h bytes.h dh.h dhgroups.h handshake.h hashswf.c http.h librtmp librtmp/COPYING librtmp/Makefile librtmp/amf.c librtmp/amf.h librtmp/bytes.h librtmp/dh....
by hyc 04 Mar '10

04 Mar '10

Author: hyc Date: Thu Mar 4 16:02:31 2010 New Revision: 289 Log: Move librtmp to separate directory, relicense as LGPL Added: trunk/librtmp/ trunk/librtmp/COPYING trunk/librtmp/Makefile trunk/librtmp/amf.c - copied, changed from r285, trunk/amf.c trunk/librtmp/amf.h - copied, changed from r285, trunk/amf.h trunk/librtmp/bytes.h - copied, changed from r277, trunk/bytes.h trunk/librtmp/dh.h - copied, changed from r263, trunk/dh.h trunk/librtmp/dhgroups.h - copied, changed from r263, trunk/dhgroups.h trunk/librtmp/handshake.h - copied, changed from r276, trunk/handshake.h trunk/librtmp/hashswf.c - copied, changed from r265, trunk/hashswf.c trunk/librtmp/http.h - copied, changed from r263, trunk/http.h trunk/librtmp/log.c - copied, changed from r263, trunk/log.c trunk/librtmp/log.h - copied, changed from r263, trunk/log.h trunk/librtmp/rtmp.c - copied, changed from r274, trunk/rtmp.c trunk/librtmp/rtmp.h - copied, changed from r274, trunk/rtmp.h Deleted: trunk/amf.c trunk/amf.h trunk/bytes.h trunk/dh.h trunk/dhgroups.h trunk/handshake.h trunk/hashswf.c trunk/http.h trunk/log.c trunk/log.h trunk/rtmp.c trunk/rtmp.h trunk/streams.c Modified: trunk/ChangeLog trunk/Makefile trunk/parseurl.c trunk/rtmpdump.c trunk/rtmpgw.c trunk/rtmpsrv.c trunk/rtmpsuck.c trunk/thread.c Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Thu Mar 4 15:58:51 2010 (r288) +++ trunk/ChangeLog Thu Mar 4 16:02:31 2010 (r289) @@ -4,6 +4,14 @@ Copyright 2009-2010 Howard Chu Copyright 2009 The Flvstreamer Team http://rtmpdump.mplayerhq.hu/ +4 March 2010, v2.2 +- move RTMP code into library librtmp +- relicense RTMP code under LGPL v2.1 +- add rtmpdump manpage +- fix AMF_LONG_STRING handling +- more FlashPlayer 10 handshake support +- in rtmpsrv fix Play Start/Stop messages + 20 February 2010, v2.1d - extend .swfinfo file format, add --swfAge rtmpdump parameter old file should be replaced or manually updated: copy the Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Mar 4 15:58:51 2010 (r288) +++ trunk/Makefile Thu Mar 4 16:02:31 2010 (r289) @@ -1,12 +1,13 @@ CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld -DEF=-DRTMPDUMP_VERSION=\"v2.1d\" +DEF=-DRTMPDUMP_VERSION=\"v2.2\" OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) LDFLAGS=-Wall $(XLDFLAGS) LIBS=-lcrypto -lz THREADLIB=-lpthread +LIBRTMP=librtmp/librtmp.a SLIBS=$(THREADLIB) $(LIBS) EXT= @@ -33,27 +34,23 @@ cross: clean: rm -f *.o *.a rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) -librtmp.a: rtmp.o log.o amf.o hashswf.o - $(AR) rs $@ $? +$(LIBRTMP): + @$(MAKE) -C librtmp $(MAKEFLAGS) -rtmpdump: rtmpdump.o parseurl.o librtmp.a +rtmpdump: rtmpdump.o parseurl.o $(LIBRTMP) $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS) -rtmpsrv: rtmpsrv.o thread.o librtmp.a +rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP) $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -rtmpsuck: rtmpsuck.o thread.o librtmp.a +rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP) $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -rtmpgw: rtmpgw.o parseurl.o thread.o librtmp.a +rtmpgw: rtmpgw.o parseurl.o thread.o $(LIBRTMP) $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) -log.o: log.c log.h Makefile -parseurl.o: parseurl.c parseurl.h log.h 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 -rtmpsrv.o: rtmpsrv.c rtmp.h log.h amf.h Makefile -hashswf.o: hashswf.c http.h +parseurl.o: parseurl.c parseurl.h Makefile +rtmpgw.o: rtmpgw.c librtmp/rtmp.h librtmp/log.h librtmp/amf.h Makefile +rtmpdump.o: rtmpdump.c librtmp/rtmp.h librtmp/log.h librtmp/amf.h Makefile +rtmpsrv.o: rtmpsrv.c librtmp/rtmp.h librtmp/log.h librtmp/amf.h Makefile thread.o: thread.c thread.h Added: trunk/librtmp/COPYING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/librtmp/COPYING Thu Mar 4 16:02:31 2010 (r289) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Added: trunk/librtmp/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/librtmp/Makefile Thu Mar 4 16:02:31 2010 (r289) @@ -0,0 +1,19 @@ +CC=$(CROSS_COMPILE)gcc +LD=$(CROSS_COMPILE)ld + +DEF=-DRTMPDUMP_VERSION=\"v2.2\" +OPT=-O2 +CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) + +all: librtmp.a + +clean: + rm -f *.o *.a + +librtmp.a: rtmp.o log.o amf.o hashswf.o + $(AR) rs $@ $? + +log.o: log.c log.h 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 +hashswf.o: hashswf.c http.h Copied and modified: trunk/librtmp/amf.c (from r285, trunk/amf.c) ============================================================================== --- trunk/amf.c Thu Mar 4 08:52:02 2010 (r285, copy source) +++ trunk/librtmp/amf.c Thu Mar 4 16:02:31 2010 (r289) @@ -2,23 +2,24 @@ * Copyright (C) 2005-2008 Team XBMC * http://www.xbmc.org * Copyright (C) 2008-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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <string.h> Copied and modified: trunk/librtmp/amf.h (from r285, trunk/amf.h) ============================================================================== --- trunk/amf.h Thu Mar 4 08:52:02 2010 (r285, copy source) +++ trunk/librtmp/amf.h Thu Mar 4 16:02:31 2010 (r289) @@ -4,23 +4,24 @@ * Copyright (C) 2005-2008 Team XBMC * http://www.xbmc.org * Copyright (C) 2008-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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <stdint.h> Copied and modified: trunk/librtmp/bytes.h (from r277, trunk/bytes.h) ============================================================================== --- trunk/bytes.h Mon Mar 1 05:30:34 2010 (r277, copy source) +++ trunk/librtmp/bytes.h Thu Mar 4 16:02:31 2010 (r289) @@ -2,23 +2,24 @@ * Copyright (C) 2005-2008 Team XBMC * http://www.xbmc.org * Copyright (C) 2008-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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #ifndef __BYTES_H__ Copied and modified: trunk/librtmp/dh.h (from r263, trunk/dh.h) ============================================================================== --- trunk/dh.h Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/librtmp/dh.h Thu Mar 4 16:02:31 2010 (r289) @@ -1,22 +1,23 @@ /* RTMPDump - Diffie-Hellmann Key Exchange * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <stdint.h> Copied and modified: trunk/librtmp/dhgroups.h (from r263, trunk/dhgroups.h) ============================================================================== --- trunk/dhgroups.h Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/librtmp/dhgroups.h Thu Mar 4 16:02:31 2010 (r289) @@ -1,21 +1,22 @@ -/* RTMPDump - Diffie-Hellmann Key Exchange +/* librtmp - Diffie-Hellmann Key Exchange * Copyright (C) 2009 Andrej Stepanchuk * - * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ /* from RFC 3526, see http://www.ietf.org/rfc/rfc3526.txt */ Copied and modified: trunk/librtmp/handshake.h (from r276, trunk/handshake.h) ============================================================================== --- trunk/handshake.h Sat Feb 27 22:48:51 2010 (r276, copy source) +++ trunk/librtmp/handshake.h Thu Mar 4 16:02:31 2010 (r289) @@ -3,21 +3,22 @@ * Copyright (C) 2009-2010 Howard Chu * Copyright (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 * - * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ /* This file is #included in rtmp.c, it is not meant to be compiled alone */ Copied and modified: trunk/librtmp/hashswf.c (from r265, trunk/hashswf.c) ============================================================================== --- trunk/hashswf.c Sun Feb 21 05:47:22 2010 (r265, copy source) +++ trunk/librtmp/hashswf.c Thu Mar 4 16:02:31 2010 (r289) @@ -1,21 +1,22 @@ /* * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <stdio.h> Copied and modified: trunk/librtmp/http.h (from r263, trunk/http.h) ============================================================================== --- trunk/http.h Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/librtmp/http.h Thu Mar 4 16:02:31 2010 (r289) @@ -4,21 +4,22 @@ * Copyright (C) 2010 Howard Chu * Copyright (C) 2010 Antti Ajanki * - * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ typedef enum { Copied and modified: trunk/librtmp/log.c (from r263, trunk/log.c) ============================================================================== --- trunk/log.c Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/librtmp/log.c Thu Mar 4 16:02:31 2010 (r289) @@ -1,22 +1,23 @@ -/* RTMPDump +/* * Copyright (C) 2008-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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <stdio.h> Copied and modified: trunk/librtmp/log.h (from r263, trunk/log.h) ============================================================================== --- trunk/log.h Sun Feb 21 04:49:56 2010 (r263, copy source) +++ trunk/librtmp/log.h Thu Mar 4 16:02:31 2010 (r289) @@ -1,22 +1,23 @@ -/* RTMP Dump +/* * Copyright (C) 2008-2009 Andrej Stepanchuk * Copyright (C) 2009 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #ifndef __LOG_H__ Copied and modified: trunk/librtmp/rtmp.c (from r274, trunk/rtmp.c) ============================================================================== --- trunk/rtmp.c Fri Feb 26 00:26:33 2010 (r274, copy source) +++ trunk/librtmp/rtmp.c Thu Mar 4 16:02:31 2010 (r289) @@ -4,21 +4,22 @@ * Copyright (C) 2008-2009 Andrej Stepanchuk * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #include <stdint.h> Copied and modified: trunk/librtmp/rtmp.h (from r274, trunk/rtmp.h) ============================================================================== --- trunk/rtmp.h Fri Feb 26 00:26:33 2010 (r274, copy source) +++ trunk/librtmp/rtmp.h Thu Mar 4 16:02:31 2010 (r289) @@ -6,21 +6,22 @@ * Copyright (C) 2008-2009 Andrej Stepanchuk * 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * This file is part of librtmp. * - * This Program is distributed in the hope that it will be useful, + * librtmp is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1, + * or (at your option) any later version. + * + * librtmp is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with RTMPDump; see the file COPYING. If not, write to + * You should have received a copy of the GNU Lesser General Public License + * along with librtmp see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * + * http://www.gnu.org/copyleft/lgpl.html */ #ifdef WIN32 Modified: trunk/parseurl.c ============================================================================== --- trunk/parseurl.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/parseurl.c Thu Mar 4 16:02:31 2010 (r289) @@ -25,7 +25,7 @@ #include <assert.h> #include <ctype.h> -#include "log.h" +#include "librtmp/log.h" #include "parseurl.h" #define RTMP_PROTOCOL_UNDEFINED -1 Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/rtmpdump.c Thu Mar 4 16:02:31 2010 (r289) @@ -29,8 +29,8 @@ #include <signal.h> // to catch Ctrl-C #include <getopt.h> -#include "rtmp.h" -#include "log.h" +#include "librtmp/rtmp.h" +#include "librtmp/log.h" #include "parseurl.h" #ifdef WIN32 Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/rtmpgw.c Thu Mar 4 16:02:31 2010 (r289) @@ -28,7 +28,7 @@ #include <assert.h> -#include "rtmp.h" +#include "librtmp/rtmp.h" #include "parseurl.h" #include "thread.h" Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/rtmpsrv.c Thu Mar 4 16:02:31 2010 (r289) @@ -33,7 +33,7 @@ #include <assert.h> -#include "rtmp.h" +#include "librtmp/rtmp.h" #include "parseurl.h" #include "thread.h" Modified: trunk/rtmpsuck.c ============================================================================== --- trunk/rtmpsuck.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/rtmpsuck.c Thu Mar 4 16:02:31 2010 (r289) @@ -33,7 +33,7 @@ #include <assert.h> -#include "rtmp.h" +#include "librtmp/rtmp.h" #include "parseurl.h" #include "thread.h" Modified: trunk/thread.c ============================================================================== --- trunk/thread.c Thu Mar 4 15:58:51 2010 (r288) +++ trunk/thread.c Thu Mar 4 16:02:31 2010 (r289) @@ -19,7 +19,7 @@ */ #include "thread.h" -#include "log.h" +#include "librtmp/log.h" #ifdef WIN32

1 0

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

04 Mar '10

Author: hyc Date: Thu Mar 4 15:58:51 2010 New Revision: 288 Log: More typos Modified: trunk/rtmpdump.1 Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Mar 4 10:17:33 2010 (r287) +++ trunk/rtmpdump.1 Thu Mar 4 15:58:51 2010 (r288) @@ -130,9 +130,9 @@ default is "LNX 10,0,22,87". \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 +This option is only used by some particular servers and is deprecated. The more general -.B\-\-conn +.B \-\-conn option should be used instead. .TP \fB\-\-conn \-C\fP\ \fItype:data\fP

1 0

Re: [rtmpdump] rtmpdump 2.1c does not compile on OS X
by mightydoggy 04 Mar '10

04 Mar '10

John -- Did you get this straightened out? Looks like the includes for openssl aren't happening -- possibly your config for either openssl or gcc. Do "openssl version -a" and "gcc -dumpspecs" and paste the results in here -- we'll see if we can figure it out (if you haven't already).

1 0