June 2010 - rtmpdump - lists.mplayerhq.hu

r536 - in trunk: Makefile librtmp/hashswf.c
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Thu Jul 1 00:34:59 2010 New Revision: 536 Log: zlib dependency is only when CRYPTO is enabled Modified: trunk/Makefile trunk/librtmp/hashswf.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Jun 30 23:38:21 2010 (r535) +++ trunk/Makefile Thu Jul 1 00:34:59 2010 (r536) @@ -11,9 +11,10 @@ SYS=posix CRYPTO=OPENSSL #CRYPTO=POLARSSL #CRYPTO=GNUTLS -LIB_GNUTLS=-lgnutls -lgcrypt -LIB_OPENSSL=-lssl -lcrypto -LIB_POLARSSL=-lpolarssl +LIBZ=-lz +LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_OPENSSL=-lssl -lcrypto$ (LIBZ) +LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) DEF_=-DNO_CRYPTO CRYPTO_DEF=$(DEF_$(CRYPTO)) @@ -33,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) +LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) THREADLIB_posix=-lpthread THREADLIB_mingw= Modified: trunk/librtmp/hashswf.c ============================================================================== --- trunk/librtmp/hashswf.c Wed Jun 30 23:38:21 2010 (r535) +++ trunk/librtmp/hashswf.c Thu Jul 1 00:34:59 2010 (r536) @@ -66,10 +66,10 @@ extern void RTMP_TLS_Init(); extern TLS_CTX RTMP_TLS_ctx; -#endif /* CRYPTO */ - #include <zlib.h> +#endif /* CRYPTO */ + #define AGENT "Mozilla/5.0" HTTPResult

1 0

[PATCH] remove dependency on zlib when CRYPTO is disabled.
by Mikhail I. Izmestev 30 Jun '10

30 Jun '10

Hi all. Attached patch remove dependency on zlib when CRYPTO is disabled. Mikhail.

1 0

r535 - web/index.html
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 23:38:21 2010 New Revision: 535 Log: 2.3 download links Modified: web/index.html Modified: web/index.html ============================================================================== --- web/index.html Wed Jun 30 22:41:26 2010 (r534) +++ web/index.html Wed Jun 30 23:38:21 2010 (r535) @@ -95,11 +95,11 @@ negotiated, it records the cleartext str relaying the data from the server to the client. -2010-05-29: Download source tarball <a href="download/rtmpdump-2.2e.tgz">rtmpdump-2.2e.tgz</a> +2010-06-30: Download source tarball <a href="download/rtmpdump-2.3.tgz">rtmpdump-2.3.tgz</a> -2010-05-29: Download Windows build <a href="download/rtmpdump-2.2e-windows.zip">rtmpdump-2.2e-windows.zip</a> +2010-06-30: Download Windows build <a href="download/rtmpdump-2.3-windows.zip">rtmpdump-2.3-windows.zip</a> -2010-05-29: Download Android build <a href="download/rtmpdump-2.2e-android.zip">rtmpdump-2.2e-android.zip</a> +2010-06-30: Download Android build <a href="download/rtmpdump-2.3-android.zip">rtmpdump-2.3-android.zip</a>

1 0

r534 - in web: ChangeLog index.html
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 22:41:26 2010 New Revision: 534 Log: 2.3 released, download links not yet updated Replaced: web/ChangeLog - copied unchanged from r533, trunk/ChangeLog Modified: web/index.html Modified: web/index.html ============================================================================== --- web/index.html Wed Jun 30 22:01:39 2010 (r533) +++ web/index.html Wed Jun 30 22:41:26 2010 (r534) @@ -39,9 +39,9 @@ Also the code has recently split between version 1.x and 2.x (trunk is now 2.x). You can find the 1.x code in svn://svn.mplayerhq.hu/rtmpdump/branches/1.x . --> -The latest release is 2.2e which you can check out from: +The latest release is 2.3 which you can check out from: <ul> -svn://svn.mplayerhq.hu/rtmpdump/tags/rel-2.2e +svn://svn.mplayerhq.hu/rtmpdump/tags/rel-2.3 </ul> Releases will also be provided as compressed tar archives in the <a href="download">download</a> directory. There are also zip archives @@ -69,7 +69,9 @@ list and discuss your ideas. As of 2.2 the main protocol code is now available in its own library, librtmp. -This library is licensed under LGPL so it may be used freely in other applications. +This library is licensed under LGPL so it may be used freely in other +applications. As of 2.3 the library may also be built as a shared library, +not just a static library Some manpages have been added for 2.2. You can read the <a href="rtmpdump.1.html">rtmpdump</a> manpage and the

1 0

r533 - in tags/rel-2.3: . librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 22:01:39 2010 New Revision: 533 Log: re-sync Modified: tags/rel-2.3/ (props changed) tags/rel-2.3/librtmp/Makefile Modified: tags/rel-2.3/librtmp/Makefile ============================================================================== --- tags/rel-2.3/librtmp/Makefile Wed Jun 30 22:01:12 2010 (r532) +++ tags/rel-2.3/librtmp/Makefile Wed Jun 30 22:01:39 2010 (r533) @@ -6,6 +6,7 @@ CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld AR=$(CROSS_COMPILE)ar +SYS=posix CRYPTO=OPENSSL #CRYPTO=GNUTLS DEF_POLARSSL=-DUSE_POLARSSL

1 0

r532 - trunk/librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 22:01:12 2010 New Revision: 532 Log: Default to SYS=posix, parent Makefile may not have run Modified: trunk/librtmp/Makefile Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Wed Jun 30 21:59:24 2010 (r531) +++ trunk/librtmp/Makefile Wed Jun 30 22:01:12 2010 (r532) @@ -6,6 +6,7 @@ CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld AR=$(CROSS_COMPILE)ar +SYS=posix CRYPTO=OPENSSL #CRYPTO=GNUTLS DEF_POLARSSL=-DUSE_POLARSSL

1 0

r531 - in tags/rel-2.3: . librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:59:24 2010 New Revision: 531 Log: re-sync Modified: tags/rel-2.3/ (props changed) tags/rel-2.3/librtmp/Makefile Modified: tags/rel-2.3/librtmp/Makefile ============================================================================== --- tags/rel-2.3/librtmp/Makefile Wed Jun 30 21:57:38 2010 (r530) +++ tags/rel-2.3/librtmp/Makefile Wed Jun 30 21:59:24 2010 (r531) @@ -54,7 +54,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseu all: librtmp.a $(SO_LIB) clean: - rm -f *.o *.a + rm -f *.o *.a *.so *.$(SO_EXT) librtmp.a: $(OBJS) $(AR) rs $@ $?

1 0

r530 - trunk/librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:57:38 2010 New Revision: 530 Log: Also delete shared libs on clean Modified: trunk/librtmp/Makefile Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Wed Jun 30 21:52:48 2010 (r529) +++ trunk/librtmp/Makefile Wed Jun 30 21:57:38 2010 (r530) @@ -54,7 +54,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseu all: librtmp.a $(SO_LIB) clean: - rm -f *.o *.a + rm -f *.o *.a *.so *.$(SO_EXT) librtmp.a: $(OBJS) $(AR) rs $@ $?

1 0

r529 - tags/rel-2.3
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:52:48 2010 New Revision: 529 Log: Release 2.3 Added: tags/rel-2.3/ - copied from r528, trunk/

1 0

r528 - trunk/README
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:51:21 2010 New Revision: 528 Log: 2.3 notes about shared library Modified: trunk/README Modified: trunk/README ============================================================================== --- trunk/README Wed Jun 30 21:41:52 2010 (r527) +++ trunk/README Wed Jun 30 21:51:21 2010 (r528) @@ -1,4 +1,4 @@ -RTMP Dump v2.2e +RTMP Dump v2.3 (C) 2009 Andrej Stepanchuk (C) 2009-2010 Howard Chu (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 @@ -37,6 +37,13 @@ You may also turn off all crypto support $ make CRYPTO= +A shared library is now built by default, in addition to the static +library. You can also turn it off if desired + + $ make SHARED= + +The rtmpdump programs still link to the static library, regardless. + Note that if using OpenSSL, you must have version 0.9.8 or newer. Credit goes to team boxee for the XBMC RTMP code originally used in RTMPDumper.

1 0

r527 - trunk/librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:41:52 2010 New Revision: 527 Log: Add mingw DLL install support Modified: trunk/librtmp/Makefile Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Wed Jun 30 21:02:53 2010 (r526) +++ trunk/librtmp/Makefile Wed Jun 30 21:41:52 2010 (r527) @@ -24,13 +24,14 @@ CRYPTO_LIB=$(LIB_$(CRYPTO)) $(LIBS_$(SYS CRYPTO_REQ=$(REQ_$(CRYPTO)) CRYPTO_DEF=$(DEF_$(CRYPTO)) -SHARED=SO -SODEF_= -SODEF_SO=-fPIC -SOLIB_= -SOLIB_SO=librtmp.so -SOINST_= -SOINST_SO=install_so +SO_posix=so.0 +SO_mingw=dll +SO_EXT=$(SO_$(SYS)) + +SHARED=yes +SODEF_yes=-fPIC +SOLIB_yes=librtmp.$(SO_EXT) +SOINST_yes=install_$(SO_EXT) SO_DEF=$(SODEF_$(SHARED)) SO_LIB=$(SOLIB_$(SHARED)) SO_INST=$(SOINST_$(SHARED)) @@ -40,8 +41,10 @@ OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) incdir=$(prefix)/include/librtmp +bindir=$(prefix)/bin libdir=$(prefix)/lib mandir=$(prefix)/man +BINDIR=$(DESTDIR)$(bindir) INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) MANDIR=$(DESTDIR)$(mandir) @@ -56,11 +59,9 @@ clean: librtmp.a: $(OBJS) $(AR) rs $@ $? -librtmp.so.0: $(OBJS) +librtmp.$(SO_EXT): $(OBJS) $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) - -librtmp.so: librtmp.so.0 - ln -sf $? $@ + ln -sf $@ librtmp.so log.o: log.c log.h Makefile rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile @@ -81,6 +82,9 @@ install_base: librtmp.a librtmp.pc cp librtmp.pc $(LIBDIR)/pkgconfig cp librtmp.3 $(MANDIR)/man3 -install_so: librtmp.so.0 +install_so.0: librtmp.so.0 cp librtmp.so.0 $(LIBDIR) cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so + +install_dll: librtmp.dll + cp librtmp.dll $(BINDIR)

1 0

r526 - trunk/librtmp/Makefile
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 21:02:53 2010 New Revision: 526 Log: Add -lz and MinGW support Modified: trunk/librtmp/Makefile Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Wed Jun 30 20:52:14 2010 (r525) +++ trunk/librtmp/Makefile Wed Jun 30 21:02:53 2010 (r526) @@ -14,10 +14,13 @@ DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls REQ_OPENSSL=libssl,libcrypto -LIB_GNUTLS=-lgnutls -lgcrypt -LIB_OPENSSL=-lssl -lcrypto -LIB_POLARSSL=-lpolarssl -CRYPTO_LIB=$(LIB_$(CRYPTO)) +LIBZ=-lz +LIBS_posix= +LIBS_mingw=-lws2_32 -lwinmm -lgdi32 +LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_OPENSSL=-lssl -lcrypto $(LIBZ) +LIB_POLARSSL=-lpolarssl $(LIBZ) +CRYPTO_LIB=$(LIB_$(CRYPTO)) $(LIBS_$(SYS)) CRYPTO_REQ=$(REQ_$(CRYPTO)) CRYPTO_DEF=$(DEF_$(CRYPTO))

1 0

r525 - in trunk: ChangeLog Makefile librtmp/Makefile librtmp/rtmp.h
by hyc 30 Jun '10

30 Jun '10

Author: hyc Date: Wed Jun 30 20:52:14 2010 New Revision: 525 Log: Bumping version to 2.3 to highlight shared lib support Modified: trunk/ChangeLog trunk/Makefile trunk/librtmp/Makefile trunk/librtmp/rtmp.h Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Tue Jun 29 23:05:04 2010 (r524) +++ trunk/ChangeLog Wed Jun 30 20:52:14 2010 (r525) @@ -4,7 +4,7 @@ Copyright 2009-2010 Howard Chu Copyright 2009 The Flvstreamer Team http://rtmpdump.mplayerhq.hu/ -26 June 2010, v2.2f +30 June 2010, v2.3 - fix RC4 cleanup for GnuTLS/gcrypt - declare RTMP_Write buf as const - cleanup Makefile @@ -18,6 +18,9 @@ http://rtmpdump.mplayerhq.hu/ - fix crash on socket failure while RTMP_Read() is reading header - fix RTMP_ReadPacket signed/unsigned chars for m_nChannel - license cleanup, use current FSF address +- fix RTMP_SetupURL tcUrl generation +- ignore multiple spaces between URL options +- only send CheckBW request once per session 29 May 2010, v2.2e - port to Xbox Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Jun 29 23:05:04 2010 (r524) +++ trunk/Makefile Wed Jun 30 20:52:14 2010 (r525) @@ -1,4 +1,4 @@ -VERSION=v2.2f +VERSION=v2.3 prefix=/usr/local Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Tue Jun 29 23:05:04 2010 (r524) +++ trunk/librtmp/Makefile Wed Jun 30 20:52:14 2010 (r525) @@ -1,4 +1,4 @@ -VERSION=v2.2f +VERSION=v2.3 prefix=/usr/local Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Tue Jun 29 23:05:04 2010 (r524) +++ trunk/librtmp/rtmp.h Wed Jun 30 20:52:14 2010 (r525) @@ -40,7 +40,7 @@ extern "C" { #endif -#define RTMP_LIB_VERSION 0x020206 /* 2.2f */ +#define RTMP_LIB_VERSION 0x020300 /* 2.3 */ #define RTMP_FEATURE_HTTP 0x01 #define RTMP_FEATURE_ENC 0x02

1 0

r524 - trunk/librtmp/rtmp.c
by hyc 29 Jun '10

29 Jun '10

Author: hyc Date: Tue Jun 29 23:05:04 2010 New Revision: 524 Log: Only send CheckBW request once Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Tue Jun 29 09:40:13 2010 (r523) +++ trunk/librtmp/rtmp.c Tue Jun 29 23:05:04 2010 (r524) @@ -2377,7 +2377,8 @@ HandleInvoke(RTMP *r, const char *body, } else if (AVMATCH(&method, &av_onBWDone)) { - SendCheckBW(r); + if (!r->m_nBWCheckCounter) + SendCheckBW(r); } else if (AVMATCH(&method, &av_onFCSubscribe)) {

1 0

r523 - trunk/librtmp/rtmp.c
by hyc 29 Jun '10

29 Jun '10

Author: hyc Date: Tue Jun 29 09:40:13 2010 New Revision: 523 Log: Fix prev commit Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Tue Jun 29 03:39:49 2010 (r522) +++ trunk/librtmp/rtmp.c Tue Jun 29 09:40:13 2010 (r523) @@ -715,27 +715,32 @@ int RTMP_SetupURL(RTMP *r, char *url) if (!r->Link.tcUrl.av_len) { r->Link.tcUrl.av_val = url; - if (r->Link.app.av_len) { - if (r->Link.app.av_val < url + len) - { - /* if app is part of original url, just use it */ - r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); - } - else - { - len = r->Link.hostname.av_len + r->Link.app.av_len + + if (r->Link.app.av_len) + { + if (r->Link.app.av_val < url + len) + { + /* if app is part of original url, just use it */ + r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); + } + else + { + len = r->Link.hostname.av_len + r->Link.app.av_len + sizeof("rtmpte://:65535/"); - r->Link.tcUrl.av_val = malloc(len); - r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len, + r->Link.tcUrl.av_val = malloc(len); + r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len, "%s://%.*s:%d/%.*s", RTMPProtocolStringsLower[r->Link.protocol], r->Link.hostname.av_len, r->Link.hostname.av_val, r->Link.port, r->Link.app.av_len, r->Link.app.av_val); - r->Link.lFlags |= RTMP_LF_FTCU; - tcUrl.av_len = strlen(url); - } + r->Link.lFlags |= RTMP_LF_FTCU; + } + } + else + { + r->Link.tcUrl.av_len = strlen(url); } + } #ifdef CRYPTO if ((r->Link.lFlags & RTMP_LF_SWFV) && r->Link.swfUrl.av_len)

1 0

r522 - trunk/librtmp/rtmp.c
by hyc 29 Jun '10

29 Jun '10

Author: hyc Date: Tue Jun 29 03:39:49 2010 New Revision: 522 Log: Cleanup prev commit Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Tue Jun 29 03:31:17 2010 (r521) +++ trunk/librtmp/rtmp.c Tue Jun 29 03:39:49 2010 (r522) @@ -714,28 +714,26 @@ int RTMP_SetupURL(RTMP *r, char *url) if (!r->Link.tcUrl.av_len) { - r->Link.tcUrl.av_val = url; - if (r->Link.app.av_len) { - if (r->Link.app.av_val < url + len) - { - /* if app is part of original url, just use it */ - r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); - } - else - { - len = r->Link.hostname.av_len + r->Link.app.av_len + - sizeof("rtmpte://65535/"); - r->Link.tcUrl.av_val = malloc(len); - r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len, - "%s://%.*s:%d/%.*s", - RTMPProtocolStringsLower[r->Link.protocol], - r->Link.hostname.av_len, r->Link.hostname.av_val, - r->Link.port, - r->Link.app.av_len, r->Link.app.av_val); - r->Link.lFlags |= RTMP_LF_FTCU; - } - } else { - r->Link.tcUrl.av_len = strlen(url); + r->Link.tcUrl.av_val = url; + if (r->Link.app.av_len) { + if (r->Link.app.av_val < url + len) + { + /* if app is part of original url, just use it */ + r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); + } + else + { + len = r->Link.hostname.av_len + r->Link.app.av_len + + sizeof("rtmpte://:65535/"); + r->Link.tcUrl.av_val = malloc(len); + r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len, + "%s://%.*s:%d/%.*s", + RTMPProtocolStringsLower[r->Link.protocol], + r->Link.hostname.av_len, r->Link.hostname.av_val, + r->Link.port, + r->Link.app.av_len, r->Link.app.av_val); + r->Link.lFlags |= RTMP_LF_FTCU; + tcUrl.av_len = strlen(url); } } @@ -3449,10 +3447,10 @@ RTMP_Close(RTMP *r) if (r->Link.lFlags & RTMP_LF_FTCU) { - free(r->Link.tcUrl.av_val); - r->Link.tcUrl.av_val = NULL; - r->Link.lFlags ^= RTMP_LF_FTCU; - } + free(r->Link.tcUrl.av_val); + r->Link.tcUrl.av_val = NULL; + r->Link.lFlags ^= RTMP_LF_FTCU; + } #ifdef CRYPTO if (r->Link.dh)

2 1

r521 - in trunk/librtmp: rtmp.c rtmp.h
by hyc 29 Jun '10

29 Jun '10

Author: hyc Date: Tue Jun 29 03:31:17 2010 New Revision: 521 Log: Fix tcUrl generation, free it on close if needed Modified: trunk/librtmp/rtmp.c trunk/librtmp/rtmp.h Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Tue Jun 29 03:09:21 2010 (r520) +++ trunk/librtmp/rtmp.c Tue Jun 29 03:31:17 2010 (r521) @@ -654,12 +654,13 @@ int RTMP_SetupURL(RTMP *r, char *url) { AVal opt, arg; char *p1, *p2, *ptr = strchr(url, ' '); - int ret; + int ret, len; unsigned int port = 0; if (ptr) *ptr = '\0'; + len = strlen(url); ret = RTMP_ParseURL(url, &r->Link.protocol, &r->Link.hostname, &port, &r->Link.playpath0, &r->Link.app); if (!ret) @@ -714,10 +715,28 @@ int RTMP_SetupURL(RTMP *r, char *url) if (!r->Link.tcUrl.av_len) { r->Link.tcUrl.av_val = url; - if (r->Link.app.av_len) - r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); - else + if (r->Link.app.av_len) { + if (r->Link.app.av_val < url + len) + { + /* if app is part of original url, just use it */ + r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url); + } + else + { + len = r->Link.hostname.av_len + r->Link.app.av_len + + sizeof("rtmpte://65535/"); + r->Link.tcUrl.av_val = malloc(len); + r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len, + "%s://%.*s:%d/%.*s", + RTMPProtocolStringsLower[r->Link.protocol], + r->Link.hostname.av_len, r->Link.hostname.av_val, + r->Link.port, + r->Link.app.av_len, r->Link.app.av_val); + r->Link.lFlags |= RTMP_LF_FTCU; + } + } else { r->Link.tcUrl.av_len = strlen(url); + } } #ifdef CRYPTO @@ -3428,6 +3447,13 @@ RTMP_Close(RTMP *r) free(r->Link.playpath0.av_val); r->Link.playpath0.av_val = NULL; + if (r->Link.lFlags & RTMP_LF_FTCU) + { + free(r->Link.tcUrl.av_val); + r->Link.tcUrl.av_val = NULL; + r->Link.lFlags ^= RTMP_LF_FTCU; + } + #ifdef CRYPTO if (r->Link.dh) { Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Tue Jun 29 03:09:21 2010 (r520) +++ trunk/librtmp/rtmp.h Tue Jun 29 03:31:17 2010 (r521) @@ -147,6 +147,7 @@ extern "C" #define RTMP_LF_SWFV 0x0004 /* do SWF verification */ #define RTMP_LF_PLST 0x0008 /* send playlist before play */ #define RTMP_LF_BUFX 0x0010 /* toggle stream on BufferEmpty msg */ +#define RTMP_LF_FTCU 0x0020 /* free tcUrl on close */ int lFlags; int swfAge;

1 0

r520 - trunk/librtmp/rtmp.c
by hyc 29 Jun '10

29 Jun '10

Author: hyc Date: Tue Jun 29 03:09:21 2010 New Revision: 520 Log: Skip repeated spaces between URL options Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Sun Jun 27 21:51:48 2010 (r519) +++ trunk/librtmp/rtmp.c Tue Jun 29 03:09:21 2010 (r520) @@ -681,6 +681,9 @@ int RTMP_SetupURL(RTMP *r, char *url) if (ptr) { *ptr = '\0'; arg.av_len = ptr - p2; + /* skip repeated spaces */ + while(ptr[1] == ' ') + *ptr++ = '\0'; } else { arg.av_len = strlen(p2); }

1 0

r519 - in trunk: Makefile rtmpsrv.c
by hyc 27 Jun '10

27 Jun '10

Author: hyc Date: Sun Jun 27 21:51:48 2010 New Revision: 519 Log: Check for duplicate invocations Modified: trunk/Makefile trunk/rtmpsrv.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Jun 26 23:03:02 2010 (r518) +++ trunk/Makefile Sun Jun 27 21:51:48 2010 (r519) @@ -1,4 +1,4 @@ -VERSION=v2.2e +VERSION=v2.2f prefix=/usr/local Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Sat Jun 26 23:03:02 2010 (r518) +++ trunk/rtmpsrv.c Sun Jun 27 21:51:48 2010 (r519) @@ -68,6 +68,8 @@ #define CleanupSockets() #endif +#define DUPTIME 5000 /* interval we disallow duplicate requests, in msec */ + enum { STREAMING_ACCEPTING, @@ -83,6 +85,8 @@ typedef struct int streamID; int arglen; int argc; + uint32_t filetime; /* time of last download we started */ + AVal filename; /* name of last download */ char *connect; } STREAMING_SERVER; @@ -576,6 +580,7 @@ ServeInvoke(STREAMING_SERVER *server, RT char *file, *p, *q, *cmd, *ptr; AVal *argv, av; int len, argc; + uint32_t now; RTMPPacket pc = {0}; AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &r->Link.playpath); /* @@ -697,13 +702,24 @@ ServeInvoke(STREAMING_SERVER *server, RT argv[argc].av_val = ptr + 1; argv[argc++].av_len = 2; argv[argc].av_val = file; - argv[argc++].av_len = av.av_len; + argv[argc].av_len = av.av_len; ptr += sprintf(ptr, " -o %s", file); + now = RTMP_GetTime(); + if (now - server->filetime < DUPTIME && AVMATCH(&argv[argc], &server->filename)) + { + printf("Duplicate request, skipping.\n"); + free(file); + } + else + { + printf("\n%s\n\n", cmd); + fflush(stdout); + server->filetime = now; + free(server->filename.av_val); + server->filename = argv[argc++]; + spawn_dumper(argc, argv, cmd); + } - printf("\n%s\n\n", cmd); - fflush(stdout); - spawn_dumper(argc, argv, cmd); - free(file); free(cmd); } pc.m_body = server->connect;

1 0

r518 - trunk/ChangeLog
by hyc 26 Jun '10

26 Jun '10

Author: hyc Date: Sat Jun 26 23:03:02 2010 New Revision: 518 Log: Notes for 2.2f Modified: trunk/ChangeLog Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Fri Jun 25 22:28:41 2010 (r517) +++ trunk/ChangeLog Sat Jun 26 23:03:02 2010 (r518) @@ -4,6 +4,21 @@ Copyright 2009-2010 Howard Chu Copyright 2009 The Flvstreamer Team http://rtmpdump.mplayerhq.hu/ +26 June 2010, v2.2f +- fix RC4 cleanup for GnuTLS/gcrypt +- declare RTMP_Write buf as const +- cleanup Makefile +- replace all use of bool with int +- add RTMP_Socket() and RTMP_Pause() APIs +- add ping/pong message handling +- add basic shared library support +- fix RTMP_ParseURL extension skipping +- fix bad switch() from -r477 in RTMP_Read +- fix rtmpsrv to always use .flv extension on output +- fix crash on socket failure while RTMP_Read() is reading header +- fix RTMP_ReadPacket signed/unsigned chars for m_nChannel +- license cleanup, use current FSF address + 29 May 2010, v2.2e - port to Xbox - add explicit URL scheme for rtmpts

1 0

librtmp in multi threaded applications and interruption
by Mikhail I. Izmestev 25 Jun '10

25 Jun '10

Hi all. Is it possible to refactor interruption system to allow using librtmp in multi threaded applications? FFmpeg's interruption system is very easy and useful. We can create similar callback to handle interruptions. Mikhail.

3 4

r517 - trunk/librtmp/rtmp.c
by hyc 25 Jun '10

25 Jun '10

Author: hyc Date: Fri Jun 25 22:28:41 2010 New Revision: 517 Log: Fix bogus switch statement Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Thu Jun 24 21:20:52 2010 (r516) +++ trunk/librtmp/rtmp.c Fri Jun 25 22:28:41 2010 (r517) @@ -4151,7 +4151,7 @@ RTMP_Read(RTMP *r, char *buf, int size) /* can't continue */ fail: - switch (r->m_read.status < 0) { + switch (r->m_read.status) { case RTMP_READ_EOF: case RTMP_READ_COMPLETE: return 0;

1 0

Wrong switch expression in RTMP_Read
by Mikhail I. Izmestev 25 Jun '10

25 Jun '10

Hi all. There is oblivious bug in RTMP_Read. At changeset 477: <code> @@ -4039,8 +4039,17 @@ int nRead = 0, total = 0; /* can't continue */ - if (r->m_read.status < 0) +fail: + switch (r->m_read.status < 0) { + case RTMP_READ_EOF: + case RTMP_READ_COMPLETE: + return 0; + case RTMP_READ_ERROR: /* corrupted stream, resume failed */ + SetSockError(EINVAL); return -1; + default: + break; + } /* first time thru */ if (!(r->m_read.flags & RTMP_READ_HEADER)) </code> Maybe switch should be like: <code> switch (r->m_read.status) </code> Mikhail.

1 0

Re: [rtmpdump] Problem downloading p008fcfq Doctor Who - The Adventure Games
by David Woodhouse 25 Jun '10

25 Jun '10

(resending with correct address for rtmpdump list) On Sat, 2010-06-19 at 08:07 +0100, Andy Bircumshaw wrote: > >> Download may be incomplete (downloaded about 99.80%), try resuming > > > > This is probably an rtmpdump problem with resume. Try moving the > > existing file out of the way and starting the download from scratch. > > That doesn't make any difference. I already tried that before posting > my confirmation. Sorry - I assumed that was obvious. Not obvious enough that people always manage to try it before asking, and rtmpdump has a number of issues with resume. But yeah, looking back at Bill's log it is obvious in retrospect that _he_ had started from scratch; sorry. Still an rtmpdump problem though, I think -- it's exiting with an error code when it really succeeded. This rtmpdump command: rtmpdump --port 1935 --protocol 0 --playpath 'mp4:iplayerstream/secure_auth/1500kbps/WilliG16-00016314-High_Quality_DOCTOR_WHO_GAME_-_VA2_Flash9_Hi_v1_0.mp4' --host bbcmedia.fcod.llnwd.net --swfVfy http://www.bbc.co.uk/emp/10player.swf?revision=18269_19216 --tcUrl 'rtmp://bbcmedia.fcod.llnwd.net:1935/a1414/e3?as=adobe-hmac-sha256&av=1&te=connect&mp=iplayerstream/secure_auth/1500kbps/WilliG16-00016314-High_Quality_DOCTOR_WHO_GAME_-_VA2_Flash9_Hi_v1_0.mp4&et=1276949491&fmta-token=2db1540a4b5011d65ba3f56082c8f28b965ca5a4e826ceb97c330ddcc3ab939b' --app 'a1414/e3?as=adobe-hmac-sha256&av=1&te=connect&mp=iplayerstream/secure_auth/1500kbps/WilliG16-00016314-High_Quality_DOCTOR_WHO_GAME_-_VA2_Flash9_Hi_v1_0.mp4&et=1276949491&fmta-token=2db1540a4b5011d65ba3f56082c8f28b965ca5a4e826ceb97c330ddcc3ab939b' --pageUrl '' --resume -o Doctor_Who_-_Doctor_Who_-_The_Adventure_Games_p008fcfq_default.partial.mp4.flv --timeout 10 --verbose --debug is bailing out... DEBUG2: RTMP_ReadPacket: fd=5 DEBUG2: 0000: 45 00 01 b8 00 00 00 08 E....... DEBUG: ignoring too small audio packet: size: 0 DEBUG2: RTMP_ReadPacket: fd=5 DEBUG2: 0000: 45 00 00 00 00 00 66 12 E.....f. DEBUG2: 0000: 02 00 0c 6f 6e 50 6c 61 79 53 74 61 74 75 73 03 ...onPlayStatus. DEBUG2: 0010: 00 04 63 6f 64 65 02 00 17 4e 65 74 53 74 72 65 ..code...NetStre DEBUG2: 0020: 61 6d 2e 50 6c 61 79 2e 43 6f 6d 70 6c 65 74 65 am.Play.Complete DEBUG2: 0030: 00 05 6c 65 76 65 6c 02 00 06 73 74 61 74 75 73 ..level...status DEBUG2: 0040: 00 08 64 75 72 61 74 69 6f 6e 00 40 4a 00 00 00 ..duration.@J... DEBUG2: 0050: 00 00 00 00 05 62 79 74 65 73 00 41 55 4d 5c 80 .....bytes.AUM\. DEBUG2: 0060: 00 00 00 00 00 09 ...... DEBUG: RTMP_ClientPacket, received: notify 102 bytes DEBUG: (object begin) DEBUG: Property: <Name: no-name., STRING: onPlayStatus> DEBUG: Property: <Name: no-name., OBJECT> DEBUG: (object begin) DEBUG: Property: <Name: code, STRING: NetStream.Play.Complete> DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: duration, NUMBER: 52.00> DEBUG: Property: <Name: bytes, NUMBER: 5584242.00> DEBUG: (object end) DEBUG: (object end) DEBUG2: RTMP_ReadPacket: fd=5 DEBUG2: 0000: 02 00 00 00 00 00 06 04 00 00 00 00 ............ DEBUG2: 0000: 00 01 00 00 00 01 ...... DEBUG: HandleCtrl, received ctrl. type: 1, len: 6 DEBUG: HandleCtrl, Stream EOF 1 DEBUG2: RTMP_ReadPacket: fd=5 DEBUG2: 0000: 45 00 00 00 00 01 66 14 E.....f. DEBUG2: 0000: 02 00 08 6f 6e 53 74 61 74 75 73 00 00 00 00 00 ...onStatus..... DEBUG2: 0010: 00 00 00 00 05 03 00 05 6c 65 76 65 6c 02 00 06 ........level... DEBUG2: 0020: 73 74 61 74 75 73 00 04 63 6f 64 65 02 00 13 4e status..code...N DEBUG2: 0030: 65 74 53 74 72 65 61 6d 2e 50 6c 61 79 2e 53 74 etStream.Play.St DEBUG2: 0040: 6f 70 00 0b 64 65 73 63 72 69 70 74 69 6f 6e 02 op..description. DEBUG2: 0050: 00 7b 53 74 6f 70 70 65 64 20 70 6c 61 79 69 6e .{Stopped playin DEBUG2: 0060: 67 20 69 70 6c 61 79 65 72 73 74 72 65 61 6d 2f g iplayerstream/ DEBUG2: 0070: 73 65 63 75 72 65 5f 61 75 74 68 2f 31 35 30 30 secure_auth/1500 DEBUG2: 0080: 6b 62 70 73 2f 57 69 6c 6c 69 47 31 36 2d 30 30 kbps/WilliG16-00 DEBUG2: 0090: 30 31 36 33 31 34 2d 48 69 67 68 5f 51 75 61 6c 016314-High_Qual DEBUG2: 00a0: 69 74 79 5f 44 4f 43 54 4f 52 5f 57 48 4f 5f 47 ity_DOCTOR_WHO_G DEBUG2: 00b0: 41 4d 45 5f 2d 5f 56 41 32 5f 46 6c 61 73 68 39 AME_-_VA2_Flash9 DEBUG2: 00c0: 5f 48 69 5f 76 31 5f 30 2e 6d 70 34 2e 00 07 64 _Hi_v1_0.mp4...d DEBUG2: 00d0: 65 74 61 69 6c 73 02 00 6a 69 70 6c 61 79 65 72 etails..jiplayer DEBUG2: 00e0: 73 74 72 65 61 6d 2f 73 65 63 75 72 65 5f 61 75 stream/secure_au DEBUG2: 00f0: 74 68 2f 31 35 30 30 6b 62 70 73 2f 57 69 6c 6c th/1500kbps/Will DEBUG2: 0100: 69 47 31 36 2d 30 30 30 31 36 33 31 34 2d 48 69 iG16-00016314-Hi DEBUG2: 0110: 67 68 5f 51 75 61 6c 69 74 79 5f 44 4f 43 54 4f gh_Quality_DOCTO DEBUG2: 0120: 52 5f 57 48 4f 5f 47 41 4d 45 5f 2d 5f 56 41 32 R_WHO_GAME_-_VA2 DEBUG2: 0130: 5f 46 6c 61 73 68 39 5f 48 69 5f 76 31 5f 30 2e _Flash9_Hi_v1_0. DEBUG2: 0140: 6d 70 34 00 08 63 6c 69 65 6e 74 69 64 02 00 08 mp4..clientid... DEBUG2: 0150: 54 5a 79 77 73 6b 6a 61 00 06 72 65 61 73 6f 6e TZywskja..reason DEBUG2: 0160: 02 00 00 00 00 09 ...... DEBUG: RTMP_ClientPacket, received: invoke 358 bytes DEBUG: (object begin) DEBUG: Property: <Name: no-name., STRING: onStatus> DEBUG: Property: <Name: no-name., NUMBER: 0.00> DEBUG: Property: NULL DEBUG: Property: <Name: no-name., OBJECT> DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetStream.Play.Stop> DEBUG: Property: <Name: description, STRING: Stopped playing iplayerstream/secure_auth/1500kbps/WilliG16-00016314-High_Quality_DOCTOR_WHO_GAME_-_VA2_Flash9_Hi_v1_0.mp4.> DEBUG: Property: <Name: details, STRING: iplayerstream/secure_auth/1500kbps/WilliG16-00016314-High_Quality_DOCTOR_WHO_GAME_-_VA2_Flash9_Hi_v1_0.mp4> DEBUG: Property: <Name: clientid, STRING: TZywskja> DEBUG: Property: <Name: reason, STRING: > DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <onStatus> DEBUG: HandleInvoke, onStatus: NetStream.Play.Stop DEBUG2: RTMP_SendPacket: fd=5, size=34 DEBUG2: 0000: 43 ff ff ff 00 00 22 14 ff ff ff ea C....."..... DEBUG2: 0000: 02 00 0c 64 65 6c 65 74 65 53 74 72 65 61 6d 00 ...deleteStream. DEBUG2: 0010: 40 14 00 00 00 00 00 00 05 00 3f f0 00 00 00 00 @.........?..... DEBUG2: 0020: 00 00 .. DEBUG: Invoking deleteStream DEBUG: Got Play.Complete or Play.Stop from server. Assuming stream is complete ^M5453.354 kB / 32.12 sec (99.8%)^M5453.354 kB / 32.12 sec (99.8%) DEBUG: RTMP_Read returned: 13675 Download may be incomplete (downloaded about 99.80%), try resuming DEBUG: Closing connection. INFO: Command exit code 2 (raw code = 512) DEBUG: Record using flashvhigh1 mode return code: 'retry' WARNING: Retry recording for 'Doctor Who - Doctor Who - The Adventure Games (p008fcfq)' Perhaps the ignored zero-size audio packets account for the missing 0.2%? -- dwmw2 _______________________________________________ get_iplayer mailing list get_iplayer(a)lists.infradead.org http://lists.infradead.org/mailman/listinfo/get_iplayer

3 2

RTMP Publishing
by Adam Malcontenti-Wilson 24 Jun '10

24 Jun '10

Hi, Does RTMPdump / librtmp currently support rtmp publishing, that is, publishing a local video stream to a remote rtmp server like the official Flash Media Encoder? Thanks, -- Adam Malcontenti-Wilson

2 1

[PATCH] Bug RTMP_ParsePlaypath
by Mikhail I. Izmestev 24 Jun '10

24 Jun '10

Hi all. RTMP_ParsePlaypath works incorrectly when input playpath contains extension. Example: in.av_val = "test.flv" in.av_len = 8 expected result: out.av_val = "test" out.av_len = 4 actual result: out.av_val = "test\0" out.av_len = 5 Mikhail.

2 1

r516 - trunk/librtmp/parseurl.c
by hyc 24 Jun '10

24 Jun '10

Author: hyc Date: Thu Jun 24 21:20:52 2010 New Revision: 516 Log: Fix skipping extension Modified: trunk/librtmp/parseurl.c Modified: trunk/librtmp/parseurl.c ============================================================================== --- trunk/librtmp/parseurl.c Thu Jun 24 21:18:29 2010 (r515) +++ trunk/librtmp/parseurl.c Thu Jun 24 21:20:52 2010 (r516) @@ -265,6 +265,7 @@ void RTMP_ParsePlaypath(AVal *in, AVal * if (subExt && p == ext) { p += 4; pplen -= 4; + continue; } if (*p == '%') { unsigned int c;

1 0

r515 - trunk/librtmp/rtmp.c
by hyc 24 Jun '10

24 Jun '10

Author: hyc Date: Thu Jun 24 21:18:29 2010 New Revision: 515 Log: m_read.buf cannot be freed if we were still searching for the header Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Tue Jun 22 16:19:08 2010 (r514) +++ trunk/librtmp/rtmp.c Thu Jun 24 21:18:29 2010 (r515) @@ -3382,8 +3382,10 @@ RTMP_Close(RTMP *r) r->m_nBytesIn = 0; r->m_nBytesInSent = 0; - free(r->m_read.buf); - r->m_read.buf = NULL; + if (r->m_read.flags & RTMP_READ_HEADER) { + free(r->m_read.buf); + r->m_read.buf = NULL; + } r->m_read.dataType = 0; r->m_read.flags = 0; r->m_read.status = 0;

1 0

RTMP_SetupURL & const char*
by Dmitry Savenko 23 Jun '10

23 Jun '10

Hello! RTMP_SetupURL accepts URL as "char*". Should be "const char*"

2 1

r514 - trunk/librtmp/rtmp.c
by hyc 22 Jun '10

22 Jun '10

Author: hyc Date: Tue Jun 22 16:19:08 2010 New Revision: 514 Log: casting hbuf to unsigned doesn't seem to work, just declare it unsigned Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Sat Jun 19 20:57:38 2010 (r513) +++ trunk/librtmp/rtmp.c Tue Jun 22 16:19:08 2010 (r514) @@ -2830,13 +2830,14 @@ EncodeInt32LE(char *output, int nVal) int RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) { - char hbuf[RTMP_MAX_HEADER_SIZE] = { 0 }, *header = hbuf; + uint8_t hbuf[RTMP_MAX_HEADER_SIZE] = { 0 }; + char *header = (char *)hbuf; int nSize, hSize, nToRead, nChunk; int didAlloc = FALSE; RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d", __FUNCTION__, r->m_sb.sb_socket); - if (ReadN(r, hbuf, 1) == 0) + if (ReadN(r, (char *)hbuf, 1) == 0) { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header", __FUNCTION__); return FALSE; @@ -2847,26 +2848,26 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac header++; if (packet->m_nChannel == 0) { - if (ReadN(r, &hbuf[1], 1) != 1) + if (ReadN(r, (char *)&hbuf[1], 1) != 1) { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header 2nd byte", __FUNCTION__); return FALSE; } - packet->m_nChannel = (unsigned)hbuf[1]; + packet->m_nChannel = hbuf[1]; packet->m_nChannel += 64; header++; } else if (packet->m_nChannel == 1) { int tmp; - if (ReadN(r, &hbuf[1], 2) != 2) + if (ReadN(r, (char *)&hbuf[1], 2) != 2) { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header 3nd byte", __FUNCTION__); return FALSE; } - tmp = (((unsigned)hbuf[2]) << 8) + (unsigned)hbuf[1]; + tmp = (hbuf[2] << 8) + hbuf[1]; packet->m_nChannel = tmp + 64; RTMP_Log(RTMP_LOGDEBUG, "%s, m_nChannel: %0x", __FUNCTION__, packet->m_nChannel); header += 2; @@ -2893,7 +2894,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac return FALSE; } - hSize = nSize + (header - hbuf); + hSize = nSize + (header - (char *)hbuf); if (nSize >= 3) {

1 0

some live streams can not be opened
by Mikhail I. Izmestev 20 Jun '10

20 Jun '10

Hello everyone, I'm using ffmpeg with librtmp from rtmpdump project, it's great! I have discovered that rtmpdump can not open some live streams which flvstreamer can open correctly. <code> $ ./rtmpdump -v -r rtmp://fms5.visionip.tv/live/RT_3.flv RTMPDump v2.2e (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL WARNING: You haven't specified an output file (-o filename), using stdout Connecting ... INFO: Connected... $ </code> <code> $ ./flvstreamer -v -r rtmp://fms5.visionip.tv/live/RT_3.flv | ffmpeg -i - FLVStreamer v2.1c1 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL Connecting ... FFmpeg version SVN-r23514, Copyright (c) 2000-2010 the FFmpeg developers built on Jun 7 2010 21:11:44 with gcc 4.3.4 configuration: --prefix=/usr --libdir=/usr/lib64 --shlibdir=/usr/lib64 --mandir=/usr/share/man --enable-static --enable-shared --cc=x86_64-pc-linux-gnu-gcc --disable-debug --disable-optimizations --enable-librtmp --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libxvid --disable-indev=oss --disable-indev=jack --disable-outdev=oss --enable-x11grab --enable-libopenjpeg --disable-vdpau --disable-vaapi --disable-altivec --cpu=host --enable-gpl --enable-version3 --enable-postproc --enable-avfilter --enable-avfilter-lavf --disable-stripping --enable-hardcoded-tables --disable-doc libavutil 50.18. 0 / 50.18. 0 libavcodec 52.74. 1 / 52.74. 1 libavformat 52.68. 0 / 52.68. 0 libavdevice 52. 2. 0 / 52. 2. 0 libavfilter 1.20. 0 / 1.20. 0 libswscale 0.11. 0 / 0.11. 0 libpostproc 51. 2. 0 / 51. 2. 0 Starting Live Stream Metadata: author copyright description keywords rating title presetname Custom creationdate Fri May 07 10:50:34 2010 videodevice Osprey-450e Video Device 1B framerate 25.00 width 640.00 height 480.00 videocodecid avc1 videodatarate 900.00 avclevel 31.00 avcprofile 66.00 videokeyframe_frequency5.00 audiodevice Osprey-450e Audio Device 1B audiosamplerate 44100.00 audiochannels 2.00 audioinputvolume 75.00 audiocodecid .mp3 audiodatarate 96.00 26.525 kB / 0.66 sec[flv @ 0x63f470]invalid stream 108.335 kB / 2.00 sec[flv @ 0x63f470]Estimating duration from bitrate, this may be inaccurate Input #0, flv, from 'pipe:': Duration: N/A, start: 0.000000, bitrate: 96 kb/s Stream #0.0: Video: h264, yuv420p, 640x480 [PAR 1:1 DAR 4:3], 25 tbr, 1k tbn, 50 tbc Stream #0.1: Audio: mp3, 44100 Hz, 2 channels, s16, 96 kb/s At least one output file must be specified Caught signal: 13, cleaning up, just a second... ERROR: Download: Failed writing, exiting! $ </code> Mikhail.

1 1

r513 - trunk/librtmp/rtmp.c
by hyc 19 Jun '10

19 Jun '10

Author: hyc Date: Sat Jun 19 20:57:38 2010 New Revision: 513 Log: Add ping/pong msg, from mybiiter(a)gmail.com. (Untested. Used with "ustream"?) Modified: trunk/librtmp/rtmp.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Thu Jun 17 21:13:44 2010 (r512) +++ trunk/librtmp/rtmp.c Sat Jun 19 20:57:38 2010 (r513) @@ -1943,6 +1943,34 @@ SendCheckBWResult(RTMP *r, double txn) return RTMP_SendPacket(r, &packet, FALSE); } +SAVC(ping); +SAVC(pong); + +static int +SendPong(RTMP *r, double txn) +{ + RTMPPacket packet; + char pbuf[256], *pend = pbuf + sizeof(pbuf); + char *enc; + + packet.m_nChannel = 0x03; /* control channel (invoke) */ + packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; + packet.m_packetType = 0x14; /* INVOKE */ + packet.m_nTimeStamp = 0x16 * r->m_nBWCheckCounter; /* temp inc value. till we figure it out. */ + packet.m_nInfoField2 = 0; + packet.m_hasAbsTimestamp = 0; + packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; + + enc = packet.m_body; + enc = AMF_EncodeString(enc, pend, &av_pong); + enc = AMF_EncodeNumber(enc, pend, txn); + *enc++ = AMF_NULL; + + packet.m_nBodySize = enc - packet.m_body; + + return RTMP_SendPacket(r, &packet, FALSE); +} + SAVC(play); static int @@ -2335,6 +2363,10 @@ HandleInvoke(RTMP *r, const char *body, RTMP_Close(r); ret = 1; } + else if (AVMATCH(&method, &av_ping)) + { + SendPong(r, txn); + } else if (AVMATCH(&method, &av__onbwcheck)) { SendCheckBWResult(r, txn);

1 0

[PATCH] Publisher authentication
by Sergiy 18 Jun '10

18 Jun '10

Hi all. I need publisher authentication for my application with login/password for rtmp-server (like in fme), so I created dirty hack to add adboe-auth to librtmp. It tested with fms and rtmpd and seems to work. librtmp reconnect to server 3 times: 1st connection - get 403 error (server need auth). 2nd connection - publisher gives username and receive error again (but server responses with salt & opaque) 3rd connection - publisher sent challenge & response for auth, and if all ok, server sent "Connection succeeded". But it still need to fix memory freeing. Here is samples of my startup (like in ffmpeg's rtmp-output): ./sample/crusherRTMP -i 1 -s 720x576 -b 1000000 -a 96000 -d \ "rtmp://192.168.1.1/live/livestream2 flashver=FMLE/3.0\20(compatible;\20FMSc/1.0) pubUser=user pubPasswd=hackme"

2 1

r512 - trunk/librtmp/Makefile
by hyc 17 Jun '10

17 Jun '10

Author: hyc Date: Thu Jun 17 21:13:44 2010 New Revision: 512 Log: Simple rules for shared lib, v2.2f Modified: trunk/librtmp/Makefile Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Thu Jun 17 20:42:04 2010 (r511) +++ trunk/librtmp/Makefile Thu Jun 17 21:13:44 2010 (r512) @@ -1,4 +1,4 @@ -VERSION=v2.2e +VERSION=v2.2f prefix=/usr/local @@ -14,12 +14,27 @@ DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls REQ_OPENSSL=libssl,libcrypto +LIB_GNUTLS=-lgnutls -lgcrypt +LIB_OPENSSL=-lssl -lcrypto +LIB_POLARSSL=-lpolarssl +CRYPTO_LIB=$(LIB_$(CRYPTO)) CRYPTO_REQ=$(REQ_$(CRYPTO)) CRYPTO_DEF=$(DEF_$(CRYPTO)) +SHARED=SO +SODEF_= +SODEF_SO=-fPIC +SOLIB_= +SOLIB_SO=librtmp.so +SOINST_= +SOINST_SO=install_so +SO_DEF=$(SODEF_$(SHARED)) +SO_LIB=$(SOLIB_$(SHARED)) +SO_INST=$(SOINST_$(SHARED)) + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) +CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) incdir=$(prefix)/include/librtmp libdir=$(prefix)/lib @@ -28,14 +43,22 @@ INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) MANDIR=$(DESTDIR)$(mandir) -all: librtmp.a +OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o + +all: librtmp.a $(SO_LIB) clean: rm -f *.o *.a -librtmp.a: rtmp.o log.o amf.o hashswf.o parseurl.o +librtmp.a: $(OBJS) $(AR) rs $@ $? +librtmp.so.0: $(OBJS) + $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) + +librtmp.so: librtmp.so.0 + ln -sf $? $@ + log.o: log.c log.h Makefile rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile amf.o: amf.c amf.h bytes.h log.h Makefile @@ -46,9 +69,15 @@ librtmp.pc: librtmp.pc.in Makefile sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \ -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@ -install: librtmp.a librtmp.pc +install: install_base $(SO_INST) + +install_base: librtmp.a librtmp.pc -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 cp amf.h http.h log.h rtmp.h $(INCDIR) cp librtmp.a $(LIBDIR) cp librtmp.pc $(LIBDIR)/pkgconfig cp librtmp.3 $(MANDIR)/man3 + +install_so: librtmp.so.0 + cp librtmp.so.0 $(LIBDIR) + cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so

1 0

r511 - trunk/librtmp/rtmp.h
by hyc 17 Jun '10

17 Jun '10

Author: hyc Date: Thu Jun 17 20:42:04 2010 New Revision: 511 Log: bump libversion to 2.2f Modified: trunk/librtmp/rtmp.h Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Thu Jun 17 20:38:04 2010 (r510) +++ trunk/librtmp/rtmp.h Thu Jun 17 20:42:04 2010 (r511) @@ -40,7 +40,7 @@ extern "C" { #endif -#define RTMP_LIB_VERSION 0x020205 /* 2.2e */ +#define RTMP_LIB_VERSION 0x020206 /* 2.2f */ #define RTMP_FEATURE_HTTP 0x01 #define RTMP_FEATURE_ENC 0x02

1 0

r510 - in trunk/librtmp: rtmp.c rtmp.h
by hyc 17 Jun '10

17 Jun '10

Author: hyc Date: Thu Jun 17 20:38:04 2010 New Revision: 510 Log: Add RTMP_Socket(), RTMP_Pause(). Addresses the last remaining direct references into RTMP struct from ffmpeg, should be able to write version-independent apps now. Modified: trunk/librtmp/rtmp.c trunk/librtmp/rtmp.h Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Sun Jun 6 09:17:29 2010 (r509) +++ trunk/librtmp/rtmp.c Thu Jun 17 20:38:04 2010 (r510) @@ -279,6 +279,12 @@ RTMP_IsConnected(RTMP *r) } int +RTMP_Socket(RTMP *r) +{ + return r->m_sb.sb_socket; +} + +int RTMP_IsTimedout(RTMP *r) { return r->m_sb.sb_timedout; @@ -1779,6 +1785,13 @@ RTMP_SendPause(RTMP *r, int DoPause, int return RTMP_SendPacket(r, &packet, TRUE); } +int RTMP_Pause(RTMP *r, int DoPause) +{ + if (DoPause) + r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; + return RTMP_SendPause(r, DoPause, r->m_pauseStamp); +} + SAVC(seek); int Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Sun Jun 6 09:17:29 2010 (r509) +++ trunk/librtmp/rtmp.h Thu Jun 17 20:38:04 2010 (r510) @@ -289,6 +289,7 @@ extern "C" int RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue); int RTMP_SendChunk(RTMP *r, RTMPChunk *chunk); int RTMP_IsConnected(RTMP *r); + int RTMP_Socket(RTMP *r); int RTMP_IsTimedout(RTMP *r); double RTMP_GetDuration(RTMP *r); int RTMP_ToggleStream(RTMP *r); @@ -310,7 +311,13 @@ extern "C" int RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime); + + /* caller probably doesn't know current timestamp, should + * just use RTMP_Pause instead + */ int RTMP_SendPause(RTMP *r, int DoPause, int dTime); + int RTMP_Pause(RTMP *r, int DoPause); + int RTMP_FindFirstMatchingProperty(AMFObject *obj, const AVal *name, AMFObjectProperty * p);

1 0

Build a shared library for librtmp
by Arne Morten Kvarving 17 Jun '10

17 Jun '10

hi, i'm currently working on integrating librtmp into xbmc (http://www.xbmc.org) based on the patches from highlandsun. since we're somewhat a high profile target, and want to cover our arses, i'm writing it using a dlopen() approach to allow for drop-in support. this means i need a shared library built, currently your build system only builds a static one. from the looks of it the easiest spot to add this is in the rtmpdump/ directory, since we already have the defines for the lib deps etc. however, it feels kinda bad. how should i proceed? i have a simple patch to do it in the rtmpdump dir, but feels wrong.. spiff

2 1

Multiple streams over a single RTMP connection with librtmp
by Philippe Sultan 17 Jun '10

17 Jun '10

Hi, I'd like to know whether it's possible to establish multiple streams using one instance of an RTMP structure. I'm in the process of programming an RTMP client for a VoIP application (Asterisk), and what I'd like to is : - establish an RTMP connection - play a live file identified by a name (playpath) and stream id - publish a live file identified by another name and stream id Looking at the code, it looks like I have to establish two RTMP sockets to the server, one for the played stream, the other for the stream to publish. I might be wrong however, if so, can you give me some pointer on how to achieve this with librtmp? Thanks a lot, librtmp is really great! Philippe

2 1

How to setup mingw
by Studio811 Headquarter 12 Jun '10

12 Jun '10

Is there a tutorial or something else how to setup mingw to compile rtmpdump for windows? Thanks for your help

2 1

Error when running rtmpsuck
by Michael Pogue 08 Jun '10

08 Jun '10

ERROR: startStreaming, TCP bind failed for port number: 1935 ERROR: Failed to start RTMP server, exiting! compiled from latest svn 2.2e (no problems) created user rtmpsuck redirected output with the following: iptables -t nat -A OUTPUT -p tcp --dport 1935 -m owner \! --uid-owner rtmpsuck -j REDIRECT (as root) switched to user rtmpsuck cd /usr/local/sbin ran rtmpsuck -z got error HELP?

2 1

r509 - trunk/rtmpsrv.c
by hyc 06 Jun '10

06 Jun '10

Author: hyc Date: Sun Jun 6 09:17:29 2010 New Revision: 509 Log: Always use .flv extension for output Modified: trunk/rtmpsrv.c Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Thu Jun 3 19:03:37 2010 (r508) +++ trunk/rtmpsrv.c Sun Jun 6 09:17:29 2010 (r509) @@ -687,9 +687,13 @@ ServeInvoke(STREAMING_SERVER *server, RT /* Add extension if none present */ if (file[av.av_len - 4] != '.') { - strcpy(file+av.av_len, ".flv"); av.av_len += 4; } + /* Always use flv extension, regardless of original */ + if (strcmp(file+av.av_len-4, ".flv")) + { + strcpy(file+av.av_len-4, ".flv"); + } argv[argc].av_val = ptr + 1; argv[argc++].av_len = 2; argv[argc].av_val = file;

1 0

rtmpt
by double 04 Jun '10

04 Jun '10

Hello, Is "rtmpt" a different protocol? Like: rtmpt://64.237.44.170:80/vid_pro/mp4:0000034/G9BDFX08M.mp4 If yes, is there a chance to download the stream via rtmpdump? Thanks a lot! Marcus

2 2

r508 - in trunk: rtmpdump.1.html rtmpgw.8.html
by hyc 03 Jun '10

03 Jun '10

Author: hyc Date: Thu Jun 3 19:03:37 2010 New Revision: 508 Log: Regenerate Modified: trunk/rtmpdump.1.html trunk/rtmpgw.8.html Modified: trunk/rtmpdump.1.html ============================================================================== --- trunk/rtmpdump.1.html Thu Jun 3 19:02:11 2010 (r507) +++ trunk/rtmpdump.1.html Thu Jun 3 19:03:37 2010 (r508) @@ -179,7 +179,7 @@ prefixing the type with 'N' and specifyi NB:myFlag:1. This option may be used multiple times to construct arbitrary AMF sequences. E.g. <pre> - -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NS:flag:ok -C O:0 + −C B:1 −C S:authMe −C O:1 −C NN:code:1.23 −C NS:flag:ok −C O:0 </pre> </dl> </ul> Modified: trunk/rtmpgw.8.html ============================================================================== --- trunk/rtmpgw.8.html Thu Jun 3 19:02:11 2010 (r507) +++ trunk/rtmpgw.8.html Thu Jun 3 19:03:37 2010 (r508) @@ -175,7 +175,7 @@ prefixing the type with 'N' and specifyi NB:myFlag:1. This option may be used multiple times to construct arbitrary AMF sequences. E.g. <pre> - -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NS:flag:ok -C O:0 + −C B:1 −C S:authMe −C O:1 −C NN:code:1.23 −C NS:flag:ok −C O:0 </pre> </dl> </ul> @@ -349,7 +349,7 @@ is equivalent to the <a href="../man1/rtrmpdump.1">rtrmpdump</a>(1) invocation <pre> - rtmpdump -r rtmp://server/myapp -y somefile + rtmpdump −r rtmp://server/myapp −y somefile </pre> Note that only the shortform (single letter) options are supported.

1 0

r507 - in trunk: rtmpdump.1 rtmpgw.8 rtmpgw.c
by hyc 03 Jun '10

03 Jun '10

Author: hyc Date: Thu Jun 3 19:02:11 2010 New Revision: 507 Log: formatting/typos Modified: trunk/rtmpdump.1 trunk/rtmpgw.8 trunk/rtmpgw.c Modified: trunk/rtmpdump.1 ============================================================================== --- trunk/rtmpdump.1 Thu Jun 3 18:59:46 2010 (r506) +++ trunk/rtmpdump.1 Thu Jun 3 19:02:11 2010 (r507) @@ -153,7 +153,7 @@ prefixing the type with 'N' and specifyi NB:myFlag:1. This option may be used multiple times to construct arbitrary AMF sequences. E.g. .nf - -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NS:flag:ok -C O:0 + \-C B:1 \-C S:authMe \-C O:1 \-C NN:code:1.23 \-C NS:flag:ok \-C O:0 .fi .SS "Session Parameters" These options take effect after the Connect request has succeeded. Modified: trunk/rtmpgw.8 ============================================================================== --- trunk/rtmpgw.8 Thu Jun 3 18:59:46 2010 (r506) +++ trunk/rtmpgw.8 Thu Jun 3 19:02:11 2010 (r507) @@ -149,7 +149,7 @@ prefixing the type with 'N' and specifyi NB:myFlag:1. This option may be used multiple times to construct arbitrary AMF sequences. E.g. .nf - -C B:1 -C S:authMe -C O:1 -C NN:code:1.23 -C NS:flag:ok -C O:0 + \-C B:1 \-C S:authMe \-C O:1 \-C NN:code:1.23 \-C NS:flag:ok \-C O:0 .fi .SS "Session Parameters" These options take effect after the Connect request has succeeded. @@ -260,7 +260,7 @@ is equivalent to the .BR rtrmpdump (1) invocation .nf - rtmpdump -r rtmp://server/myapp -y somefile + rtmpdump \-r rtmp://server/myapp \-y somefile .fi Note that only the shortform (single letter) options are supported. Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Thu Jun 3 18:59:46 2010 (r506) +++ trunk/rtmpgw.c Thu Jun 3 19:02:11 2010 (r507) @@ -1085,7 +1085,7 @@ main(int argc, char **argv) RTMP_LogPrintf ("--live|-v Get a live stream, no --resume (seeking) of live streams possible\n"); RTMP_LogPrintf - ("--subscribe|-d string Stream name to subscribe to (otherwise defaults to playpath if live is specifed)\n"); + ("--subscribe|-d string Stream name to subscribe to (otherwise defaults to playpath if live is specified)\n"); RTMP_LogPrintf ("--timeout|-m num Timeout connection num seconds (default: %lu)\n", defaultRTMPRequest.timeout);

1 0

r506 - trunk/README
by hyc 03 Jun '10

03 Jun '10

Author: hyc Date: Thu Jun 3 18:59:46 2010 New Revision: 506 Log: Note librtmp is LGPL Modified: trunk/README Modified: trunk/README ============================================================================== --- trunk/README Thu Jun 3 18:50:30 2010 (r505) +++ trunk/README Thu Jun 3 18:59:46 2010 (r506) @@ -3,6 +3,7 @@ RTMP Dump v2.2e (C) 2009-2010 Howard Chu (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 License: GPLv2 +librtmp license: LGPLv2.1 http://rtmpdump.mplayerhq.hu/ To compile type "make" with SYS=<platform name>, e.g.

1 0

r505 - in trunk: librtmp/amf.c librtmp/amf.h librtmp/bytes.h librtmp/dh.h librtmp/dhgroups.h librtmp/handshake.h librtmp/hashswf.c librtmp/http.h librtmp/log.c librtmp/log.h librtmp/parseurl.c libr...
by hyc 03 Jun '10

03 Jun '10

Author: hyc Date: Thu Jun 3 18:50:30 2010 New Revision: 505 Log: Update FSF address in license notice Modified: trunk/librtmp/amf.c trunk/librtmp/amf.h trunk/librtmp/bytes.h trunk/librtmp/dh.h trunk/librtmp/dhgroups.h trunk/librtmp/handshake.h trunk/librtmp/hashswf.c trunk/librtmp/http.h trunk/librtmp/log.c trunk/librtmp/log.h trunk/librtmp/parseurl.c trunk/librtmp/rtmp.c trunk/librtmp/rtmp.h trunk/librtmp/rtmp_sys.h trunk/rtmpdump.c trunk/rtmpgw.c trunk/rtmpsrv.c trunk/rtmpsuck.c trunk/thread.c trunk/thread.h Modified: trunk/librtmp/amf.c ============================================================================== --- trunk/librtmp/amf.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/amf.c Thu Jun 3 18:50:30 2010 (r505) @@ -18,7 +18,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/amf.h ============================================================================== --- trunk/librtmp/amf.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/amf.h Thu Jun 3 18:50:30 2010 (r505) @@ -20,7 +20,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/bytes.h ============================================================================== --- trunk/librtmp/bytes.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/bytes.h Thu Jun 3 18:50:30 2010 (r505) @@ -18,7 +18,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/dh.h ============================================================================== --- trunk/librtmp/dh.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/dh.h Thu Jun 3 18:50:30 2010 (r505) @@ -16,7 +16,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/dhgroups.h ============================================================================== --- trunk/librtmp/dhgroups.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/dhgroups.h Thu Jun 3 18:50:30 2010 (r505) @@ -15,7 +15,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/handshake.h Thu Jun 3 18:50:30 2010 (r505) @@ -17,7 +17,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/hashswf.c ============================================================================== --- trunk/librtmp/hashswf.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/hashswf.c Thu Jun 3 18:50:30 2010 (r505) @@ -15,7 +15,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/http.h ============================================================================== --- trunk/librtmp/http.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/http.h Thu Jun 3 18:50:30 2010 (r505) @@ -18,7 +18,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/log.c ============================================================================== --- trunk/librtmp/log.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/log.c Thu Jun 3 18:50:30 2010 (r505) @@ -16,7 +16,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/log.h ============================================================================== --- trunk/librtmp/log.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/log.h Thu Jun 3 18:50:30 2010 (r505) @@ -16,7 +16,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/parseurl.c ============================================================================== --- trunk/librtmp/parseurl.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/parseurl.c Thu Jun 3 18:50:30 2010 (r505) @@ -16,7 +16,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/rtmp.c Thu Jun 3 18:50:30 2010 (r505) @@ -18,7 +18,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/rtmp.h Thu Jun 3 18:50:30 2010 (r505) @@ -20,7 +20,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/librtmp/rtmp_sys.h ============================================================================== --- trunk/librtmp/rtmp_sys.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/librtmp/rtmp_sys.h Thu Jun 3 18:50:30 2010 (r505) @@ -17,7 +17,8 @@ * * 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. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/lgpl.html */ Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/rtmpdump.c Thu Jun 3 18:50:30 2010 (r505) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */ Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/rtmpgw.c Thu Jun 3 18:50:30 2010 (r505) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */ Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/rtmpsrv.c Thu Jun 3 18:50:30 2010 (r505) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */ Modified: trunk/rtmpsuck.c ============================================================================== --- trunk/rtmpsuck.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/rtmpsuck.c Thu Jun 3 18:50:30 2010 (r505) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */ Modified: trunk/thread.c ============================================================================== --- trunk/thread.c Wed Jun 2 23:12:19 2010 (r504) +++ trunk/thread.c Thu Jun 3 18:50:30 2010 (r505) @@ -13,7 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */ Modified: trunk/thread.h ============================================================================== --- trunk/thread.h Wed Jun 2 23:12:19 2010 (r504) +++ trunk/thread.h Thu Jun 3 18:50:30 2010 (r505) @@ -13,7 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with RTMPDump; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * */

1 0

r504 - in trunk/librtmp: amf.h rtmp_sys.h
by hyc 02 Jun '10

02 Jun '10

Author: hyc Date: Wed Jun 2 23:12:19 2010 New Revision: 504 Log: move TRUE/FALSE defs to public header, just in case Modified: trunk/librtmp/amf.h trunk/librtmp/rtmp_sys.h Modified: trunk/librtmp/amf.h ============================================================================== --- trunk/librtmp/amf.h Wed Jun 2 18:52:55 2010 (r503) +++ trunk/librtmp/amf.h Wed Jun 2 23:12:19 2010 (r504) @@ -26,6 +26,11 @@ #include <stdint.h> +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 +#endif + #ifdef __cplusplus extern "C" { Modified: trunk/librtmp/rtmp_sys.h ============================================================================== --- trunk/librtmp/rtmp_sys.h Wed Jun 2 18:52:55 2010 (r503) +++ trunk/librtmp/rtmp_sys.h Wed Jun 2 23:12:19 2010 (r504) @@ -60,12 +60,6 @@ #define SET_RCVTIMEO(tv,s) struct timeval tv = {s,0} #endif -/* macros for people who don't understand C */ -#undef TRUE -#undef FALSE -#define TRUE 1 -#define FALSE 0 - #include "rtmp.h" #ifdef USE_POLARSSL

1 0

Rtmpdump just stream metadata / Solaris
by Mateusz Pawlowski 02 Jun '10

02 Jun '10

Hi, I am looking into using rtmpdump to fetch stream metadata for monitoring purposes. We are planning on using it on Solaris 10 Little bit of fiddling with Makefile allowed me to compile it : The CFLAGS needs -std=c99 as compiler stops when including sdtbool. The LDFLAGS needs -lnsl -lsocket to link the network libs Now, as haven't touched C code in ages. I'm a bit struggling to modify rtmpdump enough to get it list the metadata and then stop the stream ( as we have no need for anything more ). So would it be possible if you could help me and point me how to modify the code or if you are feeling generous add another command switch ( like --metadataonly ) and have it print only that. And I don't even dare to think that you could implement Nagios Check Plug-in exit codes ... which would be amazing! -- Mateusz Pawlowski | Delivery Specialist World Service Future Media, Digital Delivery Team - Part of BBC Global News Division * http://www.bbcworldservice.com/ * 500NE Bush House, Strand, London, WC2B 4PH * 02 71014 (internal) * +44 20 7557 1014 (external) * mateusz.pawlowski(a)bbc.co.uk http://www.bbc.co.uk/ This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this.

3 3

r503 - in trunk: librtmp/amf.c librtmp/amf.h librtmp/dh.h librtmp/handshake.h librtmp/hashswf.c librtmp/parseurl.c librtmp/rtmp.c librtmp/rtmp.h librtmp/rtmp_sys.h rtmpdump.c rtmpgw.c rtmpsrv.c rtm...
by hyc 02 Jun '10

02 Jun '10

Author: hyc Date: Wed Jun 2 18:52:55 2010 New Revision: 503 Log: Kill all use of bool, just use int Modified: trunk/librtmp/amf.c trunk/librtmp/amf.h trunk/librtmp/dh.h trunk/librtmp/handshake.h trunk/librtmp/hashswf.c trunk/librtmp/parseurl.c trunk/librtmp/rtmp.c trunk/librtmp/rtmp.h trunk/librtmp/rtmp_sys.h trunk/rtmpdump.c trunk/rtmpgw.c trunk/rtmpsrv.c trunk/rtmpsuck.c Modified: trunk/librtmp/amf.c ============================================================================== --- trunk/librtmp/amf.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/amf.c Wed Jun 2 18:52:55 2010 (r503) @@ -126,7 +126,7 @@ AMF_DecodeNumber(const char *data) return dVal; } -bool +int AMF_DecodeBoolean(const char *data) { return *data != 0; @@ -255,7 +255,7 @@ AMF_EncodeNumber(char *output, char *out } char * -AMF_EncodeBoolean(char *output, char *outend, bool bVal) +AMF_EncodeBoolean(char *output, char *outend, int bVal) { if (output+2 > outend) return NULL; @@ -294,7 +294,7 @@ AMF_EncodeNamedNumber(char *output, char } char * -AMF_EncodeNamedBoolean(char *output, char *outend, const AVal *strName, bool bVal) +AMF_EncodeNamedBoolean(char *output, char *outend, const AVal *strName, int bVal) { if (output+2+strName->av_len > outend) return NULL; @@ -330,7 +330,7 @@ AMFProp_GetNumber(AMFObjectProperty *pro return prop->p_vu.p_number; } -bool +int AMFProp_GetBoolean(AMFObjectProperty *prop) { return prop->p_vu.p_number != 0; @@ -348,7 +348,7 @@ AMFProp_GetObject(AMFObjectProperty *pro *obj = prop->p_vu.p_object; } -bool +int AMFProp_IsValid(AMFObjectProperty *prop) { return prop->p_type != AMF_INVALID; @@ -478,7 +478,7 @@ AMF3ReadString(const char *data, AVal *s int AMF3Prop_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize, - bool bDecodeName) + int bDecodeName) { int nOriginalSize = nSize; AMF3DataType type; @@ -575,7 +575,7 @@ AMF3Prop_Decode(AMFObjectProperty *prop, } case AMF3_OBJECT: { - int nRes = AMF3_Decode(&prop->p_vu.p_object, pBuffer, nSize, true); + int nRes = AMF3_Decode(&prop->p_vu.p_object, pBuffer, nSize, TRUE); if (nRes == -1) return -1; nSize -= nRes; @@ -595,7 +595,7 @@ AMF3Prop_Decode(AMFObjectProperty *prop, int AMFProp_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize, - bool bDecodeName) + int bDecodeName) { int nOriginalSize = nSize; int nRes; @@ -667,7 +667,7 @@ AMFProp_Decode(AMFObjectProperty *prop, } case AMF_OBJECT: { - int nRes = AMF_Decode(&prop->p_vu.p_object, pBuffer, nSize, true); + int nRes = AMF_Decode(&prop->p_vu.p_object, pBuffer, nSize, TRUE); if (nRes == -1) return -1; nSize -= nRes; @@ -695,7 +695,7 @@ AMFProp_Decode(AMFObjectProperty *prop, nSize -= 4; /* next comes the rest, mixed array has a final 0x000009 mark and names, so its an object */ - nRes = AMF_Decode(&prop->p_vu.p_object, pBuffer + 4, nSize, true); + nRes = AMF_Decode(&prop->p_vu.p_object, pBuffer + 4, nSize, TRUE); if (nRes == -1) return -1; nSize -= nRes; @@ -713,7 +713,7 @@ AMFProp_Decode(AMFObjectProperty *prop, nSize -= 4; nRes = AMF_DecodeArray(&prop->p_vu.p_object, pBuffer + 4, nSize, - nArrayLen, false); + nArrayLen, FALSE); if (nRes == -1) return -1; nSize -= nRes; @@ -763,7 +763,7 @@ AMFProp_Decode(AMFObjectProperty *prop, } case AMF_AVMPLUS: { - int nRes = AMF3_Decode(&prop->p_vu.p_object, pBuffer, nSize, true); + int nRes = AMF3_Decode(&prop->p_vu.p_object, pBuffer, nSize, TRUE); if (nRes == -1) return -1; nSize -= nRes; @@ -893,10 +893,10 @@ AMF_Encode(AMFObject *obj, char *pBuffer int AMF_DecodeArray(AMFObject *obj, const char *pBuffer, int nSize, - int nArrayLen, bool bDecodeName) + int nArrayLen, int bDecodeName) { int nOriginalSize = nSize; - bool bError = false; + int bError = FALSE; obj->o_num = 0; obj->o_props = NULL; @@ -908,7 +908,7 @@ AMF_DecodeArray(AMFObject *obj, const ch nRes = AMFProp_Decode(&prop, pBuffer, nSize, bDecodeName); if (nRes == -1) - bError = true; + bError = TRUE; else { nSize -= nRes; @@ -923,7 +923,7 @@ AMF_DecodeArray(AMFObject *obj, const ch } int -AMF3_Decode(AMFObject *obj, const char *pBuffer, int nSize, bool bAMFData) +AMF3_Decode(AMFObject *obj, const char *pBuffer, int nSize, int bAMFData) { int nOriginalSize = nSize; int32_t ref; @@ -1007,7 +1007,7 @@ AMF3_Decode(AMFObject *obj, const char * RTMP_Log(RTMP_LOGDEBUG, "Externalizable, TODO check"); - nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, false); + nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, FALSE); if (nRes == -1) RTMP_Log(RTMP_LOGDEBUG, "%s, failed to decode AMF3 property!", __FUNCTION__); @@ -1025,7 +1025,7 @@ AMF3_Decode(AMFObject *obj, const char * int nRes, i; for (i = 0; i < cd.cd_num; i++) /* non-dynamic */ { - nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, false); + nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, FALSE); if (nRes == -1) RTMP_Log(RTMP_LOGDEBUG, "%s, failed to decode AMF3 property!", __FUNCTION__); @@ -1042,7 +1042,7 @@ AMF3_Decode(AMFObject *obj, const char * do { - nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, true); + nRes = AMF3Prop_Decode(&prop, pBuffer, nSize, TRUE); AMF_AddProp(obj, &prop); pBuffer += nRes; @@ -1059,10 +1059,10 @@ AMF3_Decode(AMFObject *obj, const char * } int -AMF_Decode(AMFObject *obj, const char *pBuffer, int nSize, bool bDecodeName) +AMF_Decode(AMFObject *obj, const char *pBuffer, int nSize, int bDecodeName) { int nOriginalSize = nSize; - bool bError = false; /* if there is an error while decoding - try to at least find the end mark AMF_OBJECT_END */ + int bError = FALSE; /* if there is an error while decoding - try to at least find the end mark AMF_OBJECT_END */ obj->o_num = 0; obj->o_props = NULL; @@ -1074,7 +1074,7 @@ AMF_Decode(AMFObject *obj, const char *p if (nSize >=3 && AMF_DecodeInt24(pBuffer) == AMF_OBJECT_END) { nSize -= 3; - bError = false; + bError = FALSE; break; } @@ -1089,7 +1089,7 @@ AMF_Decode(AMFObject *obj, const char *p nRes = AMFProp_Decode(&prop, pBuffer, nSize, bDecodeName); if (nRes == -1) - bError = true; + bError = TRUE; else { nSize -= nRes; Modified: trunk/librtmp/amf.h ============================================================================== --- trunk/librtmp/amf.h Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/amf.h Wed Jun 2 18:52:55 2010 (r503) @@ -26,19 +26,6 @@ #include <stdint.h> -#ifdef _XBOX - -#ifndef __cplusplus -#define bool _Bool -typedef unsigned char _Bool; -#define false 0 -#define true 1 -#endif - -#else -#include <stdbool.h> -#endif - #ifdef __cplusplus extern "C" { @@ -95,28 +82,28 @@ extern "C" char *AMF_EncodeInt16(char *output, char *outend, short nVal); char *AMF_EncodeInt24(char *output, char *outend, int nVal); char *AMF_EncodeInt32(char *output, char *outend, int nVal); - char *AMF_EncodeBoolean(char *output, char *outend, bool bVal); + char *AMF_EncodeBoolean(char *output, char *outend, int bVal); /* Shortcuts for AMFProp_Encode */ char *AMF_EncodeNamedString(char *output, char *outend, const AVal * name, const AVal * value); char *AMF_EncodeNamedNumber(char *output, char *outend, const AVal * name, double dVal); - char *AMF_EncodeNamedBoolean(char *output, char *outend, const AVal * name, bool bVal); + char *AMF_EncodeNamedBoolean(char *output, char *outend, const AVal * name, int bVal); unsigned short AMF_DecodeInt16(const char *data); unsigned int AMF_DecodeInt24(const char *data); unsigned int AMF_DecodeInt32(const char *data); void AMF_DecodeString(const char *data, AVal * str); void AMF_DecodeLongString(const char *data, AVal * str); - bool AMF_DecodeBoolean(const char *data); + int AMF_DecodeBoolean(const char *data); double AMF_DecodeNumber(const char *data); char *AMF_Encode(AMFObject * obj, char *pBuffer, char *pBufEnd); int AMF_Decode(AMFObject * obj, const char *pBuffer, int nSize, - bool bDecodeName); + int bDecodeName); int AMF_DecodeArray(AMFObject * obj, const char *pBuffer, int nSize, - int nArrayLen, bool bDecodeName); + int nArrayLen, int bDecodeName); int AMF3_Decode(AMFObject * obj, const char *pBuffer, int nSize, - bool bDecodeName); + int bDecodeName); void AMF_Dump(AMFObject * obj); void AMF_Reset(AMFObject * obj); @@ -127,24 +114,24 @@ extern "C" AMFDataType AMFProp_GetType(AMFObjectProperty * prop); void AMFProp_SetNumber(AMFObjectProperty * prop, double dval); - void AMFProp_SetBoolean(AMFObjectProperty * prop, bool bflag); + void AMFProp_SetBoolean(AMFObjectProperty * prop, int bflag); void AMFProp_SetString(AMFObjectProperty * prop, AVal * str); void AMFProp_SetObject(AMFObjectProperty * prop, AMFObject * obj); void AMFProp_GetName(AMFObjectProperty * prop, AVal * name); void AMFProp_SetName(AMFObjectProperty * prop, AVal * name); double AMFProp_GetNumber(AMFObjectProperty * prop); - bool AMFProp_GetBoolean(AMFObjectProperty * prop); + int AMFProp_GetBoolean(AMFObjectProperty * prop); void AMFProp_GetString(AMFObjectProperty * prop, AVal * str); void AMFProp_GetObject(AMFObjectProperty * prop, AMFObject * obj); - bool AMFProp_IsValid(AMFObjectProperty * prop); + int AMFProp_IsValid(AMFObjectProperty * prop); char *AMFProp_Encode(AMFObjectProperty * prop, char *pBuffer, char *pBufEnd); int AMF3Prop_Decode(AMFObjectProperty * prop, const char *pBuffer, - int nSize, bool bDecodeName); + int nSize, int bDecodeName); int AMFProp_Decode(AMFObjectProperty * prop, const char *pBuffer, - int nSize, bool bDecodeName); + int nSize, int bDecodeName); void AMFProp_Dump(AMFObjectProperty * prop); void AMFProp_Reset(AMFObjectProperty * prop); Modified: trunk/librtmp/dh.h ============================================================================== --- trunk/librtmp/dh.h Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/dh.h Wed Jun 2 18:52:55 2010 (r503) @@ -150,10 +150,10 @@ typedef BIGNUM * MP_t; #include "dhgroups.h" /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */ -static bool +static int isValidPublicKey(MP_t y, MP_t p, MP_t q) { - int ret = true; + int ret = TRUE; MP_t bn; assert(y); @@ -165,7 +165,7 @@ isValidPublicKey(MP_t y, MP_t p, MP_t q) if (MP_cmp(y, bn) < 0) { RTMP_Log(RTMP_LOGERROR, "DH public key must be at least 2"); - ret = false; + ret = FALSE; goto failed; } @@ -175,7 +175,7 @@ isValidPublicKey(MP_t y, MP_t p, MP_t q) if (MP_cmp(y, bn) > 0) { RTMP_Log(RTMP_LOGERROR, "DH public key must be at most p-2"); - ret = false; + ret = FALSE; goto failed; } Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/handshake.h Wed Jun 2 18:52:55 2010 (r503) @@ -286,7 +286,7 @@ CalculateDigest(unsigned int digestPos, HMACsha256(message, messageLen, key, keyLen, digest); } -static bool +static int VerifyDigest(unsigned int digestPos, uint8_t *handshakeMessage, const uint8_t *key, size_t keyLen) { @@ -357,13 +357,13 @@ static void rtmpe8_sig(uint8_t *in, uint out[7] = v1; } -static bool -HandShake(RTMP * r, bool FP9HandShake) +static int +HandShake(RTMP * r, int FP9HandShake) { int i, offalg = 0; int dhposClient = 0; int digestPosClient = 0; - bool encrypted = r->Link.protocol & RTMP_FEATURE_ENC; + int encrypted = r->Link.protocol & RTMP_FEATURE_ENC; RC4_handle keyIn = 0; RC4_handle keyOut = 0; @@ -377,9 +377,9 @@ HandShake(RTMP * r, bool FP9HandShake) getoff *getdh = NULL, *getdig = NULL; if (encrypted || r->Link.SWFSize) - FP9HandShake = true; + FP9HandShake = TRUE; else - FP9HandShake = false; + FP9HandShake = FALSE; r->Link.rc4keyIn = r->Link.rc4keyOut = 0; @@ -439,7 +439,7 @@ HandShake(RTMP * r, bool FP9HandShake) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't initialize Diffie-Hellmann!", __FUNCTION__); - return false; + return FALSE; } dhposClient = getdh(clientsig, RTMP_SIG_SIZE); @@ -449,13 +449,13 @@ HandShake(RTMP * r, bool FP9HandShake) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't generate Diffie-Hellmann public key!", __FUNCTION__); - return false; + return FALSE; } if (!DHGetPublicKey(r->Link.dh, &clientsig[dhposClient], 128)) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't write public key!", __FUNCTION__); - return false; + return FALSE; } } @@ -477,10 +477,10 @@ HandShake(RTMP * r, bool FP9HandShake) #endif if (!WriteN(r, (char *)clientsig-1, RTMP_SIG_SIZE + 1)) - return false; + return FALSE; if (ReadN(r, (char *)&type, 1) != 1) /* 0x03 or 0x06 */ - return false; + return FALSE; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Answer : %02X", __FUNCTION__, type); @@ -489,7 +489,7 @@ HandShake(RTMP * r, bool FP9HandShake) __FUNCTION__, clientsig[-1], type); if (ReadN(r, (char *)serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; /* decode server response */ memcpy(&uptime, serversig, 4); @@ -500,7 +500,7 @@ HandShake(RTMP * r, bool FP9HandShake) serversig[5], serversig[6], serversig[7]); if (FP9HandShake && type == 3 && !serversig[4]) - FP9HandShake = false; + FP9HandShake = FALSE; #ifdef _DEBUG RTMP_Log(RTMP_LOGDEBUG, "Server signature:"); @@ -526,7 +526,7 @@ HandShake(RTMP * r, bool FP9HandShake) if (!VerifyDigest(digestPosServer, serversig, GenuineFMSKey, 36)) { RTMP_Log(RTMP_LOGERROR, "Couldn't verify the server digest"); /* continuing anyway will probably fail */ - return false; + return FALSE; } } @@ -560,7 +560,7 @@ HandShake(RTMP * r, bool FP9HandShake) if (len < 0) { RTMP_Log(RTMP_LOGDEBUG, "%s: Wrong secret key position!", __FUNCTION__); - return false; + return FALSE; } RTMP_Log(RTMP_LOGDEBUG, "%s: Secret key: ", __FUNCTION__); @@ -633,11 +633,11 @@ HandShake(RTMP * r, bool FP9HandShake) RTMP_LogHex(RTMP_LOGDEBUG, reply, RTMP_SIG_SIZE); #endif if (!WriteN(r, (char *)reply, RTMP_SIG_SIZE)) - return false; + return FALSE; /* 2nd part of handshake */ if (ReadN(r, (char *)serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; #ifdef _DEBUG RTMP_Log(RTMP_LOGDEBUG, "%s: 2nd handshake: ", __FUNCTION__); @@ -697,7 +697,7 @@ HandShake(RTMP * r, bool FP9HandShake) SHA256_DIGEST_LENGTH) != 0) { RTMP_Log(RTMP_LOGWARNING, "%s: Server not genuine Adobe!", __FUNCTION__); - return false; + return FALSE; } else { @@ -734,10 +734,10 @@ HandShake(RTMP * r, bool FP9HandShake) } RTMP_Log(RTMP_LOGDEBUG, "%s: Handshaking finished....", __FUNCTION__); - return true; + return TRUE; } -static bool +static int SHandShake(RTMP * r) { int i, offalg = 0; @@ -745,8 +745,8 @@ SHandShake(RTMP * r) int digestPosServer = 0; RC4_handle keyIn = 0; RC4_handle keyOut = 0; - bool FP9HandShake = false; - bool encrypted; + int FP9HandShake = FALSE; + int encrypted; int32_t *ip; uint8_t clientsig[RTMP_SIG_SIZE]; @@ -756,23 +756,23 @@ SHandShake(RTMP * r) getoff *getdh = NULL, *getdig = NULL; if (ReadN(r, (char *)&type, 1) != 1) /* 0x03 or 0x06 */ - return false; + return FALSE; if (ReadN(r, (char *)clientsig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Requested : %02X", __FUNCTION__, type); RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (type == 3) { - encrypted = false; + encrypted = FALSE; } else if (type == 6 || type == 8) { offalg = 1; - encrypted = true; - FP9HandShake = true; + encrypted = TRUE; + FP9HandShake = TRUE; r->Link.protocol |= RTMP_FEATURE_ENC; /* use FP10 if client is capable */ if (clientsig[4] == 128) @@ -782,11 +782,11 @@ SHandShake(RTMP * r) { RTMP_Log(RTMP_LOGERROR, "%s: Unknown version %02x", __FUNCTION__, type); - return false; + return FALSE; } if (!FP9HandShake && clientsig[4]) - FP9HandShake = true; + FP9HandShake = TRUE; serversig[-1] = type; @@ -831,7 +831,7 @@ SHandShake(RTMP * r) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't initialize Diffie-Hellmann!", __FUNCTION__); - return false; + return FALSE; } dhposServer = getdh(serversig, RTMP_SIG_SIZE); @@ -841,14 +841,14 @@ SHandShake(RTMP * r) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't generate Diffie-Hellmann public key!", __FUNCTION__); - return false; + return FALSE; } if (!DHGetPublicKey (r->Link.dh, (uint8_t *) &serversig[dhposServer], 128)) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't write public key!", __FUNCTION__); - return false; + return FALSE; } } @@ -868,7 +868,7 @@ SHandShake(RTMP * r) RTMP_LogHex(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE); if (!WriteN(r, (char *)serversig-1, RTMP_SIG_SIZE + 1)) - return false; + return FALSE; /* decode client response */ memcpy(&uptime, clientsig, 4); @@ -898,7 +898,7 @@ SHandShake(RTMP * r) if (!VerifyDigest(digestPosClient, clientsig, GenuineFPKey, 30)) { RTMP_Log(RTMP_LOGERROR, "Couldn't verify the client digest"); /* continuing anyway will probably fail */ - return false; + return FALSE; } } @@ -934,7 +934,7 @@ SHandShake(RTMP * r) if (len < 0) { RTMP_Log(RTMP_LOGDEBUG, "%s: Wrong secret key position!", __FUNCTION__); - return false; + return FALSE; } RTMP_Log(RTMP_LOGDEBUG, "%s: Secret key: ", __FUNCTION__); @@ -997,11 +997,11 @@ SHandShake(RTMP * r) RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); if (!WriteN(r, (char *)clientsig, RTMP_SIG_SIZE)) - return false; + return FALSE; /* 2nd part of handshake */ if (ReadN(r, (char *)clientsig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; RTMP_Log(RTMP_LOGDEBUG2, "%s: 2nd handshake: ", __FUNCTION__); RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE); @@ -1052,7 +1052,7 @@ SHandShake(RTMP * r) SHA256_DIGEST_LENGTH) != 0) { RTMP_Log(RTMP_LOGWARNING, "%s: Client not genuine Adobe!", __FUNCTION__); - return false; + return FALSE; } else { @@ -1088,5 +1088,5 @@ SHandShake(RTMP * r) } RTMP_Log(RTMP_LOGDEBUG, "%s: Handshaking finished....", __FUNCTION__); - return true; + return TRUE; } Modified: trunk/librtmp/hashswf.c ============================================================================== --- trunk/librtmp/hashswf.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/hashswf.c Wed Jun 2 18:52:55 2010 (r503) @@ -186,7 +186,7 @@ HTTP_get(struct HTTP_ctx *http, const ch } sb.sb_size = 0; - sb.sb_timedout = false; + sb.sb_timedout = FALSE; if (RTMPSockBuf_Fill(&sb) < 1) { ret = HTTPRES_LOST_CONNECTION; Modified: trunk/librtmp/parseurl.c ============================================================================== --- trunk/librtmp/parseurl.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/parseurl.c Wed Jun 2 18:52:55 2010 (r503) @@ -29,7 +29,7 @@ #include "rtmp_sys.h" #include "log.h" -bool RTMP_ParseURL(const char *url, int *protocol, AVal *host, unsigned int *port, +int RTMP_ParseURL(const char *url, int *protocol, AVal *host, unsigned int *port, AVal *playpath, AVal *app) { char *p, *end, *col, *ques, *slash; @@ -49,7 +49,7 @@ bool RTMP_ParseURL(const char *url, int p = strstr(url, "://"); if(!p) { RTMP_Log(RTMP_LOGERROR, "RTMP URL: No :// in url!"); - return false; + return FALSE; } { int len = (int)(p-url); @@ -83,7 +83,7 @@ parsehost: /* check for sudden death */ if(*p==0) { RTMP_Log(RTMP_LOGWARNING, "No hostname in URL!"); - return false; + return FALSE; } end = p + strlen(p); @@ -125,7 +125,7 @@ parsehost: if(!slash) { RTMP_Log(RTMP_LOGWARNING, "No application or playpath in URL!"); - return true; + return TRUE; } p = slash+1; @@ -178,7 +178,7 @@ parsehost: RTMP_ParsePlaypath(&av, playpath); } - return true; + return TRUE; } /* Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/rtmp.c Wed Jun 2 18:52:55 2010 (r503) @@ -47,7 +47,7 @@ TLS_CTX RTMP_TLS_ctx; static const int packetSize[] = { 12, 8, 4, 1 }; -bool RTMP_ctrlC; +int RTMP_ctrlC; const char RTMPProtocolStrings[][7] = { "RTMP", @@ -84,24 +84,24 @@ typedef enum { RTMPT_OPEN=0, RTMPT_SEND, RTMPT_IDLE, RTMPT_CLOSE } RTMPTCmd; -static bool DumpMetaData(AMFObject *obj); -static bool HandShake(RTMP *r, bool FP9HandShake); -static bool SocksNegotiate(RTMP *r); +static int DumpMetaData(AMFObject *obj); +static int HandShake(RTMP *r, int FP9HandShake); +static int SocksNegotiate(RTMP *r); -static bool SendConnectPacket(RTMP *r, RTMPPacket *cp); -static bool SendCheckBW(RTMP *r); -static bool SendCheckBWResult(RTMP *r, double txn); -static bool SendDeleteStream(RTMP *r, double dStreamId); -static bool SendFCSubscribe(RTMP *r, AVal *subscribepath); -static bool SendPlay(RTMP *r); -static bool SendBytesReceived(RTMP *r); +static int SendConnectPacket(RTMP *r, RTMPPacket *cp); +static int SendCheckBW(RTMP *r); +static int SendCheckBWResult(RTMP *r, double txn); +static int SendDeleteStream(RTMP *r, double dStreamId); +static int SendFCSubscribe(RTMP *r, AVal *subscribepath); +static int SendPlay(RTMP *r); +static int SendBytesReceived(RTMP *r); #if 0 /* unused */ -static bool SendBGHasStream(RTMP *r, double dId, AVal *playpath); +static int SendBGHasStream(RTMP *r, double dId, AVal *playpath); #endif static int HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize); -static bool HandleMetadata(RTMP *r, char *body, unsigned int len); +static int HandleMetadata(RTMP *r, char *body, unsigned int len); static void HandleChangeChunkSize(RTMP *r, const RTMPPacket *packet); static void HandleAudio(RTMP *r, const RTMPPacket *packet); static void HandleVideo(RTMP *r, const RTMPPacket *packet); @@ -110,7 +110,7 @@ static void HandleServerBW(RTMP *r, cons static void HandleClientBW(RTMP *r, const RTMPPacket *packet); static int ReadN(RTMP *r, char *buffer, int n); -static bool WriteN(RTMP *r, const char *buffer, int n); +static int WriteN(RTMP *r, const char *buffer, int n); static void DecodeTEA(AVal *key, AVal *text); @@ -142,7 +142,7 @@ RTMP_GetTime() void RTMP_UserInterrupt() { - RTMP_ctrlC = true; + RTMP_ctrlC = TRUE; } void @@ -153,20 +153,20 @@ RTMPPacket_Reset(RTMPPacket *p) p->m_nChannel = 0; p->m_nTimeStamp = 0; p->m_nInfoField2 = 0; - p->m_hasAbsTimestamp = false; + p->m_hasAbsTimestamp = FALSE; p->m_nBodySize = 0; p->m_nBytesRead = 0; } -bool +int RTMPPacket_Alloc(RTMPPacket *p, int nSize) { char *ptr = calloc(1, nSize + RTMP_MAX_HEADER_SIZE); if (!ptr) - return false; + return FALSE; p->m_body = ptr + RTMP_MAX_HEADER_SIZE; p->m_nBytesRead = 0; - return true; + return TRUE; } void @@ -271,13 +271,13 @@ RTMP_GetDuration(RTMP *r) return r->m_fDuration; } -bool +int RTMP_IsConnected(RTMP *r) { return r->m_sb.sb_socket != -1; } -bool +int RTMP_IsTimedout(RTMP *r) { return r->m_sb.sb_timedout; @@ -329,7 +329,7 @@ RTMP_SetupStream(RTMP *r, AVal *flashVer, AVal *subscribepath, int dStart, - int dStop, bool bLiveStream, long int timeout) + int dStop, int bLiveStream, long int timeout) { RTMP_Log(RTMP_LOGDEBUG, "Protocol : %s", RTMPProtocolStrings[protocol&7]); RTMP_Log(RTMP_LOGDEBUG, "Hostname : %.*s", host->av_len, host->av_val); @@ -599,7 +599,7 @@ parseAMF(AMFObject *obj, AVal *av, int * return 0; } -bool RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg) +int RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg) { int i; void *v; @@ -629,7 +629,7 @@ bool RTMP_SetOpt(RTMP *r, const AVal *op break; case OPT_CONN: if (parseAMF(&r->Link.extras, arg, &r->Link.edepth)) - return false; + return FALSE; break; } break; @@ -637,17 +637,17 @@ bool RTMP_SetOpt(RTMP *r, const AVal *op if (!options[i].name.av_len) { RTMP_Log(RTMP_LOGERROR, "Unknown option %s", opt->av_val); RTMP_OptUsage(); - return false; + return FALSE; } - return true; + return TRUE; } -bool RTMP_SetupURL(RTMP *r, char *url) +int RTMP_SetupURL(RTMP *r, char *url) { AVal opt, arg; char *p1, *p2, *ptr = strchr(url, ' '); - bool ret; + int ret; unsigned int port = 0; if (ptr) @@ -684,7 +684,7 @@ bool RTMP_SetupURL(RTMP *r, char *url) if (*p1 == '\\') { unsigned int c; if (port < 3) - return false; + return FALSE; sscanf(p1+1, "%02x", &c); *p2++ = c; port -= 3; @@ -725,14 +725,14 @@ bool RTMP_SetupURL(RTMP *r, char *url) else r->Link.port = 1935; } - return true; + return TRUE; } -static bool +static int add_addr_info(struct sockaddr_in *service, AVal *host, int port) { char *hostname; - bool ret = true; + int ret = TRUE; if (host->av_val[host->av_len]) { hostname = malloc(host->av_len+1); @@ -751,7 +751,7 @@ add_addr_info(struct sockaddr_in *servic if (host == NULL || host->h_addr == NULL) { RTMP_Log(RTMP_LOGERROR, "Problem accessing the DNS. (addr: %s)", hostname); - ret = false; + ret = FALSE; goto finish; } service->sin_addr = *(struct in_addr *)host->h_addr; @@ -764,11 +764,11 @@ finish: return ret; } -bool +int RTMP_Connect0(RTMP *r, struct sockaddr * service) { int on = 1; - r->m_sb.sb_timedout = false; + r->m_sb.sb_timedout = FALSE; r->m_pausing = 0; r->m_fDuration = 0.0; @@ -781,7 +781,7 @@ RTMP_Connect0(RTMP *r, struct sockaddr * RTMP_Log(RTMP_LOGERROR, "%s, failed to connect socket. %d (%s)", __FUNCTION__, err, strerror(err)); RTMP_Close(r); - return false; + return FALSE; } if (r->Link.socksport) @@ -791,7 +791,7 @@ RTMP_Connect0(RTMP *r, struct sockaddr * { RTMP_Log(RTMP_LOGERROR, "%s, SOCKS negotiation failed.", __FUNCTION__); RTMP_Close(r); - return false; + return FALSE; } } } @@ -799,7 +799,7 @@ RTMP_Connect0(RTMP *r, struct sockaddr * { RTMP_Log(RTMP_LOGERROR, "%s, failed to create socket. Error: %d", __FUNCTION__, GetSockError()); - return false; + return FALSE; } /* set timeout */ @@ -815,10 +815,10 @@ RTMP_Connect0(RTMP *r, struct sockaddr * setsockopt(r->m_sb.sb_socket, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(on)); - return true; + return TRUE; } -bool +int RTMP_Connect1(RTMP *r, RTMPPacket *cp) { if (r->Link.protocol & RTMP_FEATURE_SSL) @@ -830,12 +830,12 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) { RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__); RTMP_Close(r); - return false; + return FALSE; } #else RTMP_Log(RTMP_LOGERROR, "%s, no SSL/TLS support", __FUNCTION__); RTMP_Close(r); - return false; + return FALSE; #endif } @@ -849,11 +849,11 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) r->m_msgCounter = 0; } RTMP_Log(RTMP_LOGDEBUG, "%s, ... connected, handshaking", __FUNCTION__); - if (!HandShake(r, true)) + if (!HandShake(r, TRUE)) { RTMP_Log(RTMP_LOGERROR, "%s, handshake failed.", __FUNCTION__); RTMP_Close(r); - return false; + return FALSE; } RTMP_Log(RTMP_LOGDEBUG, "%s, handshaked", __FUNCTION__); @@ -861,17 +861,17 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) { RTMP_Log(RTMP_LOGERROR, "%s, RTMP connect failed.", __FUNCTION__); RTMP_Close(r); - return false; + return FALSE; } - return true; + return TRUE; } -bool +int RTMP_Connect(RTMP *r, RTMPPacket *cp) { struct sockaddr_in service; if (!r->Link.hostname.av_len) - return false; + return FALSE; memset(&service, 0, sizeof(struct sockaddr_in)); service.sin_family = AF_INET; @@ -880,24 +880,24 @@ RTMP_Connect(RTMP *r, RTMPPacket *cp) { /* Connect via SOCKS */ if (!add_addr_info(&service, &r->Link.sockshost, r->Link.socksport)) - return false; + return FALSE; } else { /* Connect directly */ if (!add_addr_info(&service, &r->Link.hostname, r->Link.port)) - return false; + return FALSE; } if (!RTMP_Connect0(r, (struct sockaddr *)&service)) - return false; + return FALSE; - r->m_bSendCounter = true; + r->m_bSendCounter = TRUE; return RTMP_Connect1(r, cp); } -static bool +static int SocksNegotiate(RTMP *r) { unsigned long addr; @@ -920,21 +920,21 @@ SocksNegotiate(RTMP *r) WriteN(r, packet, sizeof packet); if (ReadN(r, packet, 8) != 8) - return false; + return FALSE; if (packet[0] == 0 && packet[1] == 90) { - return true; + return TRUE; } else { RTMP_Log(RTMP_LOGERROR, "%s, SOCKS returned error code %d", packet[1]); - return false; + return FALSE; } } } -bool +int RTMP_ConnectStream(RTMP *r, int seekTime) { RTMPPacket packet = { 0 }; @@ -970,7 +970,7 @@ RTMP_ConnectStream(RTMP *r, int seekTime return r->m_bPlaying; } -bool +int RTMP_ReconnectStream(RTMP *r, int seekTime) { RTMP_DeleteStream(r); @@ -980,21 +980,21 @@ RTMP_ReconnectStream(RTMP *r, int seekTi return RTMP_ConnectStream(r, seekTime); } -bool +int RTMP_ToggleStream(RTMP *r) { - bool res; + int res; if (!r->m_pausing) { - res = RTMP_SendPause(r, true, r->m_pauseStamp); + res = RTMP_SendPause(r, TRUE, r->m_pauseStamp); if (!res) return res; r->m_pausing = 1; sleep(1); } - res = RTMP_SendPause(r, false, r->m_pauseStamp); + res = RTMP_SendPause(r, FALSE, r->m_pauseStamp); r->m_pausing = 3; return res; } @@ -1005,7 +1005,7 @@ RTMP_DeleteStream(RTMP *r) if (r->m_stream_id < 0) return; - r->m_bPlaying = false; + r->m_bPlaying = FALSE; SendDeleteStream(r, r->m_stream_id); r->m_stream_id = -1; @@ -1049,7 +1049,7 @@ RTMP_GetNextMediaPacket(RTMP *r, RTMPPac } if (bHasMediaPacket) - r->m_bPlaying = true; + r->m_bPlaying = TRUE; else if (r->m_sb.sb_timedout && !r->m_pausing) r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; @@ -1224,7 +1224,7 @@ ReadN(RTMP *r, char *buffer, int n) int avail; char *ptr; - r->m_sb.sb_timedout = false; + r->m_sb.sb_timedout = FALSE; #ifdef _DEBUG memset(buffer, 0, n); @@ -1313,7 +1313,7 @@ ReadN(RTMP *r, char *buffer, int n) return nOriginalSize - n; } -static bool +static int WriteN(RTMP *r, const char *buffer, int n) { const char *ptr = buffer; @@ -1390,7 +1390,7 @@ SAVC(secureTokenResponse); SAVC(type); SAVC(nonprivate); -static bool +static int SendConnectPacket(RTMP *r, RTMPPacket *cp) { RTMPPacket packet; @@ -1398,7 +1398,7 @@ SendConnectPacket(RTMP *r, RTMPPacket *c char *enc; if (cp) - return RTMP_SendPacket(r, cp, true); + return RTMP_SendPacket(r, cp, TRUE); packet.m_nChannel = 0x03; /* control channel (invoke) */ packet.m_headerType = RTMP_PACKET_SIZE_LARGE; @@ -1415,63 +1415,63 @@ SendConnectPacket(RTMP *r, RTMPPacket *c enc = AMF_EncodeNamedString(enc, pend, &av_app, &r->Link.app); if (!enc) - return false; + return FALSE; if (r->Link.protocol & RTMP_FEATURE_WRITE) { enc = AMF_EncodeNamedString(enc, pend, &av_type, &av_nonprivate); if (!enc) - return false; + return FALSE; } if (r->Link.flashVer.av_len) { enc = AMF_EncodeNamedString(enc, pend, &av_flashVer, &r->Link.flashVer); if (!enc) - return false; + return FALSE; } if (r->Link.swfUrl.av_len) { enc = AMF_EncodeNamedString(enc, pend, &av_swfUrl, &r->Link.swfUrl); if (!enc) - return false; + return FALSE; } if (r->Link.tcUrl.av_len) { enc = AMF_EncodeNamedString(enc, pend, &av_tcUrl, &r->Link.tcUrl); if (!enc) - return false; + return FALSE; } if (!(r->Link.protocol & RTMP_FEATURE_WRITE)) { - enc = AMF_EncodeNamedBoolean(enc, pend, &av_fpad, false); + enc = AMF_EncodeNamedBoolean(enc, pend, &av_fpad, FALSE); if (!enc) - return false; + return FALSE; enc = AMF_EncodeNamedNumber(enc, pend, &av_capabilities, 15.0); if (!enc) - return false; + return FALSE; enc = AMF_EncodeNamedNumber(enc, pend, &av_audioCodecs, r->m_fAudioCodecs); if (!enc) - return false; + return FALSE; enc = AMF_EncodeNamedNumber(enc, pend, &av_videoCodecs, r->m_fVideoCodecs); if (!enc) - return false; + return FALSE; enc = AMF_EncodeNamedNumber(enc, pend, &av_videoFunction, 1.0); if (!enc) - return false; + return FALSE; if (r->Link.pageUrl.av_len) { enc = AMF_EncodeNamedString(enc, pend, &av_pageUrl, &r->Link.pageUrl); if (!enc) - return false; + return FALSE; } } if (r->m_fEncoding != 0.0 || r->m_bSendEncoding) { /* AMF0, AMF3 not fully supported yet */ enc = AMF_EncodeNamedNumber(enc, pend, &av_objectEncoding, r->m_fEncoding); if (!enc) - return false; + return FALSE; } if (enc + 3 >= pend) - return false; + return FALSE; *enc++ = 0; *enc++ = 0; /* end of object - 0x00 0x00 0x09 */ *enc++ = AMF_OBJECT_END; @@ -1481,10 +1481,10 @@ SendConnectPacket(RTMP *r, RTMPPacket *c { enc = AMF_EncodeBoolean(enc, pend, r->Link.lFlags & RTMP_LF_AUTH); if (!enc) - return false; + return FALSE; enc = AMF_EncodeString(enc, pend, &r->Link.auth); if (!enc) - return false; + return FALSE; } if (r->Link.extras.o_num) { @@ -1493,18 +1493,18 @@ SendConnectPacket(RTMP *r, RTMPPacket *c { enc = AMFProp_Encode(&r->Link.extras.o_props[i], enc, pend); if (!enc) - return false; + return FALSE; } } packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } #if 0 /* unused */ SAVC(bgHasStream); -static bool +static int SendBGHasStream(RTMP *r, double dId, AVal *playpath) { RTMPPacket packet; @@ -1526,17 +1526,17 @@ SendBGHasStream(RTMP *r, double dId, AVa enc = AMF_EncodeString(enc, pend, playpath); if (enc == NULL) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } #endif SAVC(createStream); -bool +int RTMP_SendCreateStream(RTMP *r) { RTMPPacket packet; @@ -1558,12 +1558,12 @@ RTMP_SendCreateStream(RTMP *r) packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } SAVC(FCSubscribe); -static bool +static int SendFCSubscribe(RTMP *r, AVal *subscribepath) { RTMPPacket packet; @@ -1585,16 +1585,16 @@ SendFCSubscribe(RTMP *r, AVal *subscribe enc = AMF_EncodeString(enc, pend, subscribepath); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } SAVC(releaseStream); -static bool +static int SendReleaseStream(RTMP *r) { RTMPPacket packet; @@ -1615,16 +1615,16 @@ SendReleaseStream(RTMP *r) *enc++ = AMF_NULL; enc = AMF_EncodeString(enc, pend, &r->Link.playpath); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(FCPublish); -static bool +static int SendFCPublish(RTMP *r) { RTMPPacket packet; @@ -1645,16 +1645,16 @@ SendFCPublish(RTMP *r) *enc++ = AMF_NULL; enc = AMF_EncodeString(enc, pend, &r->Link.playpath); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(FCUnpublish); -static bool +static int SendFCUnpublish(RTMP *r) { RTMPPacket packet; @@ -1675,18 +1675,18 @@ SendFCUnpublish(RTMP *r) *enc++ = AMF_NULL; enc = AMF_EncodeString(enc, pend, &r->Link.playpath); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(publish); SAVC(live); SAVC(record); -static bool +static int SendPublish(RTMP *r) { RTMPPacket packet; @@ -1707,21 +1707,21 @@ SendPublish(RTMP *r) *enc++ = AMF_NULL; enc = AMF_EncodeString(enc, pend, &r->Link.playpath); if (!enc) - return false; + return FALSE; /* FIXME: should we choose live based on Link.lFlags & RTMP_LF_LIVE? */ enc = AMF_EncodeString(enc, pend, &av_live); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } SAVC(deleteStream); -static bool +static int SendDeleteStream(RTMP *r, double dStreamId) { RTMPPacket packet; @@ -1745,13 +1745,13 @@ SendDeleteStream(RTMP *r, double dStream packet.m_nBodySize = enc - packet.m_body; /* no response expected */ - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(pause); -bool -RTMP_SendPause(RTMP *r, bool DoPause, int iTime) +int +RTMP_SendPause(RTMP *r, int DoPause, int iTime) { RTMPPacket packet; char pbuf[256], *pend = pbuf + sizeof(pbuf); @@ -1775,12 +1775,12 @@ RTMP_SendPause(RTMP *r, bool DoPause, in packet.m_nBodySize = enc - packet.m_body; RTMP_Log(RTMP_LOGDEBUG, "%s, %d, pauseTime=%d", __FUNCTION__, DoPause, iTime); - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } SAVC(seek); -bool +int RTMP_SendSeek(RTMP *r, int iTime) { RTMPPacket packet; @@ -1806,10 +1806,10 @@ RTMP_SendSeek(RTMP *r, int iTime) r->m_read.flags |= RTMP_READ_SEEKING; r->m_read.nResumeTS = 0; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } -bool +int RTMP_SendServerBW(RTMP *r) { RTMPPacket packet; @@ -1826,10 +1826,10 @@ RTMP_SendServerBW(RTMP *r) packet.m_nBodySize = 4; AMF_EncodeInt32(packet.m_body, pend, r->m_nServerBW); - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } -bool +int RTMP_SendClientBW(RTMP *r) { RTMPPacket packet; @@ -1847,10 +1847,10 @@ RTMP_SendClientBW(RTMP *r) AMF_EncodeInt32(packet.m_body, pend, r->m_nClientBW); packet.m_body[4] = r->m_nClientBW2; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } -static bool +static int SendBytesReceived(RTMP *r) { RTMPPacket packet; @@ -1870,12 +1870,12 @@ SendBytesReceived(RTMP *r) r->m_nBytesInSent = r->m_nBytesIn; /*RTMP_Log(RTMP_LOGDEBUG, "Send bytes report. 0x%x (%d bytes)", (unsigned int)m_nBytesIn, m_nBytesIn); */ - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(_checkbw); -static bool +static int SendCheckBW(RTMP *r) { RTMPPacket packet; @@ -1898,12 +1898,12 @@ SendCheckBW(RTMP *r) packet.m_nBodySize = enc - packet.m_body; /* triggers _onbwcheck and eventually results in _onbwdone */ - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(_result); -static bool +static int SendCheckBWResult(RTMP *r, double txn) { RTMPPacket packet; @@ -1926,12 +1926,12 @@ SendCheckBWResult(RTMP *r, double txn) packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(play); -static bool +static int SendPlay(RTMP *r) { RTMPPacket packet; @@ -1956,7 +1956,7 @@ SendPlay(RTMP *r) r->Link.playpath.av_val); enc = AMF_EncodeString(enc, pend, &r->Link.playpath); if (!enc) - return false; + return FALSE; /* Optional parameters start and len. * @@ -1976,7 +1976,7 @@ SendPlay(RTMP *r) enc = AMF_EncodeNumber(enc, pend, 0.0); /*-2000.0);*/ /* recorded as default, -2000.0 is not reliable since that freezes the player if the stream is not found */ } if (!enc) - return false; + return FALSE; /* len: -1, 0, positive number * -1: plays live or recorded stream to the end (default) @@ -1988,18 +1988,18 @@ SendPlay(RTMP *r) { enc = AMF_EncodeNumber(enc, pend, r->Link.stopTime - r->Link.seekTime); if (!enc) - return false; + return FALSE; } packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } SAVC(set_playlist); SAVC(0); -static bool +static int SendPlaylist(RTMP *r) { RTMPPacket packet; @@ -2025,19 +2025,19 @@ SendPlaylist(RTMP *r) *enc++ = AMF_OBJECT; enc = AMF_EncodeNamedString(enc, pend, &av_0, &r->Link.playpath); if (!enc) - return false; + return FALSE; if (enc + 3 >= pend) - return false; + return FALSE; *enc++ = 0; *enc++ = 0; *enc++ = AMF_OBJECT_END; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, true); + return RTMP_SendPacket(r, &packet, TRUE); } -static bool +static int SendSecureTokenResponse(RTMP *r, AVal *resp) { RTMPPacket packet; @@ -2058,11 +2058,11 @@ SendSecureTokenResponse(RTMP *r, AVal *r *enc++ = AMF_NULL; enc = AMF_EncodeString(enc, pend, resp); if (!enc) - return false; + return FALSE; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } /* @@ -2081,7 +2081,7 @@ The type of Ping packet is 0x4 and conta * type 26: SWFVerification request * type 27: SWFVerification response */ -bool +int RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime) { RTMPPacket packet; @@ -2132,11 +2132,11 @@ RTMP_SendCtrl(RTMP *r, short nType, unsi buf = AMF_EncodeInt32(buf, pend, nTime); } - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } static void -AV_erase(RTMP_METHOD *vals, int *num, int i, bool freeit) +AV_erase(RTMP_METHOD *vals, int *num, int i, int freeit) { if (freeit) free(vals[i].name.av_val); @@ -2151,7 +2151,7 @@ AV_erase(RTMP_METHOD *vals, int *num, in } void -RTMP_DropRequest(RTMP *r, int i, bool freeit) +RTMP_DropRequest(RTMP *r, int i, int freeit) { AV_erase(r->m_methodCalls, &r->m_numCalls, i, freeit); } @@ -2220,7 +2220,7 @@ HandleInvoke(RTMP *r, const char *body, return 0; } - nRes = AMF_Decode(&obj, body, nBodySize, false); + nRes = AMF_Decode(&obj, body, nBodySize, FALSE); if (nRes < 0) { RTMP_Log(RTMP_LOGERROR, "%s, error decoding invoke packet", __FUNCTION__); @@ -2240,7 +2240,7 @@ HandleInvoke(RTMP *r, const char *body, for (i=0; i<r->m_numCalls; i++) { if (r->m_methodCalls[i].num == txn) { methodInvoked = r->m_methodCalls[i].name; - AV_erase(r->m_methodCalls, &r->m_numCalls, i, false); + AV_erase(r->m_methodCalls, &r->m_numCalls, i, FALSE); break; } } @@ -2304,7 +2304,7 @@ HandleInvoke(RTMP *r, const char *body, else if (AVMATCH(&methodInvoked, &av_play) || AVMATCH(&methodInvoked, &av_publish)) { - r->m_bPlaying = true; + r->m_bPlaying = TRUE; } free(methodInvoked.av_val); } @@ -2331,7 +2331,7 @@ HandleInvoke(RTMP *r, const char *body, for (i = 0; i < r->m_numCalls; i++) if (AVMATCH(&r->m_methodCalls[i].name, &av__checkbw)) { - AV_erase(r->m_methodCalls, &r->m_numCalls, i, true); + AV_erase(r->m_methodCalls, &r->m_numCalls, i, TRUE); break; } } @@ -2366,12 +2366,12 @@ HandleInvoke(RTMP *r, const char *body, else if (AVMATCH(&code, &av_NetStream_Play_Start)) { int i; - r->m_bPlaying = true; + r->m_bPlaying = TRUE; for (i = 0; i < r->m_numCalls; i++) { if (AVMATCH(&r->m_methodCalls[i].name, &av_play)) { - AV_erase(r->m_methodCalls, &r->m_numCalls, i, true); + AV_erase(r->m_methodCalls, &r->m_numCalls, i, TRUE); break; } } @@ -2380,12 +2380,12 @@ HandleInvoke(RTMP *r, const char *body, else if (AVMATCH(&code, &av_NetStream_Publish_Start)) { int i; - r->m_bPlaying = true; + r->m_bPlaying = TRUE; for (i = 0; i < r->m_numCalls; i++) { if (AVMATCH(&r->m_methodCalls[i].name, &av_publish)) { - AV_erase(r->m_methodCalls, &r->m_numCalls, i, true); + AV_erase(r->m_methodCalls, &r->m_numCalls, i, TRUE); break; } } @@ -2409,7 +2409,7 @@ HandleInvoke(RTMP *r, const char *body, { if (r->m_pausing == 1 || r->m_pausing == 2) { - RTMP_SendPause(r, false, r->m_pauseStamp); + RTMP_SendPause(r, FALSE, r->m_pauseStamp); r->m_pausing = 3; } } @@ -2421,7 +2421,7 @@ HandleInvoke(RTMP *r, const char *body, { if (AVMATCH(&r->m_methodCalls[i].name, &av_set_playlist)) { - AV_erase(r->m_methodCalls, &r->m_numCalls, i, true); + AV_erase(r->m_methodCalls, &r->m_numCalls, i, TRUE); break; } } @@ -2435,7 +2435,7 @@ leave: return ret; } -bool +int RTMP_FindFirstMatchingProperty(AMFObject *obj, const AVal *name, AMFObjectProperty * p) { @@ -2448,20 +2448,20 @@ RTMP_FindFirstMatchingProperty(AMFObject if (AVMATCH(&prop->p_name, name)) { *p = *prop; - return true; + return TRUE; } if (prop->p_type == AMF_OBJECT) { if (RTMP_FindFirstMatchingProperty(&prop->p_vu.p_object, name, p)) - return true; + return TRUE; } } - return false; + return FALSE; } /* Like above, but only check if name is a prefix of property */ -bool +int RTMP_FindPrefixProperty(AMFObject *obj, const AVal *name, AMFObjectProperty * p) { @@ -2474,19 +2474,19 @@ RTMP_FindPrefixProperty(AMFObject *obj, !memcmp(prop->p_name.av_val, name->av_val, name->av_len)) { *p = *prop; - return true; + return TRUE; } if (prop->p_type == AMF_OBJECT) { if (RTMP_FindPrefixProperty(&prop->p_vu.p_object, name, p)) - return true; + return TRUE; } } - return false; + return FALSE; } -static bool +static int DumpMetaData(AMFObject *obj) { AMFObjectProperty *prop; @@ -2533,7 +2533,7 @@ DumpMetaData(AMFObject *obj) DumpMetaData(&prop->p_vu.p_object); } } - return false; + return FALSE; } SAVC(onMetaData); @@ -2541,7 +2541,7 @@ SAVC(duration); SAVC(video); SAVC(audio); -static bool +static int HandleMetadata(RTMP *r, char *body, unsigned int len) { /* allright we get some info here, so parse it and print it */ @@ -2549,13 +2549,13 @@ HandleMetadata(RTMP *r, char *body, unsi AMFObject obj; AVal metastring; - bool ret = false; + int ret = FALSE; - int nRes = AMF_Decode(&obj, body, len, false); + int nRes = AMF_Decode(&obj, body, len, FALSE); if (nRes < 0) { RTMP_Log(RTMP_LOGERROR, "%s, error decoding meta data packet", __FUNCTION__); - return false; + return FALSE; } AMF_Dump(&obj); @@ -2577,7 +2577,7 @@ HandleMetadata(RTMP *r, char *body, unsi r->m_read.dataType |= 1; if (RTMP_FindPrefixProperty(&obj, &av_audio, &prop)) r->m_read.dataType |= 4; - ret = true; + ret = TRUE; } AMF_Reset(&obj); return ret; @@ -2691,12 +2691,12 @@ HandleCtrl(RTMP *r, const RTMPPacket *pa if (!r->m_pausing) { r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; - RTMP_SendPause(r, true, r->m_pauseStamp); + RTMP_SendPause(r, TRUE, r->m_pauseStamp); r->m_pausing = 1; } else if (r->m_pausing == 2) { - RTMP_SendPause(r, false, r->m_pauseStamp); + RTMP_SendPause(r, FALSE, r->m_pauseStamp); r->m_pausing = 3; } break; @@ -2781,19 +2781,19 @@ EncodeInt32LE(char *output, int nVal) return 4; } -bool +int RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) { char hbuf[RTMP_MAX_HEADER_SIZE] = { 0 }, *header = hbuf; int nSize, hSize, nToRead, nChunk; - bool didAlloc = false; + int didAlloc = FALSE; RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d", __FUNCTION__, r->m_sb.sb_socket); if (ReadN(r, hbuf, 1) == 0) { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header", __FUNCTION__); - return false; + return FALSE; } packet->m_headerType = (hbuf[0] & 0xc0) >> 6; @@ -2805,7 +2805,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header 2nd byte", __FUNCTION__); - return false; + return FALSE; } packet->m_nChannel = (unsigned)hbuf[1]; packet->m_nChannel += 64; @@ -2818,7 +2818,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header 3nd byte", __FUNCTION__); - return false; + return FALSE; } tmp = (((unsigned)hbuf[2]) << 8) + (unsigned)hbuf[1]; packet->m_nChannel = tmp + 64; @@ -2829,7 +2829,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac nSize = packetSize[packet->m_headerType]; if (nSize == RTMP_LARGE_HEADER_SIZE) /* if we get a full header the timestamp is absolute */ - packet->m_hasAbsTimestamp = true; + packet->m_hasAbsTimestamp = TRUE; else if (nSize < RTMP_LARGE_HEADER_SIZE) { /* using values from the last message of this channel */ @@ -2844,7 +2844,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet header. type: %x", __FUNCTION__, (unsigned int)hbuf[0]); - return false; + return FALSE; } hSize = nSize + (header - hbuf); @@ -2875,7 +2875,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "%s, failed to read extended timestamp", __FUNCTION__); - return false; + return FALSE; } packet->m_nTimeStamp = AMF_DecodeInt32(header + nSize); hSize += 4; @@ -2889,9 +2889,9 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac if (!RTMPPacket_Alloc(packet, packet->m_nBodySize)) { RTMP_Log(RTMP_LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__); - return false; + return FALSE; } - didAlloc = true; + didAlloc = TRUE; packet->m_headerType = (hbuf[0] & 0xc0) >> 6; } @@ -2913,7 +2913,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet body. len: %lu", __FUNCTION__, packet->m_nBodySize); - return false; + return FALSE; } RTMP_LogHexString(RTMP_LOGDEBUG2, (uint8_t *)packet->m_body + packet->m_nBytesRead, nChunk); @@ -2937,23 +2937,23 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *pac /* arrives and requests to re-use some info (small packet header) */ r->m_vecChannelsIn[packet->m_nChannel]->m_body = NULL; r->m_vecChannelsIn[packet->m_nChannel]->m_nBytesRead = 0; - r->m_vecChannelsIn[packet->m_nChannel]->m_hasAbsTimestamp = false; /* can only be false if we reuse header */ + r->m_vecChannelsIn[packet->m_nChannel]->m_hasAbsTimestamp = FALSE; /* can only be false if we reuse header */ } else { packet->m_body = NULL; /* so it won't be erased on free */ } - return true; + return TRUE; } #ifndef CRYPTO -static bool -HandShake(RTMP *r, bool FP9HandShake) +static int +HandShake(RTMP *r, int FP9HandShake) { int i; uint32_t uptime, suptime; - bool bMatch; + int bMatch; char type; char clientbuf[RTMP_SIG_SIZE + 1], *clientsig = clientbuf + 1; char serversig[RTMP_SIG_SIZE]; @@ -2974,10 +2974,10 @@ HandShake(RTMP *r, bool FP9HandShake) #endif if (!WriteN(r, clientbuf, RTMP_SIG_SIZE + 1)) - return false; + return FALSE; if (ReadN(r, &type, 1) != 1) /* 0x03 or 0x06 */ - return false; + return FALSE; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Answer : %02X", __FUNCTION__, type); @@ -2986,7 +2986,7 @@ HandShake(RTMP *r, bool FP9HandShake) __FUNCTION__, clientbuf[0], type); if (ReadN(r, serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; /* decode server response */ @@ -2999,30 +2999,30 @@ HandShake(RTMP *r, bool FP9HandShake) /* 2nd part of handshake */ if (!WriteN(r, serversig, RTMP_SIG_SIZE)) - return false; + return FALSE; if (ReadN(r, serversig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; bMatch = (memcmp(serversig, clientsig, RTMP_SIG_SIZE) == 0); if (!bMatch) { RTMP_Log(RTMP_LOGWARNING, "%s, client signature does not match!", __FUNCTION__); } - return true; + return TRUE; } -static bool +static int SHandShake(RTMP *r) { int i; char serverbuf[RTMP_SIG_SIZE + 1], *serversig = serverbuf + 1; char clientsig[RTMP_SIG_SIZE]; uint32_t uptime; - bool bMatch; + int bMatch; if (ReadN(r, serverbuf, 1) != 1) /* 0x03 or 0x06 */ - return false; + return FALSE; RTMP_Log(RTMP_LOGDEBUG, "%s: Type Request : %02X", __FUNCTION__, serverbuf[0]); @@ -3030,7 +3030,7 @@ SHandShake(RTMP *r) { RTMP_Log(RTMP_LOGERROR, "%s: Type unknown: client sent %02X", __FUNCTION__, serverbuf[0]); - return false; + return FALSE; } uptime = htonl(RTMP_GetTime()); @@ -3046,10 +3046,10 @@ SHandShake(RTMP *r) #endif if (!WriteN(r, serverbuf, RTMP_SIG_SIZE + 1)) - return false; + return FALSE; if (ReadN(r, clientsig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; /* decode client response */ @@ -3062,24 +3062,24 @@ SHandShake(RTMP *r) /* 2nd part of handshake */ if (!WriteN(r, clientsig, RTMP_SIG_SIZE)) - return false; + return FALSE; if (ReadN(r, clientsig, RTMP_SIG_SIZE) != RTMP_SIG_SIZE) - return false; + return FALSE; bMatch = (memcmp(serversig, clientsig, RTMP_SIG_SIZE) == 0); if (!bMatch) { RTMP_Log(RTMP_LOGWARNING, "%s, client signature does not match!", __FUNCTION__); } - return true; + return TRUE; } #endif -bool +int RTMP_SendChunk(RTMP *r, RTMPChunk *chunk) { - bool wrote; + int wrote; char hbuf[RTMP_MAX_HEADER_SIZE]; RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d, size=%d", __FUNCTION__, r->m_sb.sb_socket, @@ -3100,8 +3100,8 @@ RTMP_SendChunk(RTMP *r, RTMPChunk *chunk return wrote; } -bool -RTMP_SendPacket(RTMP *r, RTMPPacket *packet, bool queue) +int +RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue) { const RTMPPacket *prevPacket = r->m_vecChannelsOut[packet->m_nChannel]; uint32_t last = 0; @@ -3131,7 +3131,7 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *pac { RTMP_Log(RTMP_LOGERROR, "sanity failed!! trying to send header of type: 0x%02x.", (unsigned char)packet->m_headerType); - return false; + return FALSE; } nSize = packetSize[packet->m_headerType]; @@ -3219,7 +3219,7 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *pac tlen = chunks * (cSize + 1) + nSize + hSize; tbuf = malloc(tlen); if (!tbuf) - return false; + return FALSE; toff = tbuf; } } @@ -3241,7 +3241,7 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *pac { wrote = WriteN(r, header, nChunkSize + hSize); if (!wrote) - return false; + return FALSE; } nSize -= nChunkSize; buffer += nChunkSize; @@ -3272,7 +3272,7 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *pac free(tbuf); tbuf = NULL; if (!wrote) - return false; + return FALSE; } /* we invoked a remote method */ @@ -3295,10 +3295,10 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *pac if (!r->m_vecChannelsOut[packet->m_nChannel]) r->m_vecChannelsOut[packet->m_nChannel] = malloc(sizeof(RTMPPacket)); memcpy(r->m_vecChannelsOut[packet->m_nChannel], packet, sizeof(RTMPPacket)); - return true; + return TRUE; } -bool +int RTMP_Serve(RTMP *r) { return SHandShake(r); @@ -3366,7 +3366,7 @@ RTMP_Close(RTMP *r) r->m_numCalls = 0; r->m_numInvokes = 0; - r->m_bPlaying = false; + r->m_bPlaying = FALSE; r->m_sb.sb_size = 0; r->m_msgCounter = 0; @@ -3430,7 +3430,7 @@ RTMPSockBuf_Fill(RTMPSockBuf *sb) if (sockerr == EWOULDBLOCK || sockerr == EAGAIN) { - sb->sb_timedout = true; + sb->sb_timedout = TRUE; nBytes = 0; } } @@ -3627,7 +3627,7 @@ Read_1_Packet(RTMP *r, char *buf, unsign uint32_t prevTagSize = 0; int rtnGetNextMediaPacket = 0, ret = RTMP_READ_EOF; RTMPPacket packet = { 0 }; - bool recopy = false; + int recopy = FALSE; unsigned int size; char *ptr, *pend; uint32_t nTimeStamp = 0; @@ -3692,7 +3692,7 @@ Read_1_Packet(RTMP *r, char *buf, unsign { AMFObject metaObj; int nRes = - AMF_Decode(&metaObj, packetBody, nPacketLen, false); + AMF_Decode(&metaObj, packetBody, nPacketLen, FALSE); if (nRes >= 0) { AVal metastring; @@ -3926,7 +3926,7 @@ Read_1_Packet(RTMP *r, char *buf, unsign ret = RTMP_READ_ERROR; /* fatal error */ break; } - recopy = true; + recopy = TRUE; ptr = r->m_read.buf; } else @@ -4258,7 +4258,7 @@ RTMP_Write(RTMP *r, const char *buf, int if (!RTMPPacket_Alloc(pkt, pkt->m_nBodySize)) { RTMP_Log(RTMP_LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__); - return false; + return FALSE; } enc = pkt->m_body; pend = enc + pkt->m_nBodySize; @@ -4281,7 +4281,7 @@ RTMP_Write(RTMP *r, const char *buf, int buf += num; if (pkt->m_nBytesRead == pkt->m_nBodySize) { - ret = RTMP_SendPacket(r, pkt, false); + ret = RTMP_SendPacket(r, pkt, FALSE); RTMPPacket_Free(pkt); pkt->m_nBytesRead = 0; if (!ret) Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/rtmp.h Wed Jun 2 18:52:55 2010 (r503) @@ -66,7 +66,7 @@ extern "C" extern const char RTMPProtocolStringsLower[][7]; extern const AVal RTMP_DefaultFlashVer; - extern bool RTMP_ctrlC; + extern int RTMP_ctrlC; uint32_t RTMP_GetTime(void); @@ -109,13 +109,13 @@ extern "C" int sb_size; /* number of unprocessed bytes in buffer */ char *sb_start; /* pointer into sb_pBuffer of next byte to process */ char sb_buf[RTMP_BUFFER_CACHE_SIZE]; /* data read from socket */ - bool sb_timedout; + int sb_timedout; void *sb_ssl; } RTMPSockBuf; void RTMPPacket_Reset(RTMPPacket *p); void RTMPPacket_Dump(RTMPPacket *p); - bool RTMPPacket_Alloc(RTMPPacket *p, int nSize); + int RTMPPacket_Alloc(RTMPPacket *p, int nSize); void RTMPPacket_Free(RTMPPacket *p); #define RTMPPacket_IsReady(a) ((a)->m_nBytesRead == (a)->m_nBodySize) @@ -252,15 +252,15 @@ extern "C" RTMP_LNK Link; } RTMP; - bool RTMP_ParseURL(const char *url, int *protocol, AVal *host, + int RTMP_ParseURL(const char *url, int *protocol, AVal *host, unsigned int *port, AVal *playpath, AVal *app); void RTMP_ParsePlaypath(AVal *in, AVal *out); void RTMP_SetBufferMS(RTMP *r, int size); void RTMP_UpdateBufferMS(RTMP *r); - bool RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg); - bool RTMP_SetupURL(RTMP *r, char *url); + int RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg); + int RTMP_SetupURL(RTMP *r, char *url); void RTMP_SetupStream(RTMP *r, int protocol, AVal *hostname, unsigned int port, @@ -276,24 +276,24 @@ extern "C" AVal *flashVer, AVal *subscribepath, int dStart, - int dStop, bool bLiveStream, long int timeout); + int dStop, int bLiveStream, long int timeout); - bool RTMP_Connect(RTMP *r, RTMPPacket *cp); + int RTMP_Connect(RTMP *r, RTMPPacket *cp); struct sockaddr; - bool RTMP_Connect0(RTMP *r, struct sockaddr *svc); - bool RTMP_Connect1(RTMP *r, RTMPPacket *cp); - bool RTMP_Serve(RTMP *r); + int RTMP_Connect0(RTMP *r, struct sockaddr *svc); + int RTMP_Connect1(RTMP *r, RTMPPacket *cp); + int RTMP_Serve(RTMP *r); - bool RTMP_ReadPacket(RTMP *r, RTMPPacket *packet); - bool RTMP_SendPacket(RTMP *r, RTMPPacket *packet, bool queue); - bool RTMP_SendChunk(RTMP *r, RTMPChunk *chunk); - bool RTMP_IsConnected(RTMP *r); - bool RTMP_IsTimedout(RTMP *r); + int RTMP_ReadPacket(RTMP *r, RTMPPacket *packet); + int RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue); + int RTMP_SendChunk(RTMP *r, RTMPChunk *chunk); + int RTMP_IsConnected(RTMP *r); + int RTMP_IsTimedout(RTMP *r); double RTMP_GetDuration(RTMP *r); - bool RTMP_ToggleStream(RTMP *r); + int RTMP_ToggleStream(RTMP *r); - bool RTMP_ConnectStream(RTMP *r, int seekTime); - bool RTMP_ReconnectStream(RTMP *r, int seekTime); + int RTMP_ConnectStream(RTMP *r, int seekTime); + int RTMP_ReconnectStream(RTMP *r, int seekTime); void RTMP_DeleteStream(RTMP *r); int RTMP_GetNextMediaPacket(RTMP *r, RTMPPacket *packet); int RTMP_ClientPacket(RTMP *r, RTMPPacket *packet); @@ -307,21 +307,21 @@ extern "C" int RTMP_LibVersion(void); void RTMP_UserInterrupt(void); /* user typed Ctrl-C */ - bool RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, + int RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime); - bool RTMP_SendPause(RTMP *r, bool DoPause, int dTime); - bool RTMP_FindFirstMatchingProperty(AMFObject *obj, const AVal *name, + int RTMP_SendPause(RTMP *r, int DoPause, int dTime); + int RTMP_FindFirstMatchingProperty(AMFObject *obj, const AVal *name, AMFObjectProperty * p); int RTMPSockBuf_Fill(RTMPSockBuf *sb); int RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len); int RTMPSockBuf_Close(RTMPSockBuf *sb); - bool RTMP_SendCreateStream(RTMP *r); - bool RTMP_SendSeek(RTMP *r, int dTime); - bool RTMP_SendServerBW(RTMP *r); - bool RTMP_SendClientBW(RTMP *r); - void RTMP_DropRequest(RTMP *r, int i, bool freeit); + int RTMP_SendCreateStream(RTMP *r); + int RTMP_SendSeek(RTMP *r, int dTime); + int RTMP_SendServerBW(RTMP *r); + int RTMP_SendClientBW(RTMP *r); + void RTMP_DropRequest(RTMP *r, int i, int freeit); int RTMP_Read(RTMP *r, char *buf, int size); int RTMP_Write(RTMP *r, const char *buf, int size); Modified: trunk/librtmp/rtmp_sys.h ============================================================================== --- trunk/librtmp/rtmp_sys.h Wed Jun 2 18:15:24 2010 (r502) +++ trunk/librtmp/rtmp_sys.h Wed Jun 2 18:52:55 2010 (r503) @@ -60,6 +60,12 @@ #define SET_RCVTIMEO(tv,s) struct timeval tv = {s,0} #endif +/* macros for people who don't understand C */ +#undef TRUE +#undef FALSE +#define TRUE 1 +#define FALSE 0 + #include "rtmp.h" #ifdef USE_POLARSSL Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/rtmpdump.c Wed Jun 2 18:52:55 2010 (r503) @@ -51,7 +51,7 @@ #define DEF_SKIPFRM 0 // starts sockets -bool +int InitSockets() { #ifdef WIN32 @@ -61,7 +61,7 @@ InitSockets() version = MAKEWORD(1, 1); return (WSAStartup(version, &wsaData) == 0); #else - return true; + return TRUE; #endif } @@ -90,7 +90,7 @@ FILE *file = 0; void sigIntHandler(int sig) { - RTMP_ctrlC = true; + RTMP_ctrlC = TRUE; RTMP_LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig); // ignore all these signals now and let the connection close signal(SIGINT, SIG_IGN); @@ -193,7 +193,7 @@ OpenResumeFile(const char *flvFile, // f // go through the file to find the meta data! off_t pos = dataOffset + 4; - bool bFoundMetaHeader = false; + int bFoundMetaHeader = FALSE; while (pos < *size - 4 && !bFoundMetaHeader) { @@ -221,7 +221,7 @@ OpenResumeFile(const char *flvFile, // f break; AMFObject metaObj; - int nRes = AMF_Decode(&metaObj, buffer, dataSize, false); + int nRes = AMF_Decode(&metaObj, buffer, dataSize, FALSE); if (nRes < 0) { RTMP_Log(RTMP_LOGERROR, "%s, error decoding meta data packet", @@ -251,7 +251,7 @@ OpenResumeFile(const char *flvFile, // f RTMP_Log(RTMP_LOGDEBUG, "File has duration: %f", *duration); } - bFoundMetaHeader = true; + bFoundMetaHeader = TRUE; break; } //metaObj.Reset(); @@ -279,7 +279,7 @@ GetLastKeyframe(FILE * file, // output f const size_t bufferSize = 16; char buffer[bufferSize]; uint8_t dataType; - bool bAudioOnly; + int bAudioOnly; off_t size; fseek(file, 0, SEEK_END); @@ -429,7 +429,7 @@ GetLastKeyframe(FILE * file, // output f // make sure the WriteStream doesn't write headers and ignores all the 0ms TS packets // (including several meta data headers and the keyframe we seeked to) - //bNoHeader = true; if bResume==true this is true anyway + //bNoHeader = TRUE; if bResume==true this is true anyway } //} @@ -439,7 +439,7 @@ GetLastKeyframe(FILE * file, // output f int Download(RTMP * rtmp, // connected RTMP object - FILE * file, uint32_t dSeek, uint32_t dStopOffset, double duration, bool bResume, char *metaHeader, uint32_t nMetaHeaderSize, char *initialFrame, int initialFrameType, uint32_t nInitialFrameSize, int nSkipKeyFrames, bool bStdoutMode, bool bLiveStream, bool bHashes, bool bOverrideBufferTime, uint32_t bufferTime, double *percent) // percentage downloaded [out] + FILE * file, uint32_t dSeek, uint32_t dStopOffset, double duration, int bResume, char *metaHeader, uint32_t nMetaHeaderSize, char *initialFrame, int initialFrameType, uint32_t nInitialFrameSize, int nSkipKeyFrames, int bStdoutMode, int bLiveStream, int bHashes, int bOverrideBufferTime, uint32_t bufferTime, double *percent) // percentage downloaded [out] { int32_t now, lastUpdate; int bufferSize = 64 * 1024; @@ -718,9 +718,9 @@ main(int argc, char **argv) int nSkipKeyFrames = DEF_SKIPFRM; // skip this number of keyframes when resuming - bool bOverrideBufferTime = false; // if the user specifies a buffer time override this is true - bool bStdoutMode = true; // if true print the stream directly to stdout, messages go to stderr - bool bResume = false; // true in resume mode + int bOverrideBufferTime = FALSE; // if the user specifies a buffer time override this is true + int bStdoutMode = TRUE; // if true print the stream directly to stdout, messages go to stderr + int bResume = FALSE; // true in resume mode uint32_t dSeek = 0; // seek position in resume mode, 0 otherwise uint32_t bufferTime = DEF_BUFTIME; @@ -740,8 +740,8 @@ main(int argc, char **argv) int port = -1; int protocol = RTMP_PROTOCOL_UNDEFINED; int retries = 0; - bool bLiveStream = false; // is it a live stream? then we can't seek/resume - bool bHashes = false; // display byte counters not hashes by default + int bLiveStream = FALSE; // is it a live stream? then we can't seek/resume + int bHashes = FALSE; // display byte counters not hashes by default long int timeout = DEF_TIMEOUT; // timeout connection after 120 seconds uint32_t dStartOffset = 0; // seek position in non-live mode @@ -921,12 +921,12 @@ main(int argc, char **argv) else { bufferTime = bt; - bOverrideBufferTime = true; + bOverrideBufferTime = TRUE; } break; } case 'v': - bLiveStream = true; // no seeking or resuming possible! + bLiveStream = TRUE; // no seeking or resuming possible! break; case 'd': STR2AVAL(subscribepath, optarg); @@ -1001,11 +1001,11 @@ main(int argc, char **argv) case 'o': flvFile = optarg; if (strcmp(flvFile, "-")) - bStdoutMode = false; + bStdoutMode = FALSE; break; case 'e': - bResume = true; + bResume = TRUE; break; case 'u': STR2AVAL(auth, optarg); @@ -1036,7 +1036,7 @@ main(int argc, char **argv) } break; case '#': - bHashes = true; + bHashes = TRUE; break; case 'q': RTMP_debuglevel = RTMP_LOGCRIT; @@ -1097,20 +1097,20 @@ main(int argc, char **argv) { RTMP_Log(RTMP_LOGWARNING, "You haven't specified an output file (-o filename), using stdout"); - bStdoutMode = true; + bStdoutMode = TRUE; } if (bStdoutMode && bResume) { RTMP_Log(RTMP_LOGWARNING, "Can't resume in stdout mode, ignoring --resume option"); - bResume = false; + bResume = FALSE; } if (bLiveStream && bResume) { RTMP_Log(RTMP_LOGWARNING, "Can't resume live stream, ignoring --resume option"); - bResume = false; + bResume = FALSE; } #ifdef CRYPTO @@ -1186,7 +1186,7 @@ main(int argc, char **argv) if (!file) { // file does not exist, so go back into normal mode - bResume = false; // we are back in fresh file mode (otherwise finalizing file won't be done) + bResume = FALSE; // we are back in fresh file mode (otherwise finalizing file won't be done) } else { @@ -1203,7 +1203,7 @@ main(int argc, char **argv) { RTMP_Log(RTMP_LOGDEBUG, "Last keyframe is first frame in stream, switching from resume to normal mode!"); - bResume = false; + bResume = FALSE; } } } @@ -1331,7 +1331,7 @@ main(int argc, char **argv) nStatus = RD_INCOMPLETE; break; } - bResume = true; + bResume = TRUE; } nStatus = Download(&rtmp, file, dSeek, dStopOffset, duration, bResume, Modified: trunk/rtmpgw.c ============================================================================== --- trunk/rtmpgw.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/rtmpgw.c Wed Jun 2 18:52:55 2010 (r503) @@ -78,7 +78,7 @@ typedef struct AVal hostname; int rtmpport; int protocol; - bool bLiveStream; // is it a live stream? then we can't seek/resume + int bLiveStream; // is it a live stream? then we can't seek/resume long int timeout; // timeout connection after 120 seconds uint32_t bufferTime; @@ -207,7 +207,7 @@ parseAMF(AMFObject *obj, const char *arg * parameters in the GET request. */ RTMP_REQUEST defaultRTMPRequest; -bool ParseOption(char opt, char *arg, RTMP_REQUEST * req); +int ParseOption(char opt, char *arg, RTMP_REQUEST * req); #ifdef _DEBUG uint32_t debugTS = 0; @@ -310,15 +310,15 @@ ssize_t readHTTPLine(int sockfd, char *b return i; } -bool isHTTPRequestEOF(char *line, size_t length) +int isHTTPRequestEOF(char *line, size_t length) { if(length < 2) - return true; + return TRUE; if(line[0]=='\r' && line[1]=='\n') - return true; + return TRUE; - return false; + return FALSE; } */ @@ -746,7 +746,7 @@ stopStreaming(STREAMING_SERVER * server) void sigIntHandler(int sig) { - RTMP_ctrlC = true; + RTMP_ctrlC = TRUE; RTMP_LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig); if (httpServer) stopStreaming(httpServer); @@ -777,7 +777,7 @@ int hex2bin(char *str, char **hex) // Return values: true (option parsing ok) // false (option not parsed/invalid) -bool +int ParseOption(char opt, char *arg, RTMP_REQUEST * req) { switch (opt) @@ -844,7 +844,7 @@ ParseOption(char opt, char *arg, RTMP_RE break; } case 'v': - req->bLiveStream = true; // no seeking or resuming possible! + req->bLiveStream = TRUE; // no seeking or resuming possible! break; case 'd': STR2AVAL(req->subscribepath, arg); @@ -862,7 +862,7 @@ ParseOption(char opt, char *arg, RTMP_RE { RTMP_Log(RTMP_LOGERROR, "Unknown protocol specified: %d, using default", protocol); - return false; + return FALSE; } else { @@ -954,9 +954,9 @@ ParseOption(char opt, char *arg, RTMP_RE break; default: RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg); - return false; + return FALSE; } - return true; + return TRUE; } int @@ -978,7 +978,7 @@ main(int argc, char **argv) defaultRTMPRequest.rtmpport = -1; defaultRTMPRequest.protocol = RTMP_PROTOCOL_UNDEFINED; - defaultRTMPRequest.bLiveStream = false; // is it a live stream? then we can't seek/resume + defaultRTMPRequest.bLiveStream = FALSE; // is it a live stream? then we can't seek/resume defaultRTMPRequest.timeout = 120; // timeout connection after 120 seconds defaultRTMPRequest.bufferTime = 20 * 1000; Modified: trunk/rtmpsrv.c ============================================================================== --- trunk/rtmpsrv.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/rtmpsrv.c Wed Jun 2 18:52:55 2010 (r503) @@ -96,7 +96,7 @@ typedef struct char *hostname; int rtmpport; int protocol; - bool bLiveStream; // is it a live stream? then we can't seek/resume + int bLiveStream; // is it a live stream? then we can't seek/resume long int timeout; // timeout connection afte 300 seconds uint32_t bufferTime; @@ -159,7 +159,7 @@ SAVC(code); SAVC(description); SAVC(secureToken); -static bool +static int SendConnectResult(RTMP *r, double txn) { RTMPPacket packet; @@ -220,10 +220,10 @@ SendConnectResult(RTMP *r, double txn) packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } -static bool +static int SendResultNumber(RTMP *r, double txn, double ID) { RTMPPacket packet; @@ -245,7 +245,7 @@ SendResultNumber(RTMP *r, double txn, do packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } SAVC(onStatus); @@ -257,7 +257,7 @@ static const AVal av_Stopped_playing = A SAVC(details); SAVC(clientid); -static bool +static int SendPlayStart(RTMP *r) { RTMPPacket packet; @@ -286,10 +286,10 @@ SendPlayStart(RTMP *r) *enc++ = AMF_OBJECT_END; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } -static bool +static int SendPlayStop(RTMP *r) { RTMPPacket packet; @@ -318,7 +318,7 @@ SendPlayStop(RTMP *r) *enc++ = AMF_OBJECT_END; packet.m_nBodySize = enc - packet.m_body; - return RTMP_SendPacket(r, &packet, false); + return RTMP_SendPacket(r, &packet, FALSE); } static void @@ -470,7 +470,7 @@ ServeInvoke(STREAMING_SERVER *server, RT } AMFObject obj; - nRes = AMF_Decode(&obj, body, nBodySize, false); + nRes = AMF_Decode(&obj, body, nBodySize, FALSE); if (nRes < 0) { RTMP_Log(RTMP_LOGERROR, "%s, error decoding invoke packet", __FUNCTION__); @@ -1012,7 +1012,7 @@ stopStreaming(STREAMING_SERVER * server) void sigIntHandler(int sig) { - RTMP_ctrlC = true; + RTMP_ctrlC = TRUE; RTMP_LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig); if (rtmpServer) stopStreaming(rtmpServer); @@ -1043,7 +1043,7 @@ main(int argc, char **argv) defaultRTMPRequest.rtmpport = -1; defaultRTMPRequest.protocol = RTMP_PROTOCOL_UNDEFINED; - defaultRTMPRequest.bLiveStream = false; // is it a live stream? then we can't seek/resume + defaultRTMPRequest.bLiveStream = FALSE; // is it a live stream? then we can't seek/resume defaultRTMPRequest.timeout = 300; // timeout connection afte 300 seconds defaultRTMPRequest.bufferTime = 20 * 1000; Modified: trunk/rtmpsuck.c ============================================================================== --- trunk/rtmpsuck.c Wed Jun 2 18:15:24 2010 (r502) +++ trunk/rtmpsuck.c Wed Jun 2 18:52:55 2010 (r503) @@ -170,7 +170,7 @@ ServeInvoke(STREAMING_SERVER *server, in } AMFObject obj; - nRes = AMF_Decode(&obj, body, nBodySize, false); + nRes = AMF_Decode(&obj, body, nBodySize, FALSE); if (nRes < 0) { RTMP_Log(RTMP_LOGERROR, "%s, error decoding invoke packet", __FUNCTION__); @@ -280,7 +280,7 @@ ServeInvoke(STREAMING_SERVER *server, in else if (AVMATCH(&pname, &av_objectEncoding)) { server->rc.m_fEncoding = cobj.o_props[i].p_vu.p_number; - server->rc.m_bSendEncoding = true; + server->rc.m_bSendEncoding = TRUE; } /* Dup'd a string we didn't recognize? */ if (pval.av_val) @@ -301,7 +301,7 @@ ServeInvoke(STREAMING_SERVER *server, in /* failed */ return 1; } - server->rc.m_bSendCounter = false; + server->rc.m_bSendCounter = FALSE; } else if (AVMATCH(&method, &av_play)) { @@ -426,7 +426,7 @@ ServeInvoke(STREAMING_SERVER *server, in for (server->f_cur = server->f_head; server->f_cur && !server->f_cur->f_file; server->f_cur = server->f_cur->f_next) ; } - server->rc.m_bPlaying = true; + server->rc.m_bPlaying = TRUE; } // Return 1 if this is a Play.Complete or Play.Stop @@ -725,7 +725,7 @@ void doServe(STREAMING_SERVER * server, RTMPChunk rk = { 0 }; char *buf = NULL; unsigned int buflen = 131072; - bool paused = false; + int paused = FALSE; // timeout for http requests fd_set rfds; @@ -807,7 +807,7 @@ void doServe(STREAMING_SERVER * server, server->rc.m_pauseStamp = server->rc.m_channelTimestamp[server->rc.m_mediaChannel]; if (RTMP_ToggleStream(&server->rc)) { - paused = true; + paused = TRUE; continue; } } @@ -881,7 +881,7 @@ void doServe(STREAMING_SERVER * server, server->f_cur->f_file = NULL; server->f_cur = NULL; } - RTMP_SendPacket(&server->rc, &ps, false); + RTMP_SendPacket(&server->rc, &ps, FALSE); RTMPPacket_Free(&ps); break; } @@ -1107,7 +1107,7 @@ stopStreaming(STREAMING_SERVER * server) void sigIntHandler(int sig) { - RTMP_ctrlC = true; + RTMP_ctrlC = TRUE; RTMP_LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig); if (rtmpServer) stopStreaming(rtmpServer);

1 0

r502 - trunk/Makefile
by hyc 02 Jun '10

02 Jun '10

Author: hyc Date: Wed Jun 2 18:15:24 2010 New Revision: 502 Log: add XLIBS macro Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Jun 1 15:03:14 2010 (r501) +++ trunk/Makefile Wed Jun 2 18:15:24 2010 (r502) @@ -33,7 +33,7 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) +LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) THREADLIB_posix=-lpthread THREADLIB_mingw=

1 0

r501 - trunk/Makefile
by hyc 01 Jun '10

01 Jun '10

Author: hyc Date: Tue Jun 1 15:03:14 2010 New Revision: 501 Log: drop unused MF variable Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Jun 1 15:01:05 2010 (r500) +++ trunk/Makefile Tue Jun 1 15:03:14 2010 (r501) @@ -66,7 +66,7 @@ clean: FORCE: $(LIBRTMP): FORCE - @cd librtmp; $(MAKE) $(MF) all + @cd librtmp; $(MAKE) all # note: $^ is GNU Make's equivalent to BSD $> # we use both since either make will ignore the one it doesn't recognize

1 0

r500 - trunk/Makefile
by hyc 01 Jun '10

01 Jun '10

Author: hyc Date: Tue Jun 1 15:01:05 2010 New Revision: 500 Log: drop $(MAKEFLAGS), unnecessary Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Jun 1 00:53:34 2010 (r499) +++ trunk/Makefile Tue Jun 1 15:01:05 2010 (r500) @@ -57,7 +57,7 @@ install: progs cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) cp rtmpdump.1 $(MANDIR)/man1 cp rtmpgw.8 $(MANDIR)/man8 - @cd librtmp; $(MAKE) install $(MAKEFLAGS) + @cd librtmp; $(MAKE) install clean: rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)

1 0