[rtmpdump] r183 - in trunk: ChangeLog Makefile README rtmpdump.c rtmpsrv.c rtmpsuck.c streams.c
hyc
subversion at mplayerhq.hu
Mon Jan 4 13:08:47 CET 2010
Author: hyc
Date: Mon Jan 4 13:08:46 2010
New Revision: 183
Log:
Updates for 2.1b
Modified:
trunk/ChangeLog
trunk/Makefile
trunk/README
trunk/rtmpdump.c
trunk/rtmpsrv.c
trunk/rtmpsuck.c
trunk/streams.c
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/ChangeLog Mon Jan 4 13:08:46 2010 (r183)
@@ -3,6 +3,13 @@ Copyright 2008-2009 Andrej Stepanchuk; D
Copyright 2009-2010 Howard Chu
Copyright 2009 The Flvstreamer Team
+4 January 2010, v2.1b
+- fix url matching in .swfinfo lookup
+- fix resume parsing in rtmpdump
+- minor code cleanup (CRYPTO dependencies, logging)
+- add getStreamLength recognition to rtmpsrv
+- add close processing in rtmpsuck
+
1 January 2010, v2.1a
- fix socket receive timeouts for WIN32
- add streams description to README
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/Makefile Mon Jan 4 13:08:46 2010 (r183)
@@ -1,8 +1,9 @@
CC=$(CROSS_COMPILE)gcc
LD=$(CROSS_COMPILE)ld
+DEF=-DRTMPDUMP_VERSION=\"2.1b\"
OPT=-O2
-CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
+CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
LDFLAGS=-Wall $(XLDFLAGS)
LIBS=-lcrypto -lz
THREADLIB=-lpthread
Modified: trunk/README
==============================================================================
--- trunk/README Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/README Mon Jan 4 13:08:46 2010 (r183)
@@ -1,4 +1,4 @@
-RTMP Dump v2.1a
+RTMP Dump v2.1b
(C) 2009 Andrej Stepanchuk
(C) 2009-2010 Howard Chu
License: GPLv2
@@ -100,9 +100,20 @@ A rule like the above will be needed to
Using it in this mode takes advantage of the Linux support for IP redirects;
in particular it uses a special getsockopt() call to retrieve the original
destination address of the connection. That way the proxy can create the
-real outbound connection without any other help from the user. I'm not aware
-of equivalent functionality on BSD, Windows, or any other platform; if you
-know how to handle this I'd be interested in hearing about it.
+real outbound connection without any other help from the user. The equivalent
+functionality may exist on other OSs but needs more investigation.
+
+(Based on reading the BSD ipfw manpage, these rules ought to work on BSD:
+
+ipfw add 40 fwd 127.0.0.1 1935 tcp from any to any 1935
+ipfw add 40 fwd 127.0.0.1 1935 tcp from any to any 1935 not uid proxy
+
+Some confirmation from any BSD users would be nice.)
+
+(We have a solution for Windows based on a TDI driver; this is known to
+work on Win2K and WinXP but is assumed to not work on Vista or Win7 as the
+TDI is no longer used on those OS versions. Also, none of the known
+solutions are available as freeware.)
The rtmpsuck command has only one option: "-z" to turn on debug logging.
It listens on port 1935 for RTMP sessions, but you can also redirect other
Modified: trunk/rtmpdump.c
==============================================================================
--- trunk/rtmpdump.c Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/rtmpdump.c Mon Jan 4 13:08:46 2010 (r183)
@@ -43,8 +43,6 @@
#define SET_BINMODE(f)
#endif
-#define RTMPDUMP_VERSION "v2.1"
-
#define RD_SUCCESS 0
#define RD_FAILED 1
#define RD_INCOMPLETE 2
@@ -1139,7 +1137,7 @@ main(int argc, char **argv)
LogPrintf("RTMPDump %s\n", RTMPDUMP_VERSION);
LogPrintf
- ("(c) 2009 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL\n");
+ ("(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL\n");
if (!InitSockets())
{
Modified: trunk/rtmpsrv.c
==============================================================================
--- trunk/rtmpsrv.c Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/rtmpsrv.c Mon Jan 4 13:08:46 2010 (r183)
@@ -42,8 +42,6 @@
#include <linux/netfilter_ipv4.h>
#endif
-#define RTMPDUMP_SERVER_VERSION "v2.1"
-
#define RD_SUCCESS 0
#define RD_FAILED 1
#define RD_INCOMPLETE 2
@@ -661,8 +659,8 @@ main(int argc, char **argv)
char *rtmpStreamingDevice = DEFAULT_HTTP_STREAMING_DEVICE; // streaming device, default 0.0.0.0
int nRtmpStreamingPort = 1935; // port
- LogPrintf("RTMP Server %s\n", RTMPDUMP_SERVER_VERSION);
- LogPrintf("(c) 2009 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
+ LogPrintf("RTMP Server %s\n", RTMPDUMP_VERSION);
+ LogPrintf("(c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
debuglevel = LOGALL;
Modified: trunk/rtmpsuck.c
==============================================================================
--- trunk/rtmpsuck.c Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/rtmpsuck.c Mon Jan 4 13:08:46 2010 (r183)
@@ -42,8 +42,6 @@
#include <linux/netfilter_ipv4.h>
#endif
-#define RTMPDUMP_PROXY_VERSION "v2.1"
-
#define RD_SUCCESS 0
#define RD_FAILED 1
#define RD_INCOMPLETE 2
@@ -1047,8 +1045,8 @@ main(int argc, char **argv)
char *rtmpStreamingDevice = DEFAULT_RTMP_STREAMING_DEVICE; // streaming device, default 0.0.0.0
int nRtmpStreamingPort = 1935; // port
- LogPrintf("RTMP Proxy Server %s\n", RTMPDUMP_PROXY_VERSION);
- LogPrintf("(c) 2009 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
+ LogPrintf("RTMP Proxy Server %s\n", RTMPDUMP_VERSION);
+ LogPrintf("(c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
debuglevel = LOGDEBUG;
Modified: trunk/streams.c
==============================================================================
--- trunk/streams.c Mon Jan 4 12:35:51 2010 (r182)
+++ trunk/streams.c Mon Jan 4 13:08:46 2010 (r183)
@@ -33,8 +33,6 @@
#include "thread.h"
-#define RTMPDUMP_STREAMS_VERSION "v2.1"
-
#define RD_SUCCESS 0
#define RD_FAILED 1
#define RD_INCOMPLETE 2
@@ -1055,8 +1053,8 @@ 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_STREAMS_VERSION);
- LogPrintf("(c) 2009 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
+ LogPrintf("HTTP-RTMP Stream Server %s\n", RTMPDUMP_VERSION);
+ LogPrintf("(c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL\n\n");
// init request
memset(&defaultRTMPRequest, 0, sizeof(RTMP_REQUEST));
More information about the rtmpdump
mailing list