[SCM] rtmpdump/master: Merge tag 'upstream/2.4+20121230.gitdf6c518'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.4+20121230.gitdf6c518
Remove a useless leftover comment
Only use one challenge value in adobe auth
Correct the length of base64 digests
Fix b77a7dc719f8b04274db91f6344f4358a78d9c5f
PolarSSL 1.2.x compat
Fix gnutls build
PolarSSL version fixes
Look for a fourth slash when splitting the url into app+playpath
Simplify initializing the TLS server context
More authentication cleanup
Cleanup authentication code
Fix dll name to have SO_VERSION
Add support for limelight authentication
Add adobe authentication support
Allocate the channel arrays dynamically
Free skipped packets in RTMP_GetNextMediaPacket
Use CRLF newlines consistently for all HTTP POST headers
Refill if HTTP_read indicated it needs more data
Don't require 144 bytes to be buffered before proceeding with HTTP_read
Buffer more data before returning successfully from HTTP_read, if needed
Add null termination to buffers before using strstr
Support rtmps in rtmpsrv
Add functions for doing server side TLS initialization
Replace hardcoded constants and comments with proper named constants
Allocate the RTMP struct dynamically
Cleanup prev commit
Handle AMF_ECMA_ARRAY and AMF_STRICT_ARRAY objects
Fix socks support for SetupURL
Fix compat with PolarSSL >= 1.1.0
Fix rare infinite loop on EOF
Fix bogus optarg refs in prev commit
Make rtmpgw handle full RTMP URLs with "-i"
Make rtmpdump handle full RTMP URLs with "-i"
Add option --realtime (-R) to rtmpdump to disable the BUFX hack
Add .gitignore to ignore generated files
Cleanup prev commit, drop gcrypt support
Add support for building with gnutls with nettle as backend
Fix upper bound check in AMF_GetProp
Remove extra object end tag in Connect reply
Support decoding AMF_XML_DOC
Fix log messages
Fix mismatched format string conversions
Tell gcc about log format strings
Fix missing log message parameter
Check for malloc failure in prev commit
Calculate tcUrl length
Spell Referer according to RFC1945
Increase tcUrl buffer size
Fix getting swf hash with https URLs
Fix bytes-received report
fixed undefined behaviour due to union assignment
PolarSSL support now requires version 1.0.0.
Add RD_NO_CONNECT return code for Connect failures
Fix AVreplace for usherToken
Fix <arpa/inet.h> include order
Unexpected BW Response Fix
Cleanup previous commit
Justin.TV usherToken detection
Darwin dylib updates
Plug potential memleak
Fix MDH_free() for PolarSSL
Don't try to close an already closed socket
Check the return value from RTMP_SendBytesReceived()
Generate and install an import lib for the built DLL
Create the SODIR, too
Remove the generated pkg-config file on make clean
Regenerate HTML docs, minor tweaks
Squashed commit of the following:
v2.4 changes
Version bump
Additional credit for RTMPE 9 keys
Add LIB_RTMP macro
Add RTMPE type 9 handshake signature
Revert "Drop back on the handshake version, avoid rtmpe 9"
add -shared to mingw ldflags, fixes compilation error patch by Martin Storsjo
Use symbolic constants for packet types. From Peter Miller @ opensource.org.au
Handle multiple sessions at once (ugly)
Handle Play.PublishNotify like Play.Start
Fix prev commit
Drop back on the handshake version, avoid rtmpe 9
Fix rtmpt read hangs
Bump up play command buffer sizes
Fix typos in prev commit
Add Libs.private to pkgconfig for Windows
Fix FLV timestamps during resume
Fix infinite loop on Error/Close
Timeout fix from Antti Ajanki
Log error message for unsupported SWF Verification types
Less case-sensitive check for Content-length: header
Substitute libdir in pkgconfig file
More dynlib tweaks
Fixes for Darwin - use dylib, not bundle for shared lib
MacOSX/Darwin shared library flags
Fix install target
Don't link explicitly against static library
Update XBOX/XBMC support
Remove obsolete XBOX defs
Hide strtime()
Update from prev commit
Document the escape coding used for special characters in values
Fix typo
zlib dependency is only when CRYPTO is enabled
Default to SYS=posix, parent Makefile may not have run
Also delete shared libs on clean
2.3 notes about shared library
Add mingw DLL install support
Add -lz and MinGW support
Bumping version to 2.3 to highlight shared lib support
Only send CheckBW request once
Fix prev commit
Cleanup prev commit
Fix tcUrl generation, free it on close if needed
Skip repeated spaces between URL options
Check for duplicate invocations
Notes for 2.2f
Fix bogus switch statement
Fix skipping extension
m_read.buf cannot be freed if we were still searching for the header
casting hbuf to unsigned doesn't seem to work, just declare it unsigned
Add ping/pong msg, from mybiiter at gmail.com. (Untested. Used with "ustream"?)
Simple rules for shared lib, v2.2f
bump libversion to 2.2f
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.
Always use .flv extension for output
Regenerate
formatting/typos
Note librtmp is LGPL
Update FSF address in license notice
move TRUE/FALSE defs to public header, just in case
Kill all use of bool, just use int
add XLIBS macro
drop unused MF variable
drop $(MAKEFLAGS), unnecessary
RTMP_Write buf is const
Fix RC4 teardown for GnuTLS/gcrypt
Note RTMP_EnableWrite
Tweak install vars
Add install targets for tools and docs
Makefile tweaks, use SYS= macro instead of platform targets
2.2e notes
Bump to version 2.2e
Add RTMP_EnableWrite() for publishing instead of reading
Finally fix the half-assed request/result queue
Read buffer fixes: We overallocated the buf by 4 bytes, but the result may not have needed the extra space. Also, don't return without reading at least one packet. (Alternative: return early, but set EAGAIN...)
Just return 1 packet's worth of data at a time from RTMP_Read()
Cleanup declaration
Revert unintended commit
Give up dataType search if we run out of buffer
Use metadata to set dataType, to help finish dataType search earlier
Fix RTMP_Read, return 0 on EOF, not -1
Fix swfinfo path on Xbox
Document what we know about Stream BufferEmpty and BufferReady messages
Very rudimentary library overview, read rtmp.h for more details
Don't use the BufferEmpty toggle trick by default in librtmp, but set it by default in rtmpdump
Whitespace in prev commit
Fix rtmpt clientID was not NUL-terminated
More XBOX cleanup, just use _WIN32 which is defined on both
Update docs for rtmpts
Looks like rtmps doesn't tunnel by default, so add rtmpts
XBOX compatibility patches (Mostly same as WIN32)
Add --playlist option
Updates for 2.2d
Clarify NO_SSL initialization
Add -DNO_SSL option for omitting SSL support (just use rtmpe, no rtmps)
Don't strip suffix if prefix was already present
Add support for polarssl, http://www.polarssl.org
More explicit OpenSSL check
Check OpenSSL version
Add support for set_playlist command
Restructure Link booleans into bitflags
Tweak client version based on encryption status
Fix whitespace
Fix: if playpath begins with '?' just use the remainder
Drop unneeded Debug
More trivial cleanup
whitespace cleanup
Fix timestamps in FLV packets
Fix digest offset computation, handshake versions
Tweak pkgconfig libs
Windows - use ws2tcpip.h, drop our bogus socklen_t define
Windows GNUTLS needs explicit -lgcrypt
Use winsock2.h, not winsock.h
Set CROSS_COMPILE for ar
v2.2c stuff. not much user-visible
More cleanup
C89 compatibility
Leave CRYPTO defined by default, use "make CRYPTO=" to turn it off.
cleanup: dTime -> iTime
Fix pause debug msg
Rename default log handler
Add missing LogSetCallback
Restructure logging, add log callback
Fix prev commit - hashswf must always be present
Drop #ifdef CRYPTO from rtmp.h; apps have no way to know any more if CRYPTO is defined or not
Move -DCRYPTO to Makefile from rtmp.h
HashSWF depends on CRYPTO
include <stddef.h>
releaseStream, FCpublish, FCunpublish get no _results
cleanup sendplay log msg, plug m_read memleak
Make sure install directories exist
<stdbool.h> isn't as standard as some people claim...
Silence prototype warnings
Check length for unescape
Revert prev commit, use \xx for escaping spaces
Can't use URL coding for embedded spaces in SetupURL. Instead use TAB combos
Cleanup tabs, URLdecode options in SetupURL
All timestamps are 32 bit ints
Cleanup prev commit
Option restructuring, allow most options to be passed along with the RTMP URL, clean up
Use AVal for hostname and sockshost, don't allocate hostnames
Downgrade from FP9 handshake on plain RTMP and non-Adobe server
Fix #undef CRYPTO case
Cleanup LogHex, just print 16 bytes per line
Fix prev commit
Cleanup prev
Child process must exit if exec failed. (exec should never fail unless your PATH is messed up)
Abort on unrecognized options
Fix buffer errors
Timestamp may be absolute or relative when read off the wire, but is always absolute when we return a pkt to caller
delete packet->m_nInfoField1, it's just the timestamp
Fix typo
Cleanup prev commit
Workaround $(MAKEFLAGS) bug in gmake 3.81
2.2b update
v2.2b
Add accessors for debuglevel, libversion, ctrlC, to avoid external programs depending on library internal variables.
Add Requires: line for crypto lib
Add install target, create pkgconfig for install
Check for valid socket before setting in fdset
Full debug for server handshake
(ugly) add FP10 support for server handshake
Export RTMP_SendClientBW()
More fixes due to -r369
Fix init bug from -r369
Fix Win32 HOME location again
Fix typo for --auth
GNU vs BSD make syntax issues
Update 2.2a notes
Initialization fixes
Rename AMF_Log -> RTMP_Log, cleanup
Remainder of gnutls support
Cleanup
Use GnuTLS/gcrypt for HMAC/RC4
Add GnuTLS/Gcrypt support for DH key exchange
More cleanups for SendPacket: timestamps, header type, etc.
More for RTMP_Write, cleanup on Close
And more for RTMP_Write
More for RTMP_Write
More for RTMP_Write
More for RTMP_Write
Partial RTMP_Write implementation
Handle UnpublishNotify for live streams
Fix seek timestamp
Declare struct sockaddr
Use HOMEPATH on Windows, not HOME
Partial revert of prev commit, not needed
Always send tcUrl
Rever -r343, app is not required
More cleanup
Fix status reporting
app is a required parameter
Drop redundant CRYPTO #def
Private header file
Hide _debug output
Fix pause/seek status
Use explicit AMF_debuglevel
Consolidate RTMP_READ booleans
Namespace cleanup
Tweak prev commit
Don't #define closesocket if someone else has
Initialize port
Use RTMP_Read()
Add RTMP_Read() to simplify library usage
Note FLV header fix
Silence spurious warning
Cache initial packets, don't write header till we know the dataType
Cache initial packets, don't write header till we know the dataType
Rework WriteStream arguments
Notes for 2.2a
Document rmtpt support
Drop assert
More for rtmpt
Cleanup whitespace
Fix default ports
Preliminary rtmpt support - needs work...
Fix ssl close
RTMPE is now protocol #2, not #3
Preliminary support for SSL
Fix hostname parsing
Default version is <OS> 10,0,32,18
Move Default flashVer into library, let SetupStream set the default
Cleanup m_sb compat macros
More log.h cleanup
Drop log.h from rtmp.h
0 is a valid fd
Publish RTMP_SendSeek()
Fix license header
C++ compat, move parseurl to librtmp
Cleanup ARM example
Note where to get OpenSSL DLL for Windows
Add HTML versions of manpages
Cleanup
Cleanup
Manpage for rtmpgw
Add socks option
More typos
Fix typos
streams -> rtmpgw
Move librtmp to separate directory, relicense as LGPL
More typos
Add ENVIRONMENT
Add Exit Status info
Fix AMF_EncodeString to handle Long Strings
Fix decoding of Long Strings
Renamed streams program to rtmpgw
Fix Play/Stop responses
Fix typos
Cleanup
Manpage
Move rtmp.o, amf.o, log.o, hashswf.o to librtmp.a
Cleanup more endian cruft
More FP10 handshake support.
Account for quotes in cmd string
Expand public API
Fix SEGV when swfUrl is NULL
Cleanup iptables / ipfw info
Portability fixes
Partial revert of prev commit
Fix typo
v2.1d updates
Notes for v2.1d
Spawn rtmpdump directly, don't just print the cmdline
Log a final status update when stopping
Derive output name from playpath. (Code copied from rtmpsuck)
Don't advance to next file if playlist has only one file
Fix debug msg
Ignore ctrl 31/32 in live streams
Fix r248
More fixes for pause/resume - don't overwrite pauseStamp if already paused
Cleanup prev commits
>From Antti Ajanki: expose http_get()
Fix audio resume bug
Minor fixes from Antti Ajanki
Another timestamp fix, same as r202
Fix r239, there are 4 fields per record now
Silence warning
Prep for FlashPlayer10 handshake support. (Probably should choose offset based on plaintext vs encrypted...) Only 128 bits are needed for DH key, not 1024.
Drop osx-specific rules. Don't mention cygwin or any other platforms. Just override from the command line if you need other settings.
Allow zero swfAge to force HTTP check every time
Add ctim to ~/.swfinfo, recording the last time we checked on the info for a given SWF. Use Age parameter to control how often we check.
Log BytesReceived reports from client
Don't send our own byte counts, the real client will
Split RTMP_Connect up, add m_bSendCounter flag; proxy doesn't need to send byte counts since the real client/server will.
Use __APPLE__ instead of __MACOSX__
Note parseurl fix for extensions
Handle extensions followed by URL parameters
Close both connections on cleanup
Tweak SendChunk to use a single WriteN call
Skip leading dot in filenames
Cleanup unused field
Fix typo in comment
rtmpdump params should be printed on stdout
Fix AMF_Decode() end detection
Use double quotes instead of single quotes for output
Fix typo
Also support NULL for --conn parameters
Notes for connect params
more for 2.1c, arbitrary AMF data in connect requests
Add --conn|-C option to append arbitrary AMF data to connect request
More 2.1c misc
Fallback to Reconnect if ToggleStream didn't work, then give up if both fail
Changes for 2.1c
Format rtmpsrv output as an rtmpdump commandline for copy/paste
Only flush LogPrintf() if output ends with \n
Fixed per-chunk sending
Partially revert -r200, per-chunk sending is fragile at the moment
More cleanup
Fix timestamp due to amf fixes, fix buf mgmt due to header changes
Simplify playlist handling
Relay data in chunks instead of full packets, to reduce latency. Support multiple outstanding Play requests.
Add RTMP_SendChunk() for sending incomplete packets. Add m_header to packet, for a copy of a received packet's raw header
Plug mem leaks
app is parsed from url
Failing to respond to SWF Verification request is an error, not a warning
Use unsigned int for timestamps
Fixes for extended timestamps, bounds checks
Don't try to close server->socket multiple times
Fix typo
Restore 'v' that was dropped from version by mistake
Fix prev commit
Add optional packet param to RTMP_Connect(); rtmpsuck will just send the original connect packet instead of generating its own.
playpath needs to be url-decoded
Updates for 2.1b
Fix URL matching in file check
Handle getStreamLength
More logging cleanup
Cleanup filename some more, close immediately if client goes away and we don't have an active stream from the server.
Close the session on close request
Add flag for sending objectEncoding even if it's zero
Fix typo
Fix bufferSize in resume
Always flush log output
revert accidental commit
Cleanup CRYPTO dependencies
Zap colons in playpath
Fix: handle auth parameters in connect request
Fix WIN32 timeout handling
2.1a updates: copyright year, streams description in README
More cleanup for prev commit
Cleanup prev commit
Fix SO_RCVTIMEO for WIN32
Need <errno.h> here too
More thread cleanup
Add some messages for failures
Silence warning
More for warnings
comment out unused functions to silence warnings
Move thread support to its own files
More cleanup for mingw
More cleanup
Cleanup
Refactor a bit for WIN32 compatibility
HashSWF(,ask)
Add 'ask' param back to HashSWF, expose HandlePacket as RTMP_ClientPacket
Fix prev commit
Prep for 2.1; use Referrer in HashSWF
Rename SWFVerify() to RTMP_HashSWF(), rename swfvfy.c to hashswf.c
Strip unused stuff, close output file on Netstream.Play.Stop
Notes about rtmpsuck.
Add -z option to enable debug
Write headers for 0-length packets
More fixes for SendPacket channels
Use m_outChunkSize
Change chunksize as needed, don't talk to HTTP server if we already have cached hash, other packet processing fixes
Add "ask" param, don't talk to HTTP server if we already have cached hash
Add separate in/out chunk size, fix channels in SendPacket, add packet logging
Make LogHexString() more usable, add DEBUG2 level
Drop libcurl stuff
Check for fopen failing
Fix prev commit
Add transparent proxy server, work in progress.
Expose RTMP_SendCtrl, tweak RTMPPacket_Alloc to reserve space for header
Strip trailing params from swfurl in saved copy
Note that Curl and Zlib are now required
Add note about automatic SWF verification
Automate SWF verification, use -W instead of -s
Restore Windows compatibility patches
Add note about rtmpsrv
Ignore zero-length packets during connect
Add missing notices
Cleanup, comments on TEA
Fix typo in r114
SecureToken support
Minor cleanup
Fix typo in verifying client signature
Fix typo in retrieving client digestpos
Log client's destination IP address, in case it was redirected
s/server/peer/ now that we support both sides
Allow AMF3 encoding
Add dummy RTMP server. Doesn't serve any data, just sucks up connection parameters from a client.
Change AMF_Encode* APIs to include buffer end checking, restructure...
Added server-side handshaking. Will probably split these files later...
Silence spurious warning
Restructure, always send 2nd handshake packet before reading 2nd packet
Minor cleanup
Allow longer URLs for subscribepath
Always log Invokes, even if we don't exepct a _result
Fix whitespace in debug
Win32 thread support
Reindent
More cleanup
Convert streams to C
Notes for 2.0
More namespace cleanup
More MinGW stuff
MinGW portability fixes
Plug memory leaks
Hide DH helpers
Move bytes.c functions out of main namespace
Drop C++ from Makefile
Remove C++ code from trunk
Move new C code to trunk
Use trunk for main development
Split off a tags directory for release tagging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a50be3fd7ef11d70a2daa2d1160613efb763a30b
X-Git-Newrev: c389dcba8856763a2e664d04dd53133138e643b0

The following commit has been merged in the master branch:
commit a97d9f5677f95a0798f5a0fabdf276a1967aae7e
Merge: a50be3fd7ef11d70a2daa2d1160613efb763a30b dddf759061475eb620b179d406eea3e6e1320f43
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 1 11:58:50 2013 +0200

    Merge tag 'upstream/2.4+20121230.gitdf6c518'
    
    Upstream version 2.4+20121230.gitdf6c518


-- 
rtmpdump packaging