September 2012 - rtmpdump - lists.mplayerhq.hu

[[RESEND] [PATCH]] Fix socks support for SetupURL
by Matthew Garrett 20 Sep '12

20 Sep '12

SetupURL assigns sockshost but never parses the data. This patch factors the code out from SetupStream into a common function and adds it to SetupURL. --- librtmp/rtmp.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 52d0254..d31c61b 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -320,6 +320,31 @@ static const char DEFAULT_FLASH_VER[] = DEF_VERSTR; const AVal RTMP_DefaultFlashVer = { (char *)DEFAULT_FLASH_VER, sizeof(DEFAULT_FLASH_VER) - 1 }; +static void +SocksSetup(RTMP *r, AVal *sockshost) +{ + if (sockshost->av_len) + { + const char *socksport = strchr(sockshost->av_val, ':'); + char *hostname = strdup(sockshost->av_val); + + if (socksport) + hostname[socksport - sockshost->av_val] = '\0'; + r->Link.sockshost.av_val = hostname; + r->Link.sockshost.av_len = strlen(hostname); + + r->Link.socksport = socksport ? atoi(socksport + 1) : 1080; + RTMP_Log(RTMP_LOGDEBUG, "Connecting via SOCKS proxy: %s:%d", r->Link.sockshost.av_val, + r->Link.socksport); + } + else + { + r->Link.sockshost.av_val = NULL; + r->Link.sockshost.av_len = 0; + r->Link.socksport = 0; + } +} + void RTMP_SetupStream(RTMP *r, int protocol, @@ -384,26 +409,7 @@ RTMP_SetupStream(RTMP *r, } #endif - if (sockshost->av_len) - { - const char *socksport = strchr(sockshost->av_val, ':'); - char *hostname = strdup(sockshost->av_val); - - if (socksport) - hostname[socksport - sockshost->av_val] = '\0'; - r->Link.sockshost.av_val = hostname; - r->Link.sockshost.av_len = strlen(hostname); - - r->Link.socksport = socksport ? atoi(socksport + 1) : 1080; - RTMP_Log(RTMP_LOGDEBUG, "Connecting via SOCKS proxy: %s:%d", r->Link.sockshost.av_val, - r->Link.socksport); - } - else - { - r->Link.sockshost.av_val = NULL; - r->Link.sockshost.av_len = 0; - r->Link.socksport = 0; - } + SocksSetup(r, sockshost); if (tcUrl && tcUrl->av_len) r->Link.tcUrl = *tcUrl; @@ -756,6 +762,8 @@ int RTMP_SetupURL(RTMP *r, char *url) (unsigned char *)r->Link.SWFHash, r->Link.swfAge); #endif + SocksSetup(r, &r->Link.sockshost); + if (r->Link.port == 0) { if (r->Link.protocol & RTMP_FEATURE_SSL) -- 1.7.11.4

1 0

[Resend] [PATCH] Make rtmpdump handle full RTMP URLs with "-i"
by Bastien Nocera 19 Sep '12

19 Sep '12

or --url. The library already can handle those, so it makes debugging easier for users of the library. --- rtmpdump.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/rtmpdump.c b/rtmpdump.c index e52f7d4..2b30eb2 100644 --- a/rtmpdump.c +++ b/rtmpdump.c @@ -640,6 +640,8 @@ void usage(char *prog) ("\n%s: This program dumps the media content streamed over RTMP.\n\n", prog); RTMP_LogPrintf("--help|-h Prints this help screen.\n"); RTMP_LogPrintf + ("--url|-i url URL with options included (e.g. rtmp://host[:port]/path swfUrl=url tcUrl=url)\n"); + RTMP_LogPrintf ("--rtmp|-r url URL (e.g. rtmp://host[:port]/path)\n"); RTMP_LogPrintf ("--host|-n hostname Overrides the hostname in the rtmp url\n"); @@ -760,6 +762,7 @@ main(int argc, char **argv) uint32_t dStopOffset = 0; RTMP rtmp = { 0 }; + AVal fullUrl = { 0, 0 }; AVal swfUrl = { 0, 0 }; AVal tcUrl = { 0, 0 }; AVal pageUrl = { 0, 0 }; @@ -822,6 +825,7 @@ main(int argc, char **argv) {"protocol", 1, NULL, 'l'}, {"playpath", 1, NULL, 'y'}, {"playlist", 0, NULL, 'Y'}, + {"url", 1, NULL, 'i'}, {"rtmp", 1, NULL, 'r'}, {"swfUrl", 1, NULL, 's'}, {"tcUrl", 1, NULL, 't'}, @@ -857,7 +861,7 @@ main(int argc, char **argv) while ((opt = getopt_long(argc, argv, - "hVveqzRr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#j:", + "hVveqzRr:s:t:i:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#j:", longopts, NULL)) != -1) { switch (opt) @@ -1000,6 +1004,9 @@ main(int argc, char **argv) } break; } + case 'i': + STR2AVAL(fullUrl, optarg); + break; case 's': STR2AVAL(swfUrl, optarg); break; @@ -1078,32 +1085,32 @@ main(int argc, char **argv) } } - if (!hostname.av_len) + if (!hostname.av_len && !fullUrl.av_len) { RTMP_Log(RTMP_LOGERROR, "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname"); return RD_FAILED; } - if (playpath.av_len == 0) + if (playpath.av_len == 0 && !fullUrl.av_len) { RTMP_Log(RTMP_LOGERROR, "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath"); return RD_FAILED; } - if (protocol == RTMP_PROTOCOL_UNDEFINED) + if (protocol == RTMP_PROTOCOL_UNDEFINED && !fullUrl.av_len) { RTMP_Log(RTMP_LOGWARNING, "You haven't specified a protocol (--protocol) or rtmp url (-r), using default protocol RTMP"); protocol = RTMP_PROTOCOL_RTMP; } - if (port == -1) + if (port == -1 && !fullUrl.av_len) { RTMP_Log(RTMP_LOGWARNING, "You haven't specified a port (--port) or rtmp url (-r), using default port 1935"); port = 0; } - if (port == 0) + if (port == 0 && !fullUrl.av_len) { if (protocol & RTMP_FEATURE_SSL) port = 443; @@ -1185,9 +1192,20 @@ main(int argc, char **argv) } } - RTMP_SetupStream(&rtmp, protocol, &hostname, port, &sockshost, &playpath, - &tcUrl, &swfUrl, &pageUrl, &app, &auth, &swfHash, swfSize, - &flashVer, &subscribepath, &usherToken, dSeek, dStopOffset, bLiveStream, timeout); + if (!fullUrl.av_len) + { + RTMP_SetupStream(&rtmp, protocol, &hostname, port, &sockshost, &playpath, + &tcUrl, &swfUrl, &pageUrl, &app, &auth, &swfHash, swfSize, + &flashVer, &subscribepath, &usherToken, dSeek, dStopOffset, bLiveStream, timeout); + } + else + { + if (RTMP_SetupURL(&rtmp, fullUrl.av_val) == FALSE) + { + RTMP_Log(RTMP_LOGERROR, "Couldn't parse URL: %s", fullUrl.av_val); + return RD_FAILED; + } + } /* Try to keep the stream moving if it pauses on us */ if (!bLiveStream && !bRealtimeStream && !(protocol & RTMP_FEATURE_HTTP)) -- 1.7.12

1 0

FW: Newbie gets failed to connect to socket
by Daan Blaas 14 Sep '12

14 Sep '12

Hi guys, I want to save a livestream from the website http://www.ultimate-chatzone.com/adultschat.html I have tried everything but don't seem to be able to succeed.. This is the command I execute: rtmpdump -v -f "WIN 11,1,102,55" -r "rtmp://216.18.197.227/mp4:FCAVPresence.cam.av.f4v" -y "mp4:FCAVPresence.cam.av.f4v" (where xxxxxxxx is the name of the user) Any help woud be appreciated !! Daan

1 1

Re: [rtmpdump] [PATCH] Handle RTMP redirect
by Howard Chu 13 Sep '12

13 Sep '12

Steven Penny wrote: > On Sun, Sep 9, 2012 at 5:58 AM, Howard Chu wrote: >> I shouldn't have to repeat myself here. We only accept code contributions from >> the original authors. Doing anything else would open us up to IP infringement >> lawsuits, and nobody here is interested in that. If you didn't write the code, >> then don't post the code to this list; we can't use it. > > The License.txt file included with KSV Patch.diff indicated that his > contributions are covered under the GPL. > > In other words, allowed on this list. > If you take issue with the author credit I will gladly change it to his > name/email but otherwise this is a straw man argument. The GPL specifically requires that you do not misrepresent other people's work as your own. This is no straw man. If you can't play by the rules, then please go somewhere else. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

[PATCH] Fix for rare infinite loop while downloading
by Matt Robinson 11 Sep '12

11 Sep '12

Fix for an infinite loop on very rare occasions. The application can get into the following state while in the main download loop within the Download function in rtmpdump.c: rtmp->m_read.status == RTMP_READ_EOF rtmp->m_sb.sb_socket != -1 rtmp->m_sb.sb_timedout == 0 The status of RTMP_READ_EOF causes the call to RTMP_Read to return straight away with a value of 0. This zero value then causes the rest of the loop body to be skipped. However, the values of sb_socket and sb_timeout cause the while condition to continue to return true, causing an infinite loop. I'm happy to provide some more information about this issue if that would be useful, or if not please find below a patch to prevent this from occurring. Without a fuller understanding of the code I'm not sure if this is the right way of solving it, but it is one way... Matt --- rtmpdump.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rtmpdump.c b/rtmpdump.c index e52f7d4..7535da8 100644 --- a/rtmpdump.c +++ b/rtmpdump.c @@ -580,13 +580,16 @@ Download(RTMP * rtmp, // connected RTMP object } } } -#ifdef _DEBUG else { +#ifdef _DEBUG RTMP_Log(RTMP_LOGDEBUG, "zero read!"); - } #endif - + if(rtmp->m_read.status == RTMP_READ_EOF) + { + break; + } + } } while (!RTMP_ctrlC && nRead > -1 && RTMP_IsConnected(rtmp) && !RTMP_IsTimedout(rtmp)); free(buffer);

1 0

[PATCH] Handle RTMP redirect
by Steven Penny 09 Sep '12

09 Sep '12

This patch allows RtmpDump to follow RTMP URL redirects. Before this you could run rtmpdump --verbose and see the redirect URL DEBUG: Property: <Name: redirect, STRING: rtmp://46.19.140.146:190/vod> This patch simply automates the following process. Taken from KSV patch file http://github.com/downloads/K-S-V/Scripts/rtmpdump-2.4.zip Tested on http://datastreaming.altervista.org/LA7.html --- librtmp/rtmp.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- librtmp/rtmp.h | 1 + 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 52d0254..b76367a 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -2473,12 +2473,54 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) } else if (AVMATCH(&method, &av__error)) { - RTMP_Log(RTMP_LOGERROR, "rtmp server sent error"); + double code = 0; + unsigned int parsedPort; + AMFObject obj2; + AMFObjectProperty p; + AVal redirect; + SAVC(ex); + SAVC(redirect); + + AMFProp_GetObject(AMF_GetProp(&obj, NULL, 3), &obj2); + if (RTMP_FindFirstMatchingProperty(&obj2, &av_ex, &p)) + { + AMFProp_GetObject(&p, &obj2); + if (RTMP_FindFirstMatchingProperty(&obj2, &av_code, &p)) + code = AMFProp_GetNumber(&p); + if (code == 302 && RTMP_FindFirstMatchingProperty(&obj2, &av_redirect, &p)) + { + AMFProp_GetString(&p, &redirect); + r->Link.redirected = TRUE; + + char *url = malloc(redirect.av_len + sizeof ("/playpath")); + strncpy(url, redirect.av_val, redirect.av_len); + url[redirect.av_len] = '\0'; + r->Link.tcUrl.av_val = url; + r->Link.tcUrl.av_len = redirect.av_len; + strcat(url, "/playpath"); + RTMP_ParseURL(url, &r->Link.protocol, &r->Link.hostname, &parsedPort, &r->Link.playpath0, &r->Link.app); + r->Link.port = parsedPort; + } + } + if (r->Link.redirected) + RTMP_Log(RTMP_LOGINFO, "rtmp server sent redirect"); + else + RTMP_Log(RTMP_LOGERROR, "rtmp server sent error"); } else if (AVMATCH(&method, &av_close)) { - RTMP_Log(RTMP_LOGERROR, "rtmp server requested close"); - RTMP_Close(r); + if (r->Link.redirected) + { + RTMP_Log(RTMP_LOGINFO, "trying to connect with redirected url"); + RTMP_Close(r); + r->Link.redirected = FALSE; + RTMP_Connect(r, NULL); + } + else + { + RTMP_Log(RTMP_LOGERROR, "rtmp server requested close"); + RTMP_Close(r); + } } else if (AVMATCH(&method, &av_onStatus)) { diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h index 6b2ae5b..36d2bf6 100644 --- a/librtmp/rtmp.h +++ b/librtmp/rtmp.h @@ -174,6 +174,7 @@ extern "C" int swfAge; int protocol; + int redirected; int timeout; /* connection timeout in seconds */ unsigned short socksport; -- 1.7.9

2 1

Handshake 10
by Steven Penny 05 Sep '12

05 Sep '12

As discussed with compn, this is the unofficial Handshake 10 patch. I in no way endorse this patch or intend to provide builds for it. I am merely posting it for historical purpose, and because GitHub will not host it.

1 1