mxe-octave: src/librtmp-2-master.patch annotate

annotate src/librtmp-2-master.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4

author	John Donoghue
date	Mon, 20 Oct 2014 11:01:00 -0400
parents	5136e4e6e487
children

rev	line source
2586 5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1 From dc762e41a090b5c238bd7daedab13def69eb140b Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2 From: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	3 Date: Thu, 21 Jul 2011 17:10:13 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	4 Subject: [PATCH 01/33] Squashed commit of the following:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	5
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	6 commit 84b160fdc8e6aaff9b5b214d90e8f002cc4185dd
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	7 Author: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	8 Date: Wed Jul 20 23:09:26 2011 +0200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	9
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	10 Updates man .. again
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	11
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	12 commit 717c562b844595f5b24da268a5f5203d921ebc89
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	13 Author: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	14 Date: Wed Jul 20 21:00:44 2011 +0200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	15
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	16 More updates in man files, regenerating HTML files needed
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	17
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	18 commit 8196cf03b2ff7b9483166302bf79a0760fed2772
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	19 Author: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	20 Date: Wed Jul 20 20:42:41 2011 +0200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	21
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	22 Updates ChangeLog
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	23
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	24 commit 7a6931cffd0ffd2d0997ffed2bd7609e9a043387
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	25 Author: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	26 Date: Wed Jul 20 20:37:40 2011 +0200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	27
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	28 Updates man files, regenerating HTML files is needed
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	29
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	30 commit 1cb67af20bb4085b87123299956c6b4d2d2b1484
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	31 Author: toine512 <toine512@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	32 Date: Wed Jul 20 20:03:16 2011 +0200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	33
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	34 Implements Justin.tv support (NetStream.Authenticate.UsherToken)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	35 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	36 ChangeLog \| 3 +++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	37 librtmp/librtmp.3 \| 7 +++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	38 librtmp/rtmp.c \| 44 ++++++++++++++++++++++++++++++++++++++++++++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	39 librtmp/rtmp.h \| 2 ++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	40 rtmpdump.1 \| 9 +++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	41 rtmpdump.c \| 11 +++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	42 rtmpgw.8 \| 9 +++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	43 rtmpgw.c \| 11 +++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	44 rtmpsrv.c \| 1 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	45 9 files changed, 87 insertions(+), 10 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	46
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	47 diff --git a/ChangeLog b/ChangeLog
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	48 index fb2319f..c3b1a14 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	49 --- a/ChangeLog
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	50 +++ b/ChangeLog
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	51 @@ -4,6 +4,9 @@ Copyright 2009-2011 Howard Chu
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	52 Copyright 2009 The Flvstreamer Team
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	53 http://rtmpdump.mplayerhq.hu/
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	54
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	55 +20 July 2011
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	56 +- add NetStream.Authenticate.UsherToken for Justin.tv
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	57 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	58 11 July 2011, v2.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	59 - add RTMPE type 9 handshake support
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	60
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	61 diff --git a/librtmp/librtmp.3 b/librtmp/librtmp.3
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	62 index 66197d5..7c424aa 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	63 --- a/librtmp/librtmp.3
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	64 +++ b/librtmp/librtmp.3
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	65 @@ -1,5 +1,5 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	66 -.TH LIBRTMP 3 "2010-07-03" "RTMPDump v2.3"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	67 -.\" Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	68 +.TH LIBRTMP 3 "2011-07-20" "RTMPDump v2.4"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	69 +.\" Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	70 .\" Copying permitted according to the GNU General Public License V2.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	71 .SH NAME
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	72 librtmp \- RTMPDump Real-Time Messaging Protocol API
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	73 @@ -161,6 +161,9 @@ These options handle additional authentication requests from the server.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	74 Key for SecureToken response, used if the server requires SecureToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	75 authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	76 .TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	77 +.BI jtv= JSON
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	78 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	79 +.TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	80 .BI swfVfy= 0\|1
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	81 If the value is 1 or TRUE, the SWF player is retrieved from the
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	82 specified
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	83 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	84 index 5ef3ae9..adcff1f 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	85 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	86 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	87 @@ -96,6 +96,7 @@ static int SendDeleteStream(RTMP *r, double dStreamId);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	88 static int SendFCSubscribe(RTMP r, AVal subscribepath);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	89 static int SendPlay(RTMP *r);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	90 static int SendBytesReceived(RTMP *r);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	91 +static int SendUsherToken(RTMP r, AVal usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	92
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	93 #if 0 /* unused */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	94 static int SendBGHasStream(RTMP r, double dId, AVal playpath);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	95 @@ -335,6 +336,7 @@ RTMP_SetupStream(RTMP *r,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	96 uint32_t swfSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	97 AVal *flashVer,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	98 AVal *subscribepath,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	99 + AVal *usherToken,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	100 int dStart,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	101 int dStop, int bLiveStream, long int timeout)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	102 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	103 @@ -355,6 +357,8 @@ RTMP_SetupStream(RTMP *r,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	104 RTMP_Log(RTMP_LOGDEBUG, "auth : %s", auth->av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	105 if (subscribepath && subscribepath->av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	106 RTMP_Log(RTMP_LOGDEBUG, "subscribepath : %s", subscribepath->av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	107 + if (usherToken && usherToken->av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	108 + RTMP_Log(RTMP_LOGDEBUG, "NetStream.Authenticate.UsherToken : %s", usherToken->av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	109 if (flashVer && flashVer->av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	110 RTMP_Log(RTMP_LOGDEBUG, "flashVer : %s", flashVer->av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	111 if (dStart > 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	112 @@ -420,6 +424,8 @@ RTMP_SetupStream(RTMP *r,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	113 r->Link.flashVer = RTMP_DefaultFlashVer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	114 if (subscribepath && subscribepath->av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	115 r->Link.subscribepath = *subscribepath;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	116 + if (usherToken && usherToken->av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	117 + r->Link.usherToken = *usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	118 r->Link.seekTime = dStart;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	119 r->Link.stopTime = dStop;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	120 if (bLiveStream)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	121 @@ -477,6 +483,8 @@ static struct urlopt {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	122 "Stream is live, no seeking possible" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	123 { AVC("subscribe"), OFF(Link.subscribepath), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	124 "Stream to subscribe to" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	125 + { AVC("jtv"), OFF(Link.usherToken), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	126 + "Justin.tv authentication token" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	127 { AVC("token"), OFF(Link.token), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	128 "Key for SecureToken response" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	129 { AVC("swfVfy"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_SWFV,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	130 @@ -1641,6 +1649,39 @@ SendFCSubscribe(RTMP r, AVal subscribepath)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	131 return RTMP_SendPacket(r, &packet, TRUE);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	132 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	133
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	134 +//Justin.tv specific authentication
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	135 +static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken"); //SAVC() isn't suitable for that
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	136 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	137 +static int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	138 +SendUsherToken(RTMP r, AVal usherToken)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	139 +{
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	140 + RTMPPacket packet;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	141 + char pbuf[1024], *pend = pbuf + sizeof(pbuf);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	142 + char *enc;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	143 + packet.m_nChannel = 0x03; /* control channel (invoke) */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	144 + packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	145 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	146 + packet.m_nTimeStamp = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	147 + packet.m_nInfoField2 = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	148 + packet.m_hasAbsTimestamp = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	149 + packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	150 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	151 + RTMP_Log(RTMP_LOGDEBUG, "UsherToken: %s", usherToken->av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	152 + enc = packet.m_body;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	153 + enc = AMF_EncodeString(enc, pend, &av_NetStream_Authenticate_UsherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	154 + enc = AMF_EncodeNumber(enc, pend, ++r->m_numInvokes);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	155 + *enc++ = AMF_NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	156 + enc = AMF_EncodeString(enc, pend, usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	157 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	158 + if (!enc)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	159 + return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	160 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	161 + packet.m_nBodySize = enc - packet.m_body;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	162 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	163 + return RTMP_SendPacket(r, &packet, FALSE);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	164 +}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	165 +/******************************************/
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	166 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	167 SAVC(releaseStream);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	168
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	169 static int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	170 @@ -2364,6 +2405,9 @@ HandleInvoke(RTMP r, const char body, unsigned int nBodySize)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	171
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	172 if (!(r->Link.protocol & RTMP_FEATURE_WRITE))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	173 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	174 + /* Authenticate on Justin.tv legacy servers before sending FCSubscribe */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	175 + if (r->Link.usherToken.av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	176 + SendUsherToken(r, &r->Link.usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	177 /* Send the FCSubscribe if live stream or if subscribepath is set */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	178 if (r->Link.subscribepath.av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	179 SendFCSubscribe(r, &r->Link.subscribepath);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	180 diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	181 index 1ece207..6b2ae5b 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	182 --- a/librtmp/rtmp.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	183 +++ b/librtmp/rtmp.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	184 @@ -155,6 +155,7 @@ extern "C"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	185 AVal auth;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	186 AVal flashVer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	187 AVal subscribepath;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	188 + AVal usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	189 AVal token;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	190 AMFObject extras;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	191 int edepth;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	192 @@ -297,6 +298,7 @@ extern "C"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	193 uint32_t swfSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	194 AVal *flashVer,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	195 AVal *subscribepath,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	196 + AVal *usherToken,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	197 int dStart,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	198 int dStop, int bLiveStream, long int timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	199
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	200 diff --git a/rtmpdump.1 b/rtmpdump.1
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	201 index 2395de9..0d9de8d 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	202 --- a/rtmpdump.1
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	203 +++ b/rtmpdump.1
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	204 @@ -1,5 +1,5 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	205 -.TH RTMPDUMP 1 "2010-05-02" "RTMPDump v2.2e"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	206 -.\" Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	207 +.TH RTMPDUMP 1 "2011-07-20" "RTMPDump v2.4"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	208 +.\" Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	209 .\" Copying permitted according to the GNU General Public License V2.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	210 .SH NAME
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	211 rtmpdump \- RTMP streaming media client
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	212 @@ -51,6 +51,8 @@ rtmpdump \- RTMP streaming media client
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	213 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	214 .BI \-T \ key\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	215 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	216 +.BI \-j \ JSON\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	217 +[\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	218 .BI \-w \ swfHash\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	219 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	220 .BI \-x \ swfSize\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	221 @@ -210,6 +212,9 @@ These options handle additional authentication requests from the server.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	222 Key for SecureToken response, used if the server requires SecureToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	223 authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	224 .TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	225 +\fB\-\-jtv \-j\fP\ \fIJSON\fP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	226 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	227 +.TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	228 \fB\-\-swfhash \-w\fP\ \fIhexstring\fP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	229 SHA256 hash of the decompressed SWF file. This option may be needed if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	230 the server uses SWF Verification, but see the
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	231 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	232 index c1cd95b..ec1de85 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	233 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	234 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	235 @@ -692,6 +692,8 @@ void usage(char *prog)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	236 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	237 ("--token\|-T key Key for SecureToken response\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	238 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	239 + ("--jtv\|-j JSON Authentication token for Justin.tv legacy servers\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	240 + RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	241 ("--hashes\|-# Display progress with hashes, not with the byte counter\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	242 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	243 ("--buffer\|-b Buffer time in milliseconds (default: %lu)\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	244 @@ -738,6 +740,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	245 AVal hostname = { 0, 0 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	246 AVal playpath = { 0, 0 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	247 AVal subscribepath = { 0, 0 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	248 + AVal usherToken = { 0, 0 }; //Justin.tv auth token
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	249 int port = -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	250 int protocol = RTMP_PROTOCOL_UNDEFINED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	251 int retries = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	252 @@ -839,12 +842,13 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	253 {"debug", 0, NULL, 'z'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	254 {"quiet", 0, NULL, 'q'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	255 {"verbose", 0, NULL, 'V'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	256 + {"jtv", 1, NULL, 'j'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	257 {0, 0, 0, 0}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	258 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	259
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	260 while ((opt =
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	261 getopt_long(argc, argv,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	262 - "hVveqzr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	263 + "hVveqzr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#j:",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	264 longopts, NULL)) != -1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	265 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	266 switch (opt)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	267 @@ -1051,6 +1055,9 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	268 case 'S':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	269 STR2AVAL(sockshost, optarg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	270 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	271 + case 'j':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	272 + STR2AVAL(usherToken, optarg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	273 + break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	274 default:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	275 RTMP_LogPrintf("unknown option: %c\n", opt);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	276 usage(argv[0]);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	277 @@ -1167,7 +1174,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	278
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	279 RTMP_SetupStream(&rtmp, protocol, &hostname, port, &sockshost, &playpath,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	280 &tcUrl, &swfUrl, &pageUrl, &app, &auth, &swfHash, swfSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	281 - &flashVer, &subscribepath, dSeek, dStopOffset, bLiveStream, timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	282 + &flashVer, &subscribepath, &usherToken, dSeek, dStopOffset, bLiveStream, timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	283
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	284 /* Try to keep the stream moving if it pauses on us */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	285 if (!bLiveStream && !(protocol & RTMP_FEATURE_HTTP))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	286 diff --git a/rtmpgw.8 b/rtmpgw.8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	287 index 197a2d6..0a231b4 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	288 --- a/rtmpgw.8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	289 +++ b/rtmpgw.8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	290 @@ -1,5 +1,5 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	291 -.TH RTMPGW 8 "2010-05-02" "RTMPDump v2.2e"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	292 -.\" Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	293 +.TH RTMPGW 8 "2011-07-20" "RTMPDump v2.4"
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	294 +.\" Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	295 .\" Copying permitted according to the GNU General Public License V2.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	296 .SH NAME
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	297 rtmpgw \- RTMP streaming media gateway
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	298 @@ -50,6 +50,8 @@ rtmpgw \- RTMP streaming media gateway
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	299 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	300 .BI \-T \ key\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	301 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	302 +.BI \-j \ JSON\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	303 +[\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	304 .BI \-w \ swfHash\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	305 [\c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	306 .BI \-x \ swfSize\fR]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	307 @@ -193,6 +195,9 @@ These options handle additional authentication requests from the server.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	308 Key for SecureToken response, used if the server requires SecureToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	309 authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	310 .TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	311 +\fB\-\-jtv \-j\fP\ \fIJSON\fP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	312 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	313 +.TP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	314 \fB\-\-swfhash \-w\fP\ \fIhexstring\fP
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	315 SHA256 hash of the decompressed SWF file. This option may be needed if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	316 the server uses SWF Verification, but see the
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	317 diff --git a/rtmpgw.c b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	318 index 10a99e8..ce7319a 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	319 --- a/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	320 +++ b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	321 @@ -95,6 +95,7 @@ typedef struct
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	322 AVal flashVer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	323 AVal token;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	324 AVal subscribepath;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	325 + AVal usherToken; //Justin.tv auth token
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	326 AVal sockshost;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	327 AMFObject extras;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	328 int edepth;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	329 @@ -552,7 +553,7 @@ void processTCPrequest(STREAMING_SERVER * server, // server socket and state (ou
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	330 RTMP_Init(&rtmp);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	331 RTMP_SetBufferMS(&rtmp, req.bufferTime);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	332 RTMP_SetupStream(&rtmp, req.protocol, &req.hostname, req.rtmpport, &req.sockshost,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	333 - &req.playpath, &req.tcUrl, &req.swfUrl, &req.pageUrl, &req.app, &req.auth, &req.swfHash, req.swfSize, &req.flashVer, &req.subscribepath, dSeek, req.dStopOffset,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	334 + &req.playpath, &req.tcUrl, &req.swfUrl, &req.pageUrl, &req.app, &req.auth, &req.swfHash, req.swfSize, &req.flashVer, &req.subscribepath, &req.usherToken, dSeek, req.dStopOffset,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	335 req.bLiveStream, req.timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	336 /* backward compatibility, we always sent this as true before */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	337 if (req.auth.av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	338 @@ -953,6 +954,9 @@ ParseOption(char opt, char arg, RTMP_REQUEST req)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	339 case 'z':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	340 RTMP_debuglevel = RTMP_LOGALL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	341 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	342 + case 'j':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	343 + STR2AVAL(req->usherToken, arg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	344 + break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	345 default:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	346 RTMP_LogPrintf("unknown option: %c, arg: %s\n", opt, arg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	347 return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	348 @@ -1023,6 +1027,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	349 {"debug", 0, NULL, 'z'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	350 {"quiet", 0, NULL, 'q'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	351 {"verbose", 0, NULL, 'V'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	352 + {"jtv", 1, NULL, 'j'},
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	353 {0, 0, 0, 0}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	354 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	355
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	356 @@ -1035,7 +1040,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	357
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	358 while ((opt =
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	359 getopt_long(argc, argv,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	360 - "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:S:", longopts,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	361 + "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:T:g:w:x:W:X:S:j:", longopts,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	362 NULL)) != -1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	363 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	364 switch (opt)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	365 @@ -1095,6 +1100,8 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	366 ("--stop\|-B num Stop at num seconds into stream\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	367 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	368 ("--token\|-T key Key for SecureToken response\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	369 + RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	370 + ("--jtv\|-j JSON Authentication token for Justin.tv legacy servers\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	371 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	372 ("--buffer\|-b Buffer time in milliseconds (default: %lu)\n\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	373 defaultRTMPRequest.bufferTime);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	374 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	375 index f1b6c66..cf52bfa 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	376 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	377 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	378 @@ -116,6 +116,7 @@ typedef struct
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	379 AVal swfHash;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	380 AVal flashVer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	381 AVal subscribepath;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	382 + AVal usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	383 uint32_t swfSize;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	384
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	385 uint32_t dStartOffset;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	386 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	387 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	388
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	389
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	390 From a2fb387404cb0da99cf439d58478fff701398700 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	391 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	392 Date: Thu, 21 Jul 2011 17:31:14 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	393 Subject: [PATCH 02/33] Regenerate HTML docs, minor tweaks
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	394
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	395 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	396 librtmp/librtmp.3.html \| 10 ++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	397 librtmp/rtmp.c \| 6 +++---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	398 rtmpdump.1.html \| 11 +++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	399 rtmpdump.c \| 6 +++---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	400 rtmpgw.8.html \| 11 +++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	401 rtmpgw.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	402 rtmpsrv.c \| 1 -
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	403 7 files changed, 33 insertions(+), 14 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	404
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	405 diff --git a/librtmp/librtmp.3.html b/librtmp/librtmp.3.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	406 index e5e6f4b..6f59851 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	407 --- a/librtmp/librtmp.3.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	408 +++ b/librtmp/librtmp.3.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	409 @@ -6,10 +6,10 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	410 <tr><td>LIBRTMP(3)<td align="center"><td align="right">LIBRTMP(3)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	411 </thead>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	412 <tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	413 -<tr><td>RTMPDump v2.3<td align="center">2010-07-03<td align="right">LIBRTMP(3)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	414 +<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">LIBRTMP(3)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	415 </tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	416 <tbody><tr><td colspan="3"><br><br><ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	417 -<!-- Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	418 +<!-- Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	419 Copying permitted according to the GNU General Public License V2.-->
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	420 </ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	421
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	422 @@ -238,6 +238,12 @@ authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	423 </dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	424 <p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	425 <dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	426 +<b>jtv=</b><i>JSON</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	427 +<dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	428 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	429 +</dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	430 +<p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	431 +<dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	432 <b>swfVfy=</b><i>0\|1</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	433 <dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	434 If the value is 1 or TRUE, the SWF player is retrieved from the
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	435 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	436 index adcff1f..8d76164 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	437 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	438 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	439 @@ -484,7 +484,7 @@ static struct urlopt {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	440 { AVC("subscribe"), OFF(Link.subscribepath), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	441 "Stream to subscribe to" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	442 { AVC("jtv"), OFF(Link.usherToken), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	443 - "Justin.tv authentication token" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	444 + "Justin.tv authentication token" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	445 { AVC("token"), OFF(Link.token), OPT_STR, 0,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	446 "Key for SecureToken response" },
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	447 { AVC("swfVfy"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_SWFV,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	448 @@ -1649,8 +1649,8 @@ SendFCSubscribe(RTMP r, AVal subscribepath)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	449 return RTMP_SendPacket(r, &packet, TRUE);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	450 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	451
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	452 -//Justin.tv specific authentication
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	453 -static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken"); //SAVC() isn't suitable for that
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	454 +/* Justin.tv specific authentication */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	455 +static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	456
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	457 static int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	458 SendUsherToken(RTMP r, AVal usherToken)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	459 diff --git a/rtmpdump.1.html b/rtmpdump.1.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	460 index 7f17636..826f722 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	461 --- a/rtmpdump.1.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	462 +++ b/rtmpdump.1.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	463 @@ -6,10 +6,10 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	464 <tr><td>RTMPDUMP(1)<td align="center"><td align="right">RTMPDUMP(1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	465 </thead>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	466 <tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	467 -<tr><td>RTMPDump v2.2e<td align="center">2010-05-02<td align="right">RTMPDUMP(1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	468 +<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">RTMPDUMP(1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	469 </tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	470 <tbody><tr><td colspan="3"><br><br><ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	471 -<!-- Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	472 +<!-- Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	473 Copying permitted according to the GNU General Public License V2.-->
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	474 </ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	475
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	476 @@ -42,6 +42,7 @@ rtmpdump − RTMP streaming media client
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	477 [<b>−b</b><i> buffer</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	478 [<b>−m</b><i> timeout</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	479 [<b>−T</b><i> key</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	480 +[<b>−j</b><i> JSON</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	481 [<b>−w</b><i> swfHash</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	482 [<b>−x</b><i> swfSize</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	483 [<b>−W</b><i> swfUrl</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	484 @@ -275,6 +276,12 @@ authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	485 </dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	486 <p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	487 <dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	488 +<b>−−jtv −j</b> <i>JSON</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	489 +<dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	490 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	491 +</dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	492 +<p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	493 +<dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	494 <b>−−swfhash −w</b> <i>hexstring</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	495 <dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	496 SHA256 hash of the decompressed SWF file. This option may be needed if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	497 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	498 index ec1de85..89c053a 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	499 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	500 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	501 @@ -1055,9 +1055,9 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	502 case 'S':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	503 STR2AVAL(sockshost, optarg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	504 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	505 - case 'j':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	506 - STR2AVAL(usherToken, optarg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	507 - break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	508 + case 'j':
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	509 + STR2AVAL(usherToken, optarg);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	510 + break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	511 default:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	512 RTMP_LogPrintf("unknown option: %c\n", opt);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	513 usage(argv[0]);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	514 diff --git a/rtmpgw.8.html b/rtmpgw.8.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	515 index 58b8f35..68d6734 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	516 --- a/rtmpgw.8.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	517 +++ b/rtmpgw.8.html
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	518 @@ -6,10 +6,10 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	519 <tr><td>RTMPGW(8)<td align="center"><td align="right">RTMPGW(8)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	520 </thead>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	521 <tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	522 -<tr><td>RTMPDump v2.2e<td align="center">2010-05-02<td align="right">RTMPGW(8)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	523 +<tr><td>RTMPDump v2.4<td align="center">2011-07-20<td align="right">RTMPGW(8)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	524 </tfoot>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	525 <tbody><tr><td colspan="3"><br><br><ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	526 -<!-- Copyright 2010 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	527 +<!-- Copyright 2011 Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	528 Copying permitted according to the GNU General Public License V2.-->
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	529 </ul>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	530
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	531 @@ -41,6 +41,7 @@ rtmpgw − RTMP streaming media gateway
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	532 [<b>−b</b><i> buffer</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	533 [<b>−m</b><i> timeout</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	534 [<b>−T</b><i> key</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	535 +[<b>−j</b><i> JSON</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	536 [<b>−w</b><i> swfHash</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	537 [<b>−x</b><i> swfSize</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	538 [<b>−W</b><i> swfUrl</i>]
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	539 @@ -249,6 +250,12 @@ authentication.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	540 </dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	541 <p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	542 <dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	543 +<b>−−jtv −j</b> <i>JSON</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	544 +<dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	545 +JSON token used by legacy Justin.tv servers. Invokes NetStream.Authenticate.UsherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	546 +</dl>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	547 +<p>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	548 +<dl compact><dt>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	549 <b>−−swfhash −w</b> <i>hexstring</i>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	550 <dd>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	551 SHA256 hash of the decompressed SWF file. This option may be needed if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	552 diff --git a/rtmpgw.c b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	553 index ce7319a..733e105 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	554 --- a/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	555 +++ b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	556 @@ -1100,7 +1100,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	557 ("--stop\|-B num Stop at num seconds into stream\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	558 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	559 ("--token\|-T key Key for SecureToken response\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	560 - RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	561 + RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	562 ("--jtv\|-j JSON Authentication token for Justin.tv legacy servers\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	563 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	564 ("--buffer\|-b Buffer time in milliseconds (default: %lu)\n\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	565 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	566 index cf52bfa..f1b6c66 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	567 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	568 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	569 @@ -116,7 +116,6 @@ typedef struct
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	570 AVal swfHash;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	571 AVal flashVer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	572 AVal subscribepath;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	573 - AVal usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	574 uint32_t swfSize;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	575
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	576 uint32_t dStartOffset;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	577 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	578 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	579
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	580
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	581 From ed99ad05b34031fac74230760c77d4d1a6a9e706 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	582 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	583 Date: Sat, 30 Apr 2011 14:29:58 +0300
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	584 Subject: [PATCH 03/33] Remove the generated pkg-config file on make clean
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	585
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	586 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	587 librtmp/Makefile \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	588 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	589
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	590 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	591 index d61e7a4..c95c8a6 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	592 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	593 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	594 @@ -76,7 +76,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	595 all: librtmp.a $(SO_LIB)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	596
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	597 clean:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	598 - rm -f .o .a .$(SOX) .$(SO_EXT)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	599 + rm -f .o .a .$(SOX) .$(SO_EXT) librtmp.pc
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	600
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	601 librtmp.a: $(OBJS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	602 $(AR) rs $@ $?
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	603 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	604 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	605
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	606
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	607 From 749018b7c7c4e0090ea17c104dc094ab74326c08 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	608 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	609 Date: Sat, 30 Apr 2011 14:30:00 +0300
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	610 Subject: [PATCH 04/33] Create the SODIR, too
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	611
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	612 When SYS=mingw, this differs from LIBDIR.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	613 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	614 librtmp/Makefile \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	615 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	616
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	617 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	618 index c95c8a6..aa4a339 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	619 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	620 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	621 @@ -100,7 +100,7 @@ librtmp.pc: librtmp.pc.in Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	622 install: install_base $(SO_INST)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	623
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	624 install_base: librtmp.a librtmp.pc
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	625 - -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	626 + -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	627 cp amf.h http.h log.h rtmp.h $(INCDIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	628 cp librtmp.a $(LIBDIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	629 cp librtmp.pc $(LIBDIR)/pkgconfig
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	630 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	631 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	632
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	633
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	634 From 9931c44867d157621ae10cf489ba336091dfab6b Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	635 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	636 Date: Sat, 30 Apr 2011 14:30:01 +0300
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	637 Subject: [PATCH 05/33] Generate and install an import lib for the built DLL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	638
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	639 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	640 librtmp/Makefile \| 8 +++++++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	641 1 file changed, 7 insertions(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	642
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	643 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	644 index aa4a339..b88baf4 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	645 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	646 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	647 @@ -54,9 +54,14 @@ SODIR=$(SODIR_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	648 SO_LDFLAGS_posix=-shared -Wl,-soname,$@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	649 SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	650 -headerpad_max_install_names
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	651 -SO_LDFLAGS_mingw=-shared
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	652 +SO_LDFLAGS_mingw=-shared -Wl,--out-implib,librtmp.dll.a
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	653 SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	654
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	655 +INSTALL_IMPLIB_posix=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	656 +INSTALL_IMPLIB_darwin=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	657 +INSTALL_IMPLIB_mingw=cp librtmp.dll.a $(LIBDIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	658 +INSTALL_IMPLIB=$(INSTALL_IMPLIB_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	659 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	660 SHARED=yes
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	661 SODEF_yes=-fPIC
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	662 SOLIB_yes=librtmp.$(SO_EXT)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	663 @@ -108,5 +113,6 @@ install_base: librtmp.a librtmp.pc
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	664
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	665 install_so: librtmp.$(SO_EXT)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	666 cp librtmp.$(SO_EXT) $(SODIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	667 + $(INSTALL_IMPLIB)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	668 cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	669
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	670 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	671 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	672
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	673
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	674 From 060206d121657d7e45c01ac022dd071c877b4caa Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	675 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	676 Date: Fri, 15 Jul 2011 13:46:02 +0300
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	677 Subject: [PATCH 06/33] Check the return value from RTMP_SendBytesReceived()
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	678
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	679 This avoids double frees in RTMP_Close(), if the
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	680 RTMP_SendBytesReceived() call failed, which earlier led
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	681 to RTMP_ReadPacket() writing back an already freed buffer
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	682 (freed by RTMP_Close() within WriteN()) into m_vecChannelsIn.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	683 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	684 librtmp/rtmp.c \| 3 ++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	685 1 file changed, 2 insertions(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	686
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	687 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	688 index 8d76164..f85cd83 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	689 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	690 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	691 @@ -1338,7 +1338,8 @@ ReadN(RTMP r, char buffer, int n)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	692 r->m_nBytesIn += nRead;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	693 if (r->m_bSendCounter
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	694 && r->m_nBytesIn > r->m_nBytesInSent + r->m_nClientBW / 2)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	695 - SendBytesReceived(r);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	696 + if (!SendBytesReceived(r))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	697 + return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	698 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	699 /RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); /
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	700 #ifdef _DEBUG
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	701 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	702 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	703
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	704
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	705 From 159a06ebe6d82ef20f2c77c497d55af00d2e0b78 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	706 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	707 Date: Fri, 15 Jul 2011 13:46:03 +0300
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	708 Subject: [PATCH 07/33] Don't try to close an already closed socket
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	709
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	710 This could happen if WriteN() (called within SendBytesReceived())
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	711 failed.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	712 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	713 librtmp/rtmp.c \| 4 +++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	714 1 file changed, 3 insertions(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	715
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	716 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	717 index f85cd83..df2cb27 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	718 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	719 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	720 @@ -3626,7 +3626,9 @@ RTMPSockBuf_Close(RTMPSockBuf *sb)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	721 sb->sb_ssl = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	722 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	723 #endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	724 - return closesocket(sb->sb_socket);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	725 + if (sb->sb_socket != -1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	726 + return closesocket(sb->sb_socket);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	727 + return 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	728 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	729
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	730 #define HEX2BIN(a) (((a)&0x40)?((a)&0xf)+9:((a)&0xf))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	731 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	732 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	733
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	734
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	735 From 530d02fccf24f98e2e318418b2fa3e3420056fda Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	736 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	737 Date: Fri, 22 Jul 2011 18:04:05 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	738 Subject: [PATCH 08/33] Fix MDH_free() for PolarSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	739
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	740 Reported by Reijo Tomperi <aggro80@users.sourceforge.net>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	741 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	742 librtmp/dh.h \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	743 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	744
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	745 diff --git a/librtmp/dh.h b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	746 index 8e285a6..efef0fd 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	747 --- a/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	748 +++ b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	749 @@ -53,7 +53,7 @@ typedef struct MDH {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	750 } MDH;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	751
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	752 #define MDH_new() calloc(1,sizeof(MDH))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	753 -#define MDH_free(vp) {MDH *dh = vp; dhm_free(&dh->ctx); MP_free(dh->p); MP_free(dh->g); MP_free(dh->pub_key); MP_free(dh->priv_key); free(dh);}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	754 +#define MDH_free(vp) {MDH *_dh = vp; dhm_free(&_dh->ctx); MP_free(_dh->p); MP_free(_dh->g); MP_free(_dh->pub_key); MP_free(_dh->priv_key); free(_dh);}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	755
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	756 static int MDH_generate_key(MDH *dh)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	757 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	758 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	759 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	760
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	761
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	762 From b627335dc37fd5265ac6d23a441ee2d89ab503c8 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	763 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	764 Date: Fri, 22 Jul 2011 18:06:27 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	765 Subject: [PATCH 09/33] Plug potential memleak
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	766
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	767 Reported by Reijo Tomperi <aggro80@users.sourceforge.net>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	768 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	769 rtmpdump.c \| 4 +++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	770 1 file changed, 3 insertions(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	771
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	772 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	773 index 89c053a..e506fa9 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	774 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	775 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	776 @@ -444,7 +444,7 @@ Download(RTMP * rtmp, // connected RTMP object
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	777 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	778 int32_t now, lastUpdate;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	779 int bufferSize = 64 * 1024;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	780 - char buffer = (char ) malloc(bufferSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	781 + char *buffer;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	782 int nRead = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	783 off_t size = ftello(file);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	784 unsigned long lastPercent = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	785 @@ -505,6 +505,8 @@ Download(RTMP * rtmp, // connected RTMP object
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	786 rtmp->m_read.nMetaHeaderSize = nMetaHeaderSize;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	787 rtmp->m_read.nInitialFrameSize = nInitialFrameSize;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	788
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	789 + buffer = (char *) malloc(bufferSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	790 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	791 now = RTMP_GetTime();
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	792 lastUpdate = now - 1000;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	793 do
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	794 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	795 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	796
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	797
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	798 From ec422962d58b8e0d9bfcf0af6e450e0e349947da Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	799 From: "Scott D. Davilla" <davilla@xbmc.org>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	800 Date: Fri, 29 Jul 2011 11:26:35 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	801 Subject: [PATCH 10/33] Darwin dylib updates
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	802
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	803 Bring in line with current practice for Darwin dynamic libs
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	804 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	805 librtmp/Makefile \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	806 1 file changed, 2 insertions(+), 2 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	807
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	808 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	809 index b88baf4..a0125f1 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	810 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	811 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	812 @@ -52,8 +52,8 @@ SODIR_mingw=$(BINDIR)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	813 SODIR=$(SODIR_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	814
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	815 SO_LDFLAGS_posix=-shared -Wl,-soname,$@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	816 -SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	817 - -headerpad_max_install_names
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	818 +SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace -undefined dynamic_lookup \
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	819 + -fno-common -headerpad_max_install_names -install_name $(libdir)/$@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	820 SO_LDFLAGS_mingw=-shared -Wl,--out-implib,librtmp.dll.a
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	821 SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	822
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	823 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	824 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	825
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	826
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	827 From 024d201c36e1b40f4f4d473e87d405e1b411230f Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	828 From: KSV <faltuvisitor@yahoo.co.in>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	829 Date: Sun, 31 Jul 2011 12:33:46 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	830 Subject: [PATCH 11/33] Justin.TV usherToken detection
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	831
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	832 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	833 rtmpsrv.c \| 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	834 1 file changed, 59 insertions(+), 2 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	835
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	836 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	837 index f1b6c66..805ce0d 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	838 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	839 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	840 @@ -95,6 +95,7 @@ STREAMING_SERVER *rtmpServer = 0; // server structure pointer
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	841
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	842 STREAMING_SERVER startStreaming(const char address, int port);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	843 void stopStreaming(STREAMING_SERVER * server);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	844 +char strreplace(char srcstr, int srclen, char orig, char repl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	845
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	846 typedef struct
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	847 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	848 @@ -261,6 +262,7 @@ static const AVal av_NetStream_Play_Stop = AVC("NetStream.Play.Stop");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	849 static const AVal av_Stopped_playing = AVC("Stopped playing");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	850 SAVC(details);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	851 SAVC(clientid);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	852 +static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	853
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	854 static int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	855 SendPlayStart(RTMP *r)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	856 @@ -575,6 +577,13 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	857 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	858 SendResultNumber(r, txn, 10.0);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	859 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	860 + else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	861 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	862 + AMFObjectProperty *prop = AMF_GetProp(&obj, NULL, 3);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	863 + AMFProp_GetString(prop, &r->Link.usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	864 + prop->p_vu.p_aval.av_len = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	865 + prop->p_vu.p_aval.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	866 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	867 else if (AVMATCH(&method, &av_play))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	868 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	869 char file, p, q, cmd, *ptr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	870 @@ -591,10 +600,11 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	871 if (r->Link.tcUrl.av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	872 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	873 len = server->arglen + r->Link.playpath.av_len + 4 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	874 - sizeof("rtmpdump") + r->Link.playpath.av_len + 12;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	875 + sizeof("rtmpdump") + r->Link.playpath.av_len + 12 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	876 + r->Link.usherToken.av_len + 64;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	877 server->argc += 5;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	878
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	879 - cmd = malloc(len + server->argc * sizeof(AVal));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	880 + cmd = malloc(len + (server->argc + 2) * sizeof(AVal));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	881 ptr = cmd;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	882 argv = (AVal *)(cmd + len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	883 argv[0].av_val = cmd;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	884 @@ -640,6 +650,17 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	885 ptr += sprintf(ptr, " -p \"%s\"", r->Link.pageUrl.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	886 argv[argc++].av_len = r->Link.pageUrl.av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	887 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	888 + if (r->Link.usherToken.av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	889 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	890 + char *usherToken = strreplace(r->Link.usherToken.av_val, r->Link.usherToken.av_len, "\"", "\\\"");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	891 + argv[argc].av_val = ptr + 1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	892 + argv[argc++].av_len = 5;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	893 + argv[argc].av_val = ptr + 8;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	894 + ptr += sprintf(ptr, " --jtv \"%s\"", usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	895 + argv[argc++].av_len = strlen(usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	896 + server->argc += 2;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	897 + free(usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	898 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	899 if (r->Link.extras.o_num) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	900 ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	901 AMF_Reset(&r->Link.extras);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	902 @@ -1111,3 +1132,39 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	903 #endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	904 return nStatus;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	905 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	906 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	907 +char *
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	908 +strreplace(char srcstr, int srclen, char orig, char *repl)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	909 +{
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	910 + char ptr = NULL, srcstrstart = srcstr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	911 + int origlen = strlen(orig);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	912 + int repllen = strlen(repl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	913 + if (!srclen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	914 + srclen = strlen(srcstr);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	915 + char *srcend = srcstr + srclen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	916 + int deststrbuffer = srclen / origlen * repllen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	917 + if (deststrbuffer < srclen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	918 + deststrbuffer = srclen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	919 + char *deststr = calloc(deststrbuffer + 1, sizeof(char));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	920 + char *deststrstart = deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	921 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	922 + if ( (ptr = strstr(srcstr, orig)) )
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	923 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	924 + do
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	925 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	926 + int len = ptr - srcstrstart;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	927 + memcpy(deststrstart, srcstrstart, len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	928 + srcstrstart += len + origlen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	929 + deststrstart += len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	930 + memcpy(deststrstart, repl, repllen);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	931 + deststrstart += repllen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	932 + ptr = strstr(srcstrstart, orig);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	933 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	934 + while (ptr && (ptr < srcend));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	935 + strncpy(deststrstart, srcstrstart, srcend-srcstrstart);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	936 + return deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	937 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	938 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	939 + strncpy(deststr, srcstr, srclen);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	940 + return deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	941 +}
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	942 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	943 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	944
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	945
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	946 From f1abda046ca5a3f1efa63033c542e686b43dbcf3 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	947 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	948 Date: Sun, 31 Jul 2011 13:21:12 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	949 Subject: [PATCH 12/33] Cleanup previous commit
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	950
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	951 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	952 rtmpsrv.c \| 111 ++++++++++++++++++++++++++++++++++---------------------------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	953 1 file changed, 62 insertions(+), 49 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	954
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	955 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	956 index 805ce0d..b45aae3 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	957 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	958 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	959 @@ -1,6 +1,6 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	960 /* Simple RTMP Server
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	961 * Copyright (C) 2009 Andrej Stepanchuk
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	962 - * Copyright (C) 2009 Howard Chu
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	963 + * Copyright (C) 2009-2011 Howard Chu
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	964 *
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	965 * This Program is free software; you can redistribute it and/or modify
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	966 * it under the terms of the GNU General Public License as published by
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	967 @@ -95,7 +95,10 @@ STREAMING_SERVER *rtmpServer = 0; // server structure pointer
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	968
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	969 STREAMING_SERVER startStreaming(const char address, int port);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	970 void stopStreaming(STREAMING_SERVER * server);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	971 -char strreplace(char srcstr, int srclen, char orig, char repl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	972 +void AVreplace(AVal src, const AVal orig, const AVal *repl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	973 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	974 +static const AVal av_dquote = AVC("\"");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	975 +static const AVal av_escdquote = AVC("\\\"");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	976
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	977 typedef struct
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	978 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	979 @@ -579,10 +582,12 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	980 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	981 else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	982 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	983 - AMFObjectProperty *prop = AMF_GetProp(&obj, NULL, 3);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	984 - AMFProp_GetString(prop, &r->Link.usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	985 - prop->p_vu.p_aval.av_len = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	986 - prop->p_vu.p_aval.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	987 + AVal usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	988 + AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	989 + AVreplace(&usherToken, &av_dquote, &av_escdquote);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	990 + server->arglen += 6 + usherToken.av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	991 + server->argc += 2;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	992 + r->Link.usherToken = usherToken;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	993 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	994 else if (AVMATCH(&method, &av_play))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	995 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	996 @@ -600,11 +605,10 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	997 if (r->Link.tcUrl.av_len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	998 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	999 len = server->arglen + r->Link.playpath.av_len + 4 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1000 - sizeof("rtmpdump") + r->Link.playpath.av_len + 12 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1001 - r->Link.usherToken.av_len + 64;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1002 + sizeof("rtmpdump") + r->Link.playpath.av_len + 12;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1003 server->argc += 5;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1004
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1005 - cmd = malloc(len + (server->argc + 2) * sizeof(AVal));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1006 + cmd = malloc(len + server->argc * sizeof(AVal));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1007 ptr = cmd;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1008 argv = (AVal *)(cmd + len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1009 argv[0].av_val = cmd;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1010 @@ -650,17 +654,17 @@ ServeInvoke(STREAMING_SERVER server, RTMP r, RTMPPacket *packet, unsigned int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1011 ptr += sprintf(ptr, " -p \"%s\"", r->Link.pageUrl.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1012 argv[argc++].av_len = r->Link.pageUrl.av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1013 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1014 - if (r->Link.usherToken.av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1015 - {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1016 - char *usherToken = strreplace(r->Link.usherToken.av_val, r->Link.usherToken.av_len, "\"", "\\\"");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1017 + if (r->Link.usherToken.av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1018 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1019 argv[argc].av_val = ptr + 1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1020 - argv[argc++].av_len = 5;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1021 - argv[argc].av_val = ptr + 8;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1022 - ptr += sprintf(ptr, " --jtv \"%s\"", usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1023 - argv[argc++].av_len = strlen(usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1024 - server->argc += 2;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1025 - free(usherToken);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1026 - }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1027 + argv[argc++].av_len = 2;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1028 + argv[argc].av_val = ptr + 5;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1029 + ptr += sprintf(ptr, " -j \"%s\"", r->Link.usherToken.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1030 + argv[argc++].av_len = r->Link.usherToken.av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1031 + free(r->Link.usherToken.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1032 + r->Link.usherToken.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1033 + r->Link.usherToken.av_len = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1034 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1035 if (r->Link.extras.o_num) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1036 ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1037 AMF_Reset(&r->Link.extras);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1038 @@ -932,6 +936,11 @@ cleanup:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1039 rtmp.Link.pageUrl.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1040 rtmp.Link.app.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1041 rtmp.Link.flashVer.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1042 + if (rtmp.Link.usherToken.av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1043 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1044 + free(rtmp.Link.usherToken.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1045 + rtmp.Link.usherToken.av_val = NULL;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1046 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1047 RTMP_LogPrintf("done!\n\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1048
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1049 quit:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1050 @@ -1133,38 +1142,42 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1051 return nStatus;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1052 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1053
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1054 -char *
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1055 -strreplace(char srcstr, int srclen, char orig, char *repl)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1056 +void
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1057 +AVreplace(AVal src, const AVal orig, const AVal *repl)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1058 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1059 - char ptr = NULL, srcstrstart = srcstr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1060 - int origlen = strlen(orig);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1061 - int repllen = strlen(repl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1062 - if (!srclen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1063 - srclen = strlen(srcstr);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1064 - char *srcend = srcstr + srclen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1065 - int deststrbuffer = srclen / origlen * repllen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1066 - if (deststrbuffer < srclen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1067 - deststrbuffer = srclen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1068 - char *deststr = calloc(deststrbuffer + 1, sizeof(char));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1069 - char *deststrstart = deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1070 -
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1071 - if ( (ptr = strstr(srcstr, orig)) )
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1072 - {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1073 - do
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1074 + char *srcbeg = src->av_val;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1075 + char *srcend = src->av_val + src->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1076 + char dest, sptr, *dptr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1077 + int n = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1078 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1079 + /* count occurrences of orig in src */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1080 + sptr = src->av_val;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1081 + while (sptr < srcend && (sptr = strstr(sptr, orig->av_val)))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1082 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1083 - int len = ptr - srcstrstart;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1084 - memcpy(deststrstart, srcstrstart, len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1085 - srcstrstart += len + origlen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1086 - deststrstart += len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1087 - memcpy(deststrstart, repl, repllen);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1088 - deststrstart += repllen;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1089 - ptr = strstr(srcstrstart, orig);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1090 + n++;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1091 + sptr += orig->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1092 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1093 - while (ptr && (ptr < srcend));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1094 - strncpy(deststrstart, srcstrstart, srcend-srcstrstart);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1095 - return deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1096 - }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1097 + if (!n)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1098 + return;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1099
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1100 - strncpy(deststr, srcstr, srclen);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1101 - return deststr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1102 + dest = malloc(src->av_len + 1 + (repl->av_len - orig->av_len) * n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1103 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1104 + sptr = src->av_val;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1105 + dptr = dest;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1106 + while (sptr < srcend && (sptr = strstr(sptr, orig->av_val)))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1107 + {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1108 + n = sptr - srcbeg;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1109 + memcpy(dptr, srcbeg, n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1110 + srcbeg += n;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1111 + dptr += n;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1112 + memcpy(dptr, repl->av_val, repl->av_len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1113 + dptr += repl->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1114 + sptr += orig->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1115 + }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1116 + n = srcend - srcbeg;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1117 + memcpy(dptr, srcbeg, n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1118 + dptr += n;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1119 + *dptr = '\0';
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1120 + src->av_val = dest;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1121 + src->av_len = dptr - dest;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1122 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1123 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1124 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1125
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1126
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1127 From 8880d1456b282ee79979adbe7b6a6eb8ad371081 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1128 From: Chris Larsen <clarsen@euphoriaaudio.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1129 Date: Tue, 2 Aug 2011 12:33:44 -0400
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1130 Subject: [PATCH 13/33] Unexpected BW Response Fix
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1131
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1132 Bug: SendCheckBWResult sends an invalid bw response due to casting issues
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1133 from a double to an int.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1134 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1135 librtmp/rtmp.c \| 6 +++---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1136 1 file changed, 3 insertions(+), 3 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1137
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1138 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1139 index df2cb27..5311a8a 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1140 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1141 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1142 @@ -2339,7 +2339,7 @@ HandleInvoke(RTMP r, const char body, unsigned int nBodySize)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1143 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1144 AMFObject obj;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1145 AVal method;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1146 - int txn;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1147 + double txn;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1148 int ret = 0, nRes;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1149 if (body[0] != 0x02) /* make sure it is a string method name we start with */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1150 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1151 @@ -2357,7 +2357,7 @@ HandleInvoke(RTMP r, const char body, unsigned int nBodySize)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1152
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1153 AMF_Dump(&obj);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1154 AMFProp_GetString(AMF_GetProp(&obj, NULL, 0), &method);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1155 - txn = (int)AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 1));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1156 + txn = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 1));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1157 RTMP_Log(RTMP_LOGDEBUG, "%s, server invoking <%s>", __FUNCTION__, method.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1158
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1159 if (AVMATCH(&method, &av__result))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1160 @@ -2366,7 +2366,7 @@ HandleInvoke(RTMP r, const char body, unsigned int nBodySize)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1161 int i;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1162
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1163 for (i=0; i<r->m_numCalls; i++) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1164 - if (r->m_methodCalls[i].num == txn) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1165 + if (r->m_methodCalls[i].num == (int)txn) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1166 methodInvoked = r->m_methodCalls[i].name;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1167 AV_erase(r->m_methodCalls, &r->m_numCalls, i, FALSE);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1168 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1169 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1170 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1171
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1172
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1173 From c528451068de033d7cc76eb1c5a606c10215fcfb Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1174 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1175 Date: Wed, 3 Aug 2011 11:46:07 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1176 Subject: [PATCH 14/33] Fix <arpa/inet.h> include order
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1177
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1178 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1179 librtmp/rtmp_sys.h \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1180 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1181
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1182 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1183 index 6a3f215..638374f 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1184 --- a/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1185 +++ b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1186 @@ -46,10 +46,10 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1187 #include <sys/socket.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1188 #include <sys/times.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1189 #include <netdb.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1190 -#include <arpa/inet.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1191 #include <unistd.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1192 #include <netinet/in.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1193 #include <netinet/tcp.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1194 +#include <arpa/inet.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1195 #define GetSockError() errno
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1196 #define SetSockError(e) errno = e
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1197 #undef closesocket
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1198 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1199 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1200
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1201
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1202 From a1114e09bf0d74ef1d575eb88f3aa36bc7c6d790 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1203 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1204 Date: Tue, 9 Aug 2011 14:44:14 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1205 Subject: [PATCH 15/33] Fix AVreplace for usherToken
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1206
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1207 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1208 rtmpsrv.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1209 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1210
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1211 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1212 index b45aae3..91fc4da 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1213 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1214 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1215 @@ -1168,11 +1168,11 @@ AVreplace(AVal src, const AVal orig, const AVal *repl)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1216 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1217 n = sptr - srcbeg;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1218 memcpy(dptr, srcbeg, n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1219 - srcbeg += n;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1220 dptr += n;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1221 memcpy(dptr, repl->av_val, repl->av_len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1222 dptr += repl->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1223 sptr += orig->av_len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1224 + srcbeg = sptr;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1225 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1226 n = srcend - srcbeg;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1227 memcpy(dptr, srcbeg, n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1228 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1229 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1230
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1231
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1232 From c58cfb3e9208c6e6bc1aa18f1b1d650d799084e5 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1233 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1234 Date: Thu, 11 Aug 2011 18:02:10 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1235 Subject: [PATCH 16/33] Add RD_NO_CONNECT return code for Connect failures
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1236
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1237 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1238 rtmpdump.c \| 3 ++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1239 1 file changed, 2 insertions(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1240
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1241 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1242 index e506fa9..01decf9 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1243 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1244 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1245 @@ -46,6 +46,7 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1246 #define RD_SUCCESS 0
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1247 #define RD_FAILED 1
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1248 #define RD_INCOMPLETE 2
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1249 +#define RD_NO_CONNECT 3
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1250
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1251 #define DEF_TIMEOUT 30 /* seconds */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1252 #define DEF_BUFTIME (10 * 60 * 60 * 1000) /* 10 hours default */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1253 @@ -1253,7 +1254,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1254
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1255 if (!RTMP_Connect(&rtmp, NULL))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1256 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1257 - nStatus = RD_FAILED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1258 + nStatus = RD_NO_CONNECT;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1259 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1260 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1261
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1262 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1263 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1264
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1265
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1266 From 6230845ab0fba07289d4b2d9b97269e4b2d90766 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1267 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1268 Date: Sun, 25 Sep 2011 03:07:14 -0700
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1269 Subject: [PATCH 17/33] PolarSSL support now requires version 1.0.0.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1270
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1271 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1272 README \| 1 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1273 librtmp/dh.h \| 7 +++----
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1274 librtmp/rtmp_sys.h \| 3 ++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1275 3 files changed, 6 insertions(+), 5 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1276
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1277 diff --git a/README b/README
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1278 index 865c6c4..dcf5f52 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1279 --- a/README
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1280 +++ b/README
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1281 @@ -50,6 +50,7 @@ library. You can also turn it off if desired
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1282 The rtmpdump programs still link to the static library, regardless.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1283
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1284 Note that if using OpenSSL, you must have version 0.9.8 or newer.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1285 +For Polar SSL you must have version 1.0.0 or newer.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1286
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1287 Credit goes to team boxee for the XBMC RTMP code originally used in RTMPDumper.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1288 The current code is based on the XBMC code but rewritten in C by Howard Chu.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1289 diff --git a/librtmp/dh.h b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1290 index efef0fd..a9f3763 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1291 --- a/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1292 +++ b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1293 @@ -30,14 +30,14 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1294 #ifdef USE_POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1295 #include <polarssl/dhm.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1296 typedef mpi * MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1297 -#define MP_new(m) m = malloc(sizeof(mpi)); mpi_init(m, NULL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1298 +#define MP_new(m) m = malloc(sizeof(mpi)); mpi_init(m)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1299 #define MP_set_w(mpi, w) mpi_lset(mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1300 #define MP_cmp(u, v) mpi_cmp_mpi(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1301 #define MP_set(u, v) mpi_copy(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1302 #define MP_sub_w(mpi, w) mpi_sub_int(mpi, mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1303 #define MP_cmp_1(mpi) mpi_cmp_int(mpi, 1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1304 #define MP_modexp(r, y, q, p) mpi_exp_mod(r, y, q, p, NULL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1305 -#define MP_free(mpi) mpi_free(mpi, NULL); free(mpi)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1306 +#define MP_free(mpi) mpi_free(mpi); free(mpi)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1307 #define MP_gethex(u, hex, res) MP_new(u); res = mpi_read_string(u, 16, hex) == 0
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1308 #define MP_bytes(u) mpi_size(u)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1309 #define MP_setbin(u,buf,len) mpi_write_binary(u,buf,len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1310 @@ -71,9 +71,8 @@ static int MDH_generate_key(MDH *dh)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1311
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1312 static int MDH_compute_key(uint8_t secret, size_t len, MP_t pub, MDH dh)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1313 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1314 - int n = len;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1315 MP_set(&dh->ctx.GY, pub);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1316 - dhm_calc_secret(&dh->ctx, secret, &n);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1317 + dhm_calc_secret(&dh->ctx, secret, &len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1318 return 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1319 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1320
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1321 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1322 index 638374f..c3fd4a6 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1323 --- a/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1324 +++ b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1325 @@ -71,7 +71,8 @@ typedef struct tls_ctx {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1326 #define TLS_CTX tls_ctx *
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1327 #define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1328 ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1329 - ssl_set_rng(s, havege_rand, &ctx->hs); ssl_set_ciphers(s, ssl_default_ciphers);\
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1330 + ssl_set_rng(s, havege_rand, &ctx->hs);\
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1331 + ssl_set_ciphersuites(s, ssl_default_ciphersuites);\
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1332 ssl_set_session(s, 1, 600, &ctx->ssn)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1333 #define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1334 #define TLS_connect(s) ssl_handshake(s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1335 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1336 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1337
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1338
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1339 From 60218d0af0f4bd683ecdebe49986f188820cf8ce Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1340 From: Kirill Zorin <cyril.zorin@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1341 Date: Fri, 30 Sep 2011 13:38:23 -0400
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1342 Subject: [PATCH 18/33] fixed undefined behaviour due to union assignment
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1343
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1344 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1345 librtmp/amf.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1346 librtmp/rtmp.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1347 2 files changed, 3 insertions(+), 3 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1348
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1349 diff --git a/librtmp/amf.c b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1350 index 7fa289e..ae920e4 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1351 --- a/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1352 +++ b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1353 @@ -1111,7 +1111,7 @@ AMF_AddProp(AMFObject obj, const AMFObjectProperty prop)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1354 if (!(obj->o_num & 0x0f))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1355 obj->o_props =
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1356 realloc(obj->o_props, (obj->o_num + 16) * sizeof(AMFObjectProperty));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1357 - obj->o_props[obj->o_num++] = *prop;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1358 + memcpy(&obj->o_props[obj->o_num++], prop, sizeof(AMFObjectProperty));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1359 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1360
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1361 int
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1362 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1363 index 5311a8a..4b17a49 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1364 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1365 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1366 @@ -2584,7 +2584,7 @@ RTMP_FindFirstMatchingProperty(AMFObject obj, const AVal name,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1367
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1368 if (AVMATCH(&prop->p_name, name))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1369 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1370 - p = prop;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1371 + memcpy(p, prop, sizeof(*prop));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1372 return TRUE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1373 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1374
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1375 @@ -2610,7 +2610,7 @@ RTMP_FindPrefixProperty(AMFObject obj, const AVal name,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1376 if (prop->p_name.av_len > name->av_len &&
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1377 !memcmp(prop->p_name.av_val, name->av_val, name->av_len))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1378 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1379 - p = prop;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1380 + memcpy(p, prop, sizeof(*prop));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1381 return TRUE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1382 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1383
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1384 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1385 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1386
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1387
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1388 From c90c05892cbaebfb1b2095759597d9fb38238c64 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1389 From: KSV <faltuvistor@yahoo.co.in>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1390 Date: Mon, 7 Nov 2011 11:38:27 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1391 Subject: [PATCH 19/33] Fix bytes-received report
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1392
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1393 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1394 librtmp/rtmp.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1395 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1396
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1397 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1398 index 4b17a49..a9c1bc1 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1399 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1400 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1401 @@ -1337,7 +1337,7 @@ ReadN(RTMP r, char buffer, int n)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1402 nBytes = nRead;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1403 r->m_nBytesIn += nRead;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1404 if (r->m_bSendCounter
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1405 - && r->m_nBytesIn > r->m_nBytesInSent + r->m_nClientBW / 2)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1406 + && r->m_nBytesIn > ( r->m_nBytesInSent + r->m_nClientBW / 10))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1407 if (!SendBytesReceived(r))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1408 return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1409 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1410 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1411 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1412
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1413
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1414 From b3467069ad7c26d748ca13ce0ee88a41f85b22dd Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1415 From: Jeff Johnson <jeff@rogueamoeba.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1416 Date: Mon, 7 Nov 2011 11:43:26 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1417 Subject: [PATCH 20/33] Fix getting swf hash with https URLs
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1418
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1419 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1420 librtmp/hashswf.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1421 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1422
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1423 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1424 index 3c56b69..5576730 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1425 --- a/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1426 +++ b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1427 @@ -163,7 +163,7 @@ HTTP_get(struct HTTP_ctx http, const char url, HTTP_read_callback *cb)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1428 #else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1429 TLS_client(RTMP_TLS_ctx, sb.sb_ssl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1430 TLS_setfd(sb.sb_ssl, sb.sb_socket);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1431 - if ((i = TLS_connect(sb.sb_ssl)) < 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1432 + if (TLS_connect(sb.sb_ssl) < 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1433 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1434 RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1435 ret = HTTPRES_LOST_CONNECTION;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1436 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1437 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1438
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1439
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1440 From 90799efbb67f415ff930d68905e8267d5aa5dc4e Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1441 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1442 Date: Tue, 8 Nov 2011 02:04:01 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1443 Subject: [PATCH 21/33] Increase tcUrl buffer size
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1444
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1445 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1446 rtmpdump.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1447 1 file changed, 2 insertions(+), 2 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1448
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1449 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1450 index 01decf9..a8fa128 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1451 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1452 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1453 @@ -1152,9 +1152,9 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1454
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1455 if (tcUrl.av_len == 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1456 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1457 - char str[512] = { 0 };
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1458 + char str[1024];
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1459
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1460 - tcUrl.av_len = snprintf(str, 511, "%s://%.s:%d/%.s",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1461 + tcUrl.av_len = snprintf(str, sizeof(str), "%s://%.s:%d/%.s",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1462 RTMPProtocolStringsLower[protocol], hostname.av_len,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1463 hostname.av_val, port, app.av_len, app.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1464 tcUrl.av_val = (char *) malloc(tcUrl.av_len + 1);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1465 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1466 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1467
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1468
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1469 From 9df7959a71ec33cc9c83c9d3ef25c17b1c527f0e Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1470 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1471 Date: Tue, 8 Nov 2011 02:05:01 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1472 Subject: [PATCH 22/33] Spell Referer according to RFC1945
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1473
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1474 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1475 librtmp/hashswf.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1476 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1477
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1478 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1479 index 5576730..0320480 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1480 --- a/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1481 +++ b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1482 @@ -141,7 +141,7 @@ HTTP_get(struct HTTP_ctx http, const char url, HTTP_read_callback *cb)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1483 return HTTPRES_LOST_CONNECTION;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1484 i =
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1485 sprintf(sb.sb_buf,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1486 - "GET %s HTTP/1.0\r\nUser-Agent: %s\r\nHost: %s\r\nReferrer: %.*s\r\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1487 + "GET %s HTTP/1.0\r\nUser-Agent: %s\r\nHost: %s\r\nReferer: %.*s\r\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1488 path, AGENT, host, (int)(path - url + 1), url);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1489 if (http->date[0])
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1490 i += sprintf(sb.sb_buf + i, "If-Modified-Since: %s\r\n", http->date);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1491 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1492 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1493
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1494
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1495 From 1c77ff43439068981d2ad9872952922a1ee37f89 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1496 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1497 Date: Tue, 8 Nov 2011 02:13:14 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1498 Subject: [PATCH 23/33] Calculate tcUrl length
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1499
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1500 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1501 rtmpdump.c \| 9 ++++-----
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1502 1 file changed, 4 insertions(+), 5 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1503
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1504 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1505 index a8fa128..892a8bc 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1506 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1507 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1508 @@ -1152,13 +1152,12 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1509
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1510 if (tcUrl.av_len == 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1511 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1512 - char str[1024];
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1513 -
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1514 - tcUrl.av_len = snprintf(str, sizeof(str), "%s://%.s:%d/%.s",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1515 + tcUrl.av_len = strlen(RTMPProtocolStringsLower[protocol]) +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1516 + hostname.av_len + app.av_len + sizeof("://:65535/");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1517 + tcUrl.av_val = (char *) malloc(tcUrl.av_len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1518 + tcUrl.av_len = snprintf(tcUrl.av_val, tcUrl.av_len, "%s://%.s:%d/%.s",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1519 RTMPProtocolStringsLower[protocol], hostname.av_len,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1520 hostname.av_val, port, app.av_len, app.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1521 - tcUrl.av_val = (char *) malloc(tcUrl.av_len + 1);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1522 - strcpy(tcUrl.av_val, str);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1523 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1524
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1525 int first = 1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1526 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1527 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1528
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1529
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1530 From 30fcf46fc82f96ca41b710fc38bbc15f2489795e Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1531 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1532 Date: Tue, 8 Nov 2011 02:14:21 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1533 Subject: [PATCH 24/33] Check for malloc failure in prev commit
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1534
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1535 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1536 rtmpdump.c \| 2 ++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1537 1 file changed, 2 insertions(+)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1538
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1539 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1540 index 892a8bc..c37def2 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1541 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1542 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1543 @@ -1155,6 +1155,8 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1544 tcUrl.av_len = strlen(RTMPProtocolStringsLower[protocol]) +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1545 hostname.av_len + app.av_len + sizeof("://:65535/");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1546 tcUrl.av_val = (char *) malloc(tcUrl.av_len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1547 + if (!tcUrl.av_val)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1548 + return RD_FAILED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1549 tcUrl.av_len = snprintf(tcUrl.av_val, tcUrl.av_len, "%s://%.s:%d/%.s",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1550 RTMPProtocolStringsLower[protocol], hostname.av_len,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1551 hostname.av_val, port, app.av_len, app.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1552 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1553 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1554
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1555
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1556 From 83e701eef0d7947713280fe3e7561bed1e7195f5 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1557 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1558 Date: Mon, 14 Nov 2011 16:09:26 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1559 Subject: [PATCH 25/33] Fix missing log message parameter
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1560
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1561 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1562 librtmp/rtmp.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1563 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1564
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1565 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1566 index a9c1bc1..4da318b 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1567 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1568 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1569 @@ -974,7 +974,7 @@ SocksNegotiate(RTMP *r)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1570 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1571 else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1572 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1573 - RTMP_Log(RTMP_LOGERROR, "%s, SOCKS returned error code %d", packet[1]);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1574 + RTMP_Log(RTMP_LOGERROR, "%s, SOCKS returned error code %d", __FUNCTION__, packet[1]);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1575 return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1576 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1577 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1578 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1579 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1580
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1581
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1582 From 949da84ab1f659597d6e7fa1ef0ab8fc1ca8e246 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1583 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1584 Date: Mon, 14 Nov 2011 16:11:13 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1585 Subject: [PATCH 26/33] Tell gcc about log format strings
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1586
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1587 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1588 librtmp/log.h \| 6 ++++++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1589 1 file changed, 6 insertions(+)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1590
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1591 diff --git a/librtmp/log.h b/librtmp/log.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1592 index 97c9aac..2adb111 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1593 --- a/librtmp/log.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1594 +++ b/librtmp/log.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1595 @@ -48,9 +48,15 @@ extern RTMP_LogLevel RTMP_debuglevel;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1596 typedef void (RTMP_LogCallback)(int level, const char *fmt, va_list);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1597 void RTMP_LogSetCallback(RTMP_LogCallback *cb);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1598 void RTMP_LogSetOutput(FILE *file);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1599 +#ifdef __GNUC__
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1600 +void RTMP_LogPrintf(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1601 +void RTMP_LogStatus(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1602 +void RTMP_Log(int level, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1603 +#else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1604 void RTMP_LogPrintf(const char *format, ...);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1605 void RTMP_LogStatus(const char *format, ...);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1606 void RTMP_Log(int level, const char *format, ...);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1607 +#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1608 void RTMP_LogHex(int level, const uint8_t *data, unsigned long len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1609 void RTMP_LogHexString(int level, const uint8_t *data, unsigned long len);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1610 void RTMP_LogSetLevel(RTMP_LogLevel lvl);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1611 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1612 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1613
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1614
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1615 From 45556fb3b372402d7bd5235832176f58dede90ae Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1616 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1617 Date: Mon, 14 Nov 2011 16:12:26 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1618 Subject: [PATCH 27/33] Fix mismatched format string conversions
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1619
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1620 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1621 librtmp/amf.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1622 librtmp/rtmp.c \| 22 +++++++++++-----------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1623 2 files changed, 13 insertions(+), 13 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1624
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1625 diff --git a/librtmp/amf.c b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1626 index ae920e4..f9ecf21 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1627 --- a/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1628 +++ b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1629 @@ -586,7 +586,7 @@ AMF3Prop_Decode(AMFObjectProperty prop, const char pBuffer, int nSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1630 case AMF3_ARRAY:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1631 case AMF3_BYTE_ARRAY:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1632 default:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1633 - RTMP_Log(RTMP_LOGDEBUG, "%s - AMF3 unknown/unsupported datatype 0x%02x, @0x%08X",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1634 + RTMP_Log(RTMP_LOGDEBUG, "%s - AMF3 unknown/unsupported datatype 0x%02x, @%p",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1635 __FUNCTION__, (unsigned char)(*pBuffer), pBuffer);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1636 return -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1637 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1638 @@ -772,7 +772,7 @@ AMFProp_Decode(AMFObjectProperty prop, const char pBuffer, int nSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1639 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1640 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1641 default:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1642 - RTMP_Log(RTMP_LOGDEBUG, "%s - unknown datatype 0x%02x, @0x%08X", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1643 + RTMP_Log(RTMP_LOGDEBUG, "%s - unknown datatype 0x%02x, @%p", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1644 prop->p_type, pBuffer - 1);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1645 return -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1646 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1647 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1648 index 4da318b..52d0254 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1649 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1650 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1651 @@ -185,7 +185,7 @@ void
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1652 RTMPPacket_Dump(RTMPPacket *p)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1653 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1654 RTMP_Log(RTMP_LOGDEBUG,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1655 - "RTMP PACKET: packet type: 0x%02x. channel: 0x%02x. info 1: %d info 2: %d. Body size: %lu. body: 0x%02x",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1656 + "RTMP PACKET: packet type: 0x%02x. channel: 0x%02x. info 1: %d info 2: %d. Body size: %u. body: 0x%02x",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1657 p->m_packetType, p->m_nChannel, p->m_nTimeStamp, p->m_nInfoField2,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1658 p->m_nBodySize, p->m_body ? (unsigned char)p->m_body[0] : 0);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1659 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1660 @@ -367,7 +367,7 @@ RTMP_SetupStream(RTMP *r,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1661 RTMP_Log(RTMP_LOGDEBUG, "StopTime : %d msec", dStop);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1662
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1663 RTMP_Log(RTMP_LOGDEBUG, "live : %s", bLiveStream ? "yes" : "no");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1664 - RTMP_Log(RTMP_LOGDEBUG, "timeout : %d sec", timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1665 + RTMP_Log(RTMP_LOGDEBUG, "timeout : %ld sec", timeout);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1666
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1667 #ifdef CRYPTO
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1668 if (swfSHA256Hash != NULL && swfSize > 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1669 @@ -376,7 +376,7 @@ RTMP_SetupStream(RTMP *r,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1670 r->Link.SWFSize = swfSize;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1671 RTMP_Log(RTMP_LOGDEBUG, "SWFSHA256:");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1672 RTMP_LogHex(RTMP_LOGDEBUG, r->Link.SWFHash, sizeof(r->Link.SWFHash));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1673 - RTMP_Log(RTMP_LOGDEBUG, "SWFSize : %lu", r->Link.SWFSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1674 + RTMP_Log(RTMP_LOGDEBUG, "SWFSize : %u", r->Link.SWFSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1675 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1676 else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1677 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1678 @@ -1161,14 +1161,14 @@ RTMP_ClientPacket(RTMP r, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1679 case RTMP_PACKET_TYPE_FLEX_STREAM_SEND:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1680 /* flex stream send */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1681 RTMP_Log(RTMP_LOGDEBUG,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1682 - "%s, flex stream send, size %lu bytes, not supported, ignoring",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1683 + "%s, flex stream send, size %u bytes, not supported, ignoring",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1684 __FUNCTION__, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1685 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1686
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1687 case RTMP_PACKET_TYPE_FLEX_SHARED_OBJECT:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1688 /* flex shared object */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1689 RTMP_Log(RTMP_LOGDEBUG,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1690 - "%s, flex shared object, size %lu bytes, not supported, ignoring",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1691 + "%s, flex shared object, size %u bytes, not supported, ignoring",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1692 __FUNCTION__, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1693 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1694
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1695 @@ -1176,7 +1176,7 @@ RTMP_ClientPacket(RTMP r, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1696 /* flex message */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1697 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1698 RTMP_Log(RTMP_LOGDEBUG,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1699 - "%s, flex message, size %lu bytes, not fully supported",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1700 + "%s, flex message, size %u bytes, not fully supported",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1701 __FUNCTION__, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1702 /RTMP_LogHex(packet.m_body, packet.m_nBodySize); /
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1703
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1704 @@ -1198,7 +1198,7 @@ RTMP_ClientPacket(RTMP r, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1705 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1706 case RTMP_PACKET_TYPE_INFO:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1707 /* metadata (notify) */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1708 - RTMP_Log(RTMP_LOGDEBUG, "%s, received: notify %lu bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1709 + RTMP_Log(RTMP_LOGDEBUG, "%s, received: notify %u bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1710 packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1711 if (HandleMetadata(r, packet->m_body, packet->m_nBodySize))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1712 bHasMediaPacket = 1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1713 @@ -1211,7 +1211,7 @@ RTMP_ClientPacket(RTMP r, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1714
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1715 case RTMP_PACKET_TYPE_INVOKE:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1716 /* invoke */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1717 - RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %lu bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1718 + RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %u bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1719 packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1720 /RTMP_LogHex(packet.m_body, packet.m_nBodySize); /
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1721
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1722 @@ -2373,7 +2373,7 @@ HandleInvoke(RTMP r, const char body, unsigned int nBodySize)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1723 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1724 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1725 if (!methodInvoked.av_val) {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1726 - RTMP_Log(RTMP_LOGDEBUG, "%s, received result id %d without matching request",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1727 + RTMP_Log(RTMP_LOGDEBUG, "%s, received result id %f without matching request",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1728 __FUNCTION__, txn);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1729 goto leave;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1730 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1731 @@ -3055,7 +3055,7 @@ RTMP_ReadPacket(RTMP r, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1732
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1733 if (ReadN(r, packet->m_body + packet->m_nBytesRead, nChunk) != nChunk)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1734 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1735 - RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet body. len: %lu",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1736 + RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet body. len: %u",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1737 __FUNCTION__, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1738 return FALSE;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1739 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1740 @@ -4176,7 +4176,7 @@ Read_1_Packet(RTMP r, char buf, unsigned int buflen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1741 if (pos + 11 + dataSize > nPacketLen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1742 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1743 RTMP_Log(RTMP_LOGERROR,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1744 - "Wrong data size (%lu), stream corrupted, aborting!",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1745 + "Wrong data size (%u), stream corrupted, aborting!",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1746 dataSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1747 ret = RTMP_READ_ERROR;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1748 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1749 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1750 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1751
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1752
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1753 From 5d03a4f0d6216da92830306436eae7eb318d5115 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1754 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1755 Date: Mon, 14 Nov 2011 16:17:27 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1756 Subject: [PATCH 28/33] Fix log messages
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1757
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1758 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1759 rtmpdump.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1760 rtmpgw.c \| 6 +++---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1761 rtmpsrv.c \| 8 ++++----
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1762 rtmpsuck.c \| 6 +++---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1763 4 files changed, 12 insertions(+), 12 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1764
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1765 diff --git a/rtmpdump.c b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1766 index c37def2..34bfdba 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1767 --- a/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1768 +++ b/rtmpdump.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1769 @@ -686,7 +686,7 @@ void usage(char *prog)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1770 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1771 ("--resume\|-e Resume a partial RTMP download\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1772 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1773 - ("--timeout\|-m num Timeout connection num seconds (default: %lu)\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1774 + ("--timeout\|-m num Timeout connection num seconds (default: %u)\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1775 DEF_TIMEOUT);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1776 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1777 ("--start\|-A num Start at num seconds into stream (not valid when using --live)\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1778 @@ -699,7 +699,7 @@ void usage(char *prog)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1779 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1780 ("--hashes\|-# Display progress with hashes, not with the byte counter\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1781 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1782 - ("--buffer\|-b Buffer time in milliseconds (default: %lu)\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1783 + ("--buffer\|-b Buffer time in milliseconds (default: %u)\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1784 DEF_BUFTIME);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1785 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1786 ("--skip\|-k num Skip num keyframes when looking for last keyframe to resume from. Useful if resume fails (default: %d)\n\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1787 diff --git a/rtmpgw.c b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1788 index 733e105..0cf56bb 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1789 --- a/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1790 +++ b/rtmpgw.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1791 @@ -563,7 +563,7 @@ void processTCPrequest(STREAMING_SERVER * server, // server socket and state (ou
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1792 rtmp.Link.token = req.token;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1793 rtmp.m_read.timestamp = dSeek;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1794
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1795 - RTMP_LogPrintf("Connecting ... port: %d, app: %s\n", req.rtmpport, req.app);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1796 + RTMP_LogPrintf("Connecting ... port: %d, app: %s\n", req.rtmpport, req.app.av_val);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1797 if (!RTMP_Connect(&rtmp, NULL))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1798 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1799 RTMP_LogPrintf("%s, failed to connect!\n", __FUNCTION__);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1800 @@ -738,7 +738,7 @@ stopStreaming(STREAMING_SERVER * server)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1801
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1802 if (closesocket(server->socket))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1803 RTMP_Log(RTMP_LOGERROR, "%s: Failed to close listening socket, error %d",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1804 - GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1805 + __FUNCTION__, GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1806
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1807 server->state = STREAMING_STOPPED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1808 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1809 @@ -1103,7 +1103,7 @@ main(int argc, char **argv)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1810 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1811 ("--jtv\|-j JSON Authentication token for Justin.tv legacy servers\n");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1812 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1813 - ("--buffer\|-b Buffer time in milliseconds (default: %lu)\n\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1814 + ("--buffer\|-b Buffer time in milliseconds (default: %u)\n\n",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1815 defaultRTMPRequest.bufferTime);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1816
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1817 RTMP_LogPrintf
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1818 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1819 index 91fc4da..b662d54 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1820 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1821 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1822 @@ -765,7 +765,7 @@ ServePacket(STREAMING_SERVER server, RTMP r, RTMPPacket *packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1823 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1824 int ret = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1825
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1826 - RTMP_Log(RTMP_LOGDEBUG, "%s, received packet type %02X, size %lu bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1827 + RTMP_Log(RTMP_LOGDEBUG, "%s, received packet type %02X, size %u bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1828 packet->m_packetType, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1829
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1830 switch (packet->m_packetType)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1831 @@ -812,7 +812,7 @@ ServePacket(STREAMING_SERVER server, RTMP r, RTMPPacket *packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1832
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1833 case 0x11: // flex message
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1834 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1835 - RTMP_Log(RTMP_LOGDEBUG, "%s, flex message, size %lu bytes, not fully supported",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1836 + RTMP_Log(RTMP_LOGDEBUG, "%s, flex message, size %u bytes, not fully supported",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1837 __FUNCTION__, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1838 //RTMP_LogHex(packet.m_body, packet.m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1839
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1840 @@ -840,7 +840,7 @@ ServePacket(STREAMING_SERVER server, RTMP r, RTMPPacket *packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1841
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1842 case 0x14:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1843 // invoke
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1844 - RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %lu bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1845 + RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %u bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1846 packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1847 //RTMP_LogHex(packet.m_body, packet.m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1848
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1849 @@ -1053,7 +1053,7 @@ stopStreaming(STREAMING_SERVER * server)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1850
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1851 if (closesocket(server->socket))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1852 RTMP_Log(RTMP_LOGERROR, "%s: Failed to close listening socket, error %d",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1853 - GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1854 + __FUNCTION__, GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1855
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1856 server->state = STREAMING_STOPPED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1857 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1858 diff --git a/rtmpsuck.c b/rtmpsuck.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1859 index 661e64b..e886179 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1860 --- a/rtmpsuck.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1861 +++ b/rtmpsuck.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1862 @@ -456,7 +456,7 @@ ServePacket(STREAMING_SERVER server, int which, RTMPPacket packet)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1863 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1864 int ret = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1865
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1866 - RTMP_Log(RTMP_LOGDEBUG, "%s, %s sent packet type %02X, size %lu bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1867 + RTMP_Log(RTMP_LOGDEBUG, "%s, %s sent packet type %02X, size %u bytes", __FUNCTION__,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1868 cst[which], packet->m_packetType, packet->m_nBodySize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1869
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1870 switch (packet->m_packetType)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1871 @@ -649,7 +649,7 @@ WriteStream(char **buf, // target pointer, maybe preallocated
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1872 if (pos + 11 + dataSize > nPacketLen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1873 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1874 RTMP_Log(RTMP_LOGERROR,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1875 - "Wrong data size (%lu), stream corrupted, aborting!",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1876 + "Wrong data size (%u), stream corrupted, aborting!",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1877 dataSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1878 ret = -2;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1879 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1880 @@ -1117,7 +1117,7 @@ stopStreaming(STREAMING_SERVER * server)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1881
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1882 if (fd && closesocket(fd))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1883 RTMP_Log(RTMP_LOGERROR, "%s: Failed to close listening socket, error %d",
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1884 - GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1885 + __FUNCTION__, GetSockError());
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1886
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1887 server->state = STREAMING_STOPPED;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1888 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1889 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1890 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1891
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1892
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1893 From 4e06e218e230a86608637b613499984703a342cf Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1894 From: Antti Ajanki <antti.ajanki@iki.fi>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1895 Date: Thu, 22 Dec 2011 17:54:10 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1896 Subject: [PATCH 29/33] Support decoding AMF_XML_DOC
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1897
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1898 MF_XML_DOC data is an XML document which is encoded similarly to a
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1899 long string.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1900 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1901 librtmp/amf.c \| 10 +++-------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1902 1 file changed, 3 insertions(+), 7 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1903
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1904 diff --git a/librtmp/amf.c b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1905 index f9ecf21..659421e 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1906 --- a/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1907 +++ b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1908 @@ -735,13 +735,15 @@ AMFProp_Decode(AMFObjectProperty prop, const char pBuffer, int nSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1909 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1910 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1911 case AMF_LONG_STRING:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1912 + case AMF_XML_DOC:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1913 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1914 unsigned int nStringSize = AMF_DecodeInt32(pBuffer);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1915 if (nSize < (long)nStringSize + 4)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1916 return -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1917 AMF_DecodeLongString(pBuffer, &prop->p_vu.p_aval);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1918 nSize -= (4 + nStringSize);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1919 - prop->p_type = AMF_STRING;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1920 + if (prop->p_type == AMF_LONG_STRING)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1921 + prop->p_type = AMF_STRING;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1922 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1923 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1924 case AMF_RECORDSET:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1925 @@ -750,12 +752,6 @@ AMFProp_Decode(AMFObjectProperty prop, const char pBuffer, int nSize,
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1926 return -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1927 break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1928 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1929 - case AMF_XML_DOC:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1930 - {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1931 - RTMP_Log(RTMP_LOGERROR, "AMF_XML_DOC not supported!");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1932 - return -1;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1933 - break;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1934 - }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1935 case AMF_TYPED_OBJECT:
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1936 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1937 RTMP_Log(RTMP_LOGERROR, "AMF_TYPED_OBJECT not supported!");
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1938 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1939 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1940
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1941
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1942 From adb77ff4d72cea92b7c307ccb64e9aa930d866da Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1943 From: Joshua Allmann <joshua.allmann@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1944 Date: Fri, 24 Feb 2012 13:44:29 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1945 Subject: [PATCH 30/33] Remove extra object end tag in Connect reply
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1946
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1947 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1948 rtmpsrv.c \| 3 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1949 1 file changed, 3 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1950
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1951 diff --git a/rtmpsrv.c b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1952 index b662d54..9aa62f3 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1953 --- a/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1954 +++ b/rtmpsrv.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1955 @@ -223,9 +223,6 @@ SendConnectResult(RTMP *r, double txn)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1956 *enc++ = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1957 *enc++ = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1958 *enc++ = AMF_OBJECT_END;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1959 - *enc++ = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1960 - *enc++ = 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1961 - *enc++ = AMF_OBJECT_END;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1962
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1963 packet.m_nBodySize = enc - packet.m_body;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1964
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1965 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1966 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1967
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1968
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1969 From 2ad1d5d133a46ceeaaa05c9375e293f332871f3b Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1970 From: Josh Allmann <joshua.allmann@gmail.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1971 Date: Fri, 24 Feb 2012 13:46:59 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1972 Subject: [PATCH 31/33] Fix upper bound check in AMF_GetProp
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1973
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1974 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1975 librtmp/amf.c \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1976 1 file changed, 1 insertion(+), 1 deletion(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1977
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1978 diff --git a/librtmp/amf.c b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1979 index 659421e..ce84f81 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1980 --- a/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1981 +++ b/librtmp/amf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1982 @@ -1121,7 +1121,7 @@ AMF_GetProp(AMFObject obj, const AVal name, int nIndex)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1983 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1984 if (nIndex >= 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1985 {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1986 - if (nIndex <= obj->o_num)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1987 + if (nIndex < obj->o_num)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1988 return &obj->o_props[nIndex];
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1989 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1990 else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1991 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1992 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1993
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1994
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1995 From eea470fa5f9a5481a36dedd257549595ef7480d6 Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1996 From: Martin Storsjo <martin@martin.st>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1997 Date: Thu, 8 Mar 2012 23:10:11 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1998 Subject: [PATCH 32/33] Add support for building with gnutls with nettle as
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1999 backend
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2000
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2001 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2002 Makefile \| 1 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2003 librtmp/Makefile \| 3 +++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2004 librtmp/dh.h \| 20 +++++++++++++++++++-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2005 librtmp/handshake.h \| 20 ++++++++++++++++++++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2006 librtmp/hashswf.c \| 11 +++++++++++
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2007 librtmp/rtmp.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2008 librtmp/rtmp_sys.h \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2009 7 files changed, 57 insertions(+), 4 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2010
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2011 diff --git a/Makefile b/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2012 index 6ef5742..0cf41be 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2013 --- a/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2014 +++ b/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2015 @@ -13,6 +13,7 @@ CRYPTO=OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2016 #CRYPTO=GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2017 LIBZ=-lz
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2018 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2019 +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2020 LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2021 LIB_POLARSSL=-lpolarssl $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2022 CRYPTO_LIB=$(LIB_$(CRYPTO))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2023 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2024 index a0125f1..353c6c8 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2025 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2026 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2027 @@ -21,14 +21,17 @@ CRYPTO=OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2028 DEF_POLARSSL=-DUSE_POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2029 DEF_OPENSSL=-DUSE_OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2030 DEF_GNUTLS=-DUSE_GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2031 +DEF_GNUTLS_NETTLE=-DUSE_GNUTLS_NETTLE
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2032 DEF_=-DNO_CRYPTO
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2033 REQ_GNUTLS=gnutls
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2034 +REQ_GNUTLS_NETTLE=gnutls
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2035 REQ_OPENSSL=libssl,libcrypto
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2036 LIBZ=-lz
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2037 LIBS_posix=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2038 LIBS_darwin=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2039 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2040 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2041 +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2042 LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2043 LIB_POLARSSL=-lpolarssl $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2044 PRIVATE_LIBS=$(LIBS_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2045 diff --git a/librtmp/dh.h b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2046 index a9f3763..830000e 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2047 --- a/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2048 +++ b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2049 @@ -76,7 +76,8 @@ static int MDH_compute_key(uint8_t secret, size_t len, MP_t pub, MDH dh)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2050 return 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2051 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2052
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2053 -#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2054 +#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2055 +#ifdef USE_GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2056 #include <gcrypt.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2057 typedef gcry_mpi_t MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2058 #define MP_new(m) m = gcry_mpi_new(1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2059 @@ -91,6 +92,23 @@ typedef gcry_mpi_t MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2060 #define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2061 #define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2062 #define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2063 +#else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2064 +#include <gmp.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2065 +#include <nettle/bignum.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2066 +typedef mpz_ptr MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2067 +#define MP_new(m) m = malloc(sizeof(*m)); mpz_init2(m, 1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2068 +#define MP_set_w(mpi, w) mpz_set_ui(mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2069 +#define MP_cmp(u, v) mpz_cmp(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2070 +#define MP_set(u, v) mpz_set(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2071 +#define MP_sub_w(mpi, w) mpz_sub_ui(mpi, mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2072 +#define MP_cmp_1(mpi) mpz_cmp_ui(mpi, 1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2073 +#define MP_modexp(r, y, q, p) mpz_powm(r, y, q, p)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2074 +#define MP_free(mpi) mpz_clear(mpi); free(mpi)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2075 +#define MP_gethex(u, hex, res) u = malloc(sizeof(*u)); mpz_init2(u, 1); res = (mpz_set_str(u, hex, 16) == 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2076 +#define MP_bytes(u) (mpz_sizeinbase(u, 2) + 7) / 8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2077 +#define MP_setbin(u,buf,len) nettle_mpz_get_str_256(len,buf,u)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2078 +#define MP_getbin(u,buf,len) u = malloc(sizeof(*u)); mpz_init2(u, 1); nettle_mpz_set_str_256_u(u,len,buf)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2079 +#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2080
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2081 typedef struct MDH {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2082 MP_t p;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2083 diff --git a/librtmp/handshake.h b/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2084 index 98bf3c8..4c2ea7f 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2085 --- a/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2086 +++ b/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2087 @@ -59,6 +59,26 @@ typedef gcry_cipher_hd_t RC4_handle;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2088 #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void )d,l,(void )s,l)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2089 #define RC4_free(h) gcry_cipher_close(h)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2090
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2091 +#elif defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2092 +#include <nettle/hmac.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2093 +#include <nettle/arcfour.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2094 +#ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2095 +#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2096 +#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2097 +#undef HMAC_CTX
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2098 +#define HMAC_CTX struct hmac_sha256_ctx
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2099 +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2100 +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2101 +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2102 +#define HMAC_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2103 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2104 +typedef struct arcfour_ctx* RC4_handle;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2105 +#define RC4_alloc(h) *h = malloc(sizeof(struct arcfour_ctx))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2106 +#define RC4_setkey(h,l,k) arcfour_set_key(h, l, k)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2107 +#define RC4_encrypt(h,l,d) arcfour_crypt(h,l,(uint8_t )d,(uint8_t )d)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2108 +#define RC4_encrypt2(h,l,s,d) arcfour_crypt(h,l,(uint8_t )d,(uint8_t )s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2109 +#define RC4_free(h) free(h)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2110 +
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2111 #else /* USE_OPENSSL */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2112 #include <openssl/sha.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2113 #include <openssl/hmac.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2114 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2115 index 0320480..8cefd3b 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2116 --- a/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2117 +++ b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2118 @@ -52,6 +52,17 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2119 #define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2120 #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2121 #define HMAC_close(ctx) gcry_md_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2122 +#elif defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2123 +#include <nettle/hmac.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2124 +#ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2125 +#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2126 +#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2127 +#undef HMAC_CTX
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2128 +#define HMAC_CTX struct hmac_sha256_ctx
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2129 +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2130 +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2131 +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2132 +#define HMAC_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2133 #else /* USE_OPENSSL */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2134 #include <openssl/ssl.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2135 #include <openssl/sha.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2136 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2137 index 52d0254..5cd7b8d 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2138 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2139 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2140 @@ -34,7 +34,7 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2141 #ifdef CRYPTO
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2142 #ifdef USE_POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2143 #include <polarssl/havege.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2144 -#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2145 +#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2146 #include <gnutls/gnutls.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2147 #else /* USE_OPENSSL */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2148 #include <openssl/ssl.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2149 @@ -204,7 +204,7 @@ RTMP_TLS_Init()
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2150 /* Do this regardless of NO_SSL, we use havege for rtmpe too */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2151 RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2152 havege_init(&RTMP_TLS_ctx->hs);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2153 -#elif defined(USE_GNUTLS) && !defined(NO_SSL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2154 +#elif (defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)) && !defined(NO_SSL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2155 /* Technically we need to initialize libgcrypt ourselves if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2156 * we're not going to call gnutls_global_init(). Ignoring this
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2157 * for now.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2158 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2159 index c3fd4a6..478c59f 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2160 --- a/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2161 +++ b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2162 @@ -81,7 +81,7 @@ typedef struct tls_ctx {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2163 #define TLS_shutdown(s) ssl_close_notify(s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2164 #define TLS_close(s) ssl_free(s); free(s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2165
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2166 -#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2167 +#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2168 #include <gnutls/gnutls.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2169 typedef struct tls_ctx {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2170 gnutls_certificate_credentials_t cred;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2171 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2172 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2173
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2174
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2175 From 7340f6dbc6b3c8e552baab2e5a891c2de75cddcc Mon Sep 17 00:00:00 2001
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2176 From: Howard Chu <hyc@highlandsun.com>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2177 Date: Thu, 8 Mar 2012 23:19:45 -0800
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2178 Subject: [PATCH 33/33] Cleanup prev commit, drop gcrypt support
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2179
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2180 ---
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2181 Makefile \| 3 +--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2182 librtmp/Makefile \| 5 +----
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2183 librtmp/dh.h \| 19 +------------------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2184 librtmp/handshake.h \| 19 +------------------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2185 librtmp/hashswf.c \| 11 -----------
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2186 librtmp/rtmp.c \| 4 ++--
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2187 librtmp/rtmp_sys.h \| 2 +-
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2188 7 files changed, 7 insertions(+), 56 deletions(-)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2189
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2190 diff --git a/Makefile b/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2191 index 0cf41be..a1595a8 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2192 --- a/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2193 +++ b/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2194 @@ -12,8 +12,7 @@ CRYPTO=OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2195 #CRYPTO=POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2196 #CRYPTO=GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2197 LIBZ=-lz
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2198 -LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2199 -LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2200 +LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2201 LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2202 LIB_POLARSSL=-lpolarssl $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2203 CRYPTO_LIB=$(LIB_$(CRYPTO))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2204 diff --git a/librtmp/Makefile b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2205 index 353c6c8..74ee3b5 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2206 --- a/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2207 +++ b/librtmp/Makefile
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2208 @@ -21,17 +21,14 @@ CRYPTO=OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2209 DEF_POLARSSL=-DUSE_POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2210 DEF_OPENSSL=-DUSE_OPENSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2211 DEF_GNUTLS=-DUSE_GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2212 -DEF_GNUTLS_NETTLE=-DUSE_GNUTLS_NETTLE
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2213 DEF_=-DNO_CRYPTO
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2214 REQ_GNUTLS=gnutls
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2215 -REQ_GNUTLS_NETTLE=gnutls
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2216 REQ_OPENSSL=libssl,libcrypto
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2217 LIBZ=-lz
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2218 LIBS_posix=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2219 LIBS_darwin=
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2220 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2221 -LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2222 -LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2223 +LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2224 LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2225 LIB_POLARSSL=-lpolarssl $(LIBZ)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2226 PRIVATE_LIBS=$(LIBS_$(SYS))
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2227 diff --git a/librtmp/dh.h b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2228 index 830000e..9959532 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2229 --- a/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2230 +++ b/librtmp/dh.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2231 @@ -76,23 +76,7 @@ static int MDH_compute_key(uint8_t secret, size_t len, MP_t pub, MDH dh)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2232 return 0;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2233 }
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2234
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2235 -#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2236 -#ifdef USE_GNUTLS
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2237 -#include <gcrypt.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2238 -typedef gcry_mpi_t MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2239 -#define MP_new(m) m = gcry_mpi_new(1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2240 -#define MP_set_w(mpi, w) gcry_mpi_set_ui(mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2241 -#define MP_cmp(u, v) gcry_mpi_cmp(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2242 -#define MP_set(u, v) gcry_mpi_set(u, v)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2243 -#define MP_sub_w(mpi, w) gcry_mpi_sub_ui(mpi, mpi, w)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2244 -#define MP_cmp_1(mpi) gcry_mpi_cmp_ui(mpi, 1)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2245 -#define MP_modexp(r, y, q, p) gcry_mpi_powm(r, y, q, p)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2246 -#define MP_free(mpi) gcry_mpi_release(mpi)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2247 -#define MP_gethex(u, hex, res) res = (gcry_mpi_scan(&u, GCRYMPI_FMT_HEX, hex, 0, 0) == 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2248 -#define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2249 -#define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2250 -#define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2251 -#else
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2252 +#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2253 #include <gmp.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2254 #include <nettle/bignum.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2255 typedef mpz_ptr MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2256 @@ -108,7 +92,6 @@ typedef mpz_ptr MP_t;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2257 #define MP_bytes(u) (mpz_sizeinbase(u, 2) + 7) / 8
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2258 #define MP_setbin(u,buf,len) nettle_mpz_get_str_256(len,buf,u)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2259 #define MP_getbin(u,buf,len) u = malloc(sizeof(*u)); mpz_init2(u, 1); nettle_mpz_set_str_256_u(u,len,buf)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2260 -#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2261
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2262 typedef struct MDH {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2263 MP_t p;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2264 diff --git a/librtmp/handshake.h b/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2265 index 4c2ea7f..0438486 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2266 --- a/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2267 +++ b/librtmp/handshake.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2268 @@ -43,27 +43,10 @@ typedef arc4_context * RC4_handle;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2269 #define RC4_free(h) free(h)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2270
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2271 #elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2272 -#include <gcrypt.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2273 -#ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2274 -#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2275 -#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2276 -#define HMAC_CTX gcry_md_hd_t
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2277 -#define HMAC_setup(ctx, key, len) gcry_md_open(&ctx, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC); gcry_md_setkey(ctx, key, len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2278 -#define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2279 -#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen); gcry_md_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2280 -
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2281 -typedef gcry_cipher_hd_t RC4_handle;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2282 -#define RC4_alloc(h) gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2283 -#define RC4_setkey(h,l,k) gcry_cipher_setkey(h,k,l)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2284 -#define RC4_encrypt(h,l,d) gcry_cipher_encrypt(h,(void *)d,l,NULL,0)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2285 -#define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void )d,l,(void )s,l)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2286 -#define RC4_free(h) gcry_cipher_close(h)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2287 -
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2288 -#elif defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2289 #include <nettle/hmac.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2290 #include <nettle/arcfour.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2291 #ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2292 -#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2293 +#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2294 #endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2295 #undef HMAC_CTX
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2296 #define HMAC_CTX struct hmac_sha256_ctx
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2297 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2298 index 8cefd3b..9f4e2c0 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2299 --- a/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2300 +++ b/librtmp/hashswf.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2301 @@ -42,17 +42,6 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2302 #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2303 #define HMAC_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2304 #elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2305 -#include <gnutls/gnutls.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2306 -#include <gcrypt.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2307 -#ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2308 -#define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2309 -#endif
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2310 -#define HMAC_CTX gcry_md_hd_t
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2311 -#define HMAC_setup(ctx, key, len) gcry_md_open(&ctx, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC); gcry_md_setkey(ctx, key, len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2312 -#define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2313 -#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2314 -#define HMAC_close(ctx) gcry_md_close(ctx)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2315 -#elif defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2316 #include <nettle/hmac.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2317 #ifndef SHA256_DIGEST_LENGTH
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2318 #define SHA256_DIGEST_LENGTH 32
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2319 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2320 index 5cd7b8d..52d0254 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2321 --- a/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2322 +++ b/librtmp/rtmp.c
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2323 @@ -34,7 +34,7 @@
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2324 #ifdef CRYPTO
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2325 #ifdef USE_POLARSSL
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2326 #include <polarssl/havege.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2327 -#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2328 +#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2329 #include <gnutls/gnutls.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2330 #else /* USE_OPENSSL */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2331 #include <openssl/ssl.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2332 @@ -204,7 +204,7 @@ RTMP_TLS_Init()
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2333 /* Do this regardless of NO_SSL, we use havege for rtmpe too */
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2334 RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx));
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2335 havege_init(&RTMP_TLS_ctx->hs);
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2336 -#elif (defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)) && !defined(NO_SSL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2337 +#elif defined(USE_GNUTLS) && !defined(NO_SSL)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2338 /* Technically we need to initialize libgcrypt ourselves if
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2339 * we're not going to call gnutls_global_init(). Ignoring this
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2340 * for now.
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2341 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2342 index 478c59f..c3fd4a6 100644
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2343 --- a/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2344 +++ b/librtmp/rtmp_sys.h
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2345 @@ -81,7 +81,7 @@ typedef struct tls_ctx {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2346 #define TLS_shutdown(s) ssl_close_notify(s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2347 #define TLS_close(s) ssl_free(s); free(s)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2348
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2349 -#elif defined(USE_GNUTLS) \|\| defined(USE_GNUTLS_NETTLE)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2350 +#elif defined(USE_GNUTLS)
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2351 #include <gnutls/gnutls.h>
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2352 typedef struct tls_ctx {
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2353 gnutls_certificate_credentials_t cred;
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2354 --
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2355 1.7.10.4
5136e4e6e487 package librtmp: update to v2.4 and beyond Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2356

Mercurial > mxe-octave

annotate src/librtmp-2-master.patch @ 3725:2acaa9943159