Packman Build Service PMBS

rtmpdump.changes Changed

rtmpdump.spec Changed

@@ -1,20 +1,27 @@
-# norootforbuild
-
-Name:				rtmpdump
-Version:			2.3.99.git20110728
+# vim: set sw=3 ts=3 noet:
+#
+# spec file for package rtmpdump
+#
+
+Name:           rtmpdump
+Version:        2.3.99.git20111114
+Release:        0
+License:        GPL-2.0
 %define soname 0
-Release:			1
-Summary:			RTMP Stream Dumper
-Source:        rtmpdump-%{version}.tar.bz2
-Patch1:        rtmpdump-fix_u32.patch
-Source99:      rtmpdump-rpmlintrc
-URL:				http://rtmpdump.mplayerhq.hu/
-Group:			Productivity/Networking/Other
-License:			GNU General Public License version 2 (GPL v2)
-BuildRoot:		%{_tmppath}/build-%{name}-%{version}
-BuildRequires:	zlib-devel openssl-devel
-BuildRequires:	make glibc-devel gcc pkgconfig
-Requires:      librtmp%{soname} = %{version}
+Summary:        RTMP Stream Dumper
+Url:            http://rtmpdump.mplayerhq.hu/
+Group:          Productivity/Networking/Other
+Source:         rtmpdump-%{version}.tar.bz2
+Patch1:         rtmpdump-fix_u32.patch
+Source99:       rtmpdump-rpmlintrc
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  make
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  zlib-devel
+Requires:       librtmp%{soname} = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A small dumper for media content streamed over the RTMP protocol (like BBC's
@@ -22,8 +29,8 @@
 flv file, which can be played/transcoded using ffmpeg/mplayer, etc.
 
 %package -n librtmp%{soname}
-Summary:			RTMP Stream Dumper Library
-Group:         System/Libraries
+Summary:        RTMP Stream Dumper Library
+Group:          System/Libraries
 
 %description -n librtmp%{soname}
 A small dumper for media content streamed over the RTMP protocol (like BBC's
@@ -31,27 +38,27 @@
 flv file, which can be played/transcoded using ffmpeg/mplayer, etc.
 
 %package -n rtmpsuck
-Summary:			RTMP Transparent Proxy Server
-Group:			Productivity/Networking/Other
-Requires:      librtmp%{soname} = %{version}
+Summary:        RTMP Transparent Proxy Server
+Group:          Productivity/Networking/Other
+Requires:       librtmp%{soname} = %{version}
 
 %description -n rtmpsuck
 Proxy server that dumps RTMP streams.
 
 %package -n rtmpsrv
-Summary:			RTMP Server
-Group:			Productivity/Networking/Other
-Requires:      librtmp%{soname} = %{version}
+Summary:        RTMP Server
+Group:          Productivity/Networking/Other
+Requires:       librtmp%{soname} = %{version}
 
 %description -n rtmpsrv
 Server for RTMP streams.
 
 %package -n rtmpgw
-Summary:			RTMP to HTTP Gateway
-Group:			Productivity/Networking/Other
-Obsoletes:     streams < %{version}
-Provides:      streams = %{version}
-Requires:      librtmp%{soname} = %{version}
+Summary:        RTMP to HTTP Gateway
+Group:          Productivity/Networking/Other
+Requires:       librtmp%{soname} = %{version}
+Obsoletes:      streams < %{version}
+Provides:       streams = %{version}
 
 %description -n rtmpgw
 HTTP gateway: this is an HTTP server that accepts requests that consist of
@@ -59,35 +66,34 @@
 the retrieved data in the HTTP response.
 
 %package -n librtmp-devel
-Summary:			RTMP Stream Dumping Library
-Group:         Development/Libraries/C and C++
+Summary:        RTMP Stream Dumping Library
+Group:          Development/Libraries/C and C++
 %if 0%{?suse_version} >= 1030
-Requires:      libopenssl-devel
+Requires:       libopenssl-devel
 %else
-Requires:      openssl-devel
+Requires:       openssl-devel
 %endif
-Requires:      librtmp%{soname} = %{version}
+Requires:       librtmp%{soname} = %{version}
 
 %description -n librtmp-devel
 A small dumper for media content streamed over the RTMP protocol (like BBC's
 iPlayer high quality streams). Supplying an rtmp url will result in a dumped
 flv file, which can be played/transcoded using ffmpeg/mplayer, etc.
 
-
 %prep
 %setup -q
 %patch1
 
 %build
-%__make \
-	 CC="%__cc" \
+make \
+	 CC="gcc" \
 	 OPT="%{optflags}" \
 	 prefix="%{_prefix}" \
 	 libdir="%{_libdir}" \
 	 MANDIR="%{_mandir}"
 
-%__make -C librtmp \
-	 CC="%__cc" \
+make -C librtmp \
+	 CC="gcc" \
 	 OPT="%{optflags}" \
 	 prefix="%{_prefix}" \
 	 libdir="%{_libdir}" \
@@ -95,12 +101,12 @@
 	 librtmp.pc
 
 %install
-%__install -d "%{buildroot}%{_bindir}"
-find . -mindepth 1 -maxdepth 1 -type f -executable -exec %__install -m0755 {} "%{buildroot}%{_bindir}/" \;
+install -d "%{buildroot}%{_bindir}"
+find . -mindepth 1 -maxdepth 1 -type f -executable -exec install -m0755 {} "%{buildroot}%{_bindir}/" \;
 
 pushd librtmp
-%__install -d "%{buildroot}%{_includedir}/librtmp" "%{buildroot}%{_libdir}" "%{buildroot}%{_libdir}/pkgconfig"
-%__make \
+install -d "%{buildroot}%{_includedir}/librtmp" "%{buildroot}%{_libdir}" "%{buildroot}%{_libdir}/pkgconfig"
+make \
 	 prefix="%{buildroot}%{_prefix}" \
 	 libdir="%{buildroot}%{_libdir}" \
 	 INCDIR="%{buildroot}%{_includedir}/librtmp" \
@@ -111,9 +117,6 @@
 %post   -n librtmp%{soname} -p /sbin/ldconfig
 %postun -n librtmp%{soname} -p /sbin/ldconfig
 
-%clean
-%__rm -rf "%{buildroot}"
-
 %files
 %defattr(-,root,root)
 %doc README ChangeLog COPYING
@@ -147,8 +150,9 @@
 %{_libdir}/pkgconfig/librtmp.pc
 %doc %{_mandir}/man3/librtmp.3%{ext_man}
 
-# vim: set sw=3 ts=3 noet:
 # Local Variables:
 # mode: rpm-spec
 # tab-width: 3
 # End:
+
+%changelog

rtmpdump-2.3.99.git20110728.tar.bz2/README -> rtmpdump-2.3.99.git20111114.tar.bz2/README Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/Makefile -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/Makefile Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/amf.c -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/amf.c Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/dh.h -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/dh.h Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/hashswf.c -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/hashswf.c Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/log.h -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/log.h Changed

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/rtmp.c -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/rtmp.c Changed

@@ -185,7 +185,7 @@
 RTMPPacket_Dump(RTMPPacket *p)
 {
   RTMP_Log(RTMP_LOGDEBUG,
-      "RTMP PACKET: packet type: 0x%02x. channel: 0x%02x. info 1: %d info 2: %d. Body size: %lu. body: 0x%02x",
+      "RTMP PACKET: packet type: 0x%02x. channel: 0x%02x. info 1: %d info 2: %d. Body size: %u. body: 0x%02x",
       p->m_packetType, p->m_nChannel, p->m_nTimeStamp, p->m_nInfoField2,
       p->m_nBodySize, p->m_body ? (unsigned char)p->m_body[0] : 0);
 }
@@ -367,7 +367,7 @@
     RTMP_Log(RTMP_LOGDEBUG, "StopTime      : %d msec", dStop);
 
   RTMP_Log(RTMP_LOGDEBUG, "live     : %s", bLiveStream ? "yes" : "no");
-  RTMP_Log(RTMP_LOGDEBUG, "timeout  : %d sec", timeout);
+  RTMP_Log(RTMP_LOGDEBUG, "timeout  : %ld sec", timeout);
 
 #ifdef CRYPTO
   if (swfSHA256Hash != NULL && swfSize > 0)
@@ -376,7 +376,7 @@
       r->Link.SWFSize = swfSize;
       RTMP_Log(RTMP_LOGDEBUG, "SWFSHA256:");
       RTMP_LogHex(RTMP_LOGDEBUG, r->Link.SWFHash, sizeof(r->Link.SWFHash));
-      RTMP_Log(RTMP_LOGDEBUG, "SWFSize  : %lu", r->Link.SWFSize);
+      RTMP_Log(RTMP_LOGDEBUG, "SWFSize  : %u", r->Link.SWFSize);
     }
   else
     {
@@ -974,7 +974,7 @@
       }
     else
       {
-        RTMP_Log(RTMP_LOGERROR, "%s, SOCKS returned error code %d", packet[1]);
+        RTMP_Log(RTMP_LOGERROR, "%s, SOCKS returned error code %d", __FUNCTION__, packet[1]);
         return FALSE;
       }
   }
@@ -1161,14 +1161,14 @@
     case RTMP_PACKET_TYPE_FLEX_STREAM_SEND:
       /* flex stream send */
       RTMP_Log(RTMP_LOGDEBUG,
-	  "%s, flex stream send, size %lu bytes, not supported, ignoring",
+	  "%s, flex stream send, size %u bytes, not supported, ignoring",
 	  __FUNCTION__, packet->m_nBodySize);
       break;
 
     case RTMP_PACKET_TYPE_FLEX_SHARED_OBJECT:
       /* flex shared object */
       RTMP_Log(RTMP_LOGDEBUG,
-	  "%s, flex shared object, size %lu bytes, not supported, ignoring",
+	  "%s, flex shared object, size %u bytes, not supported, ignoring",
 	  __FUNCTION__, packet->m_nBodySize);
       break;
 
@@ -1176,7 +1176,7 @@
       /* flex message */
       {
 	RTMP_Log(RTMP_LOGDEBUG,
-	    "%s, flex message, size %lu bytes, not fully supported",
+	    "%s, flex message, size %u bytes, not fully supported",
 	    __FUNCTION__, packet->m_nBodySize);
 	/*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */
 
@@ -1198,7 +1198,7 @@
       }
     case RTMP_PACKET_TYPE_INFO:
       /* metadata (notify) */
-      RTMP_Log(RTMP_LOGDEBUG, "%s, received: notify %lu bytes", __FUNCTION__,
+      RTMP_Log(RTMP_LOGDEBUG, "%s, received: notify %u bytes", __FUNCTION__,
 	  packet->m_nBodySize);
       if (HandleMetadata(r, packet->m_body, packet->m_nBodySize))
 	bHasMediaPacket = 1;
@@ -1211,7 +1211,7 @@
 
     case RTMP_PACKET_TYPE_INVOKE:
       /* invoke */
-      RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %lu bytes", __FUNCTION__,
+      RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %u bytes", __FUNCTION__,
 	  packet->m_nBodySize);
       /*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */
 
@@ -1337,7 +1337,7 @@
 	  nBytes = nRead;
 	  r->m_nBytesIn += nRead;
 	  if (r->m_bSendCounter
-	      && r->m_nBytesIn > r->m_nBytesInSent + r->m_nClientBW / 2)
+	      && r->m_nBytesIn > ( r->m_nBytesInSent + r->m_nClientBW / 10))
 	    if (!SendBytesReceived(r))
 	        return FALSE;
 	}
@@ -2339,7 +2339,7 @@
 {
   AMFObject obj;
   AVal method;
-  int txn;
+  double txn;
   int ret = 0, nRes;
   if (body[0] != 0x02)		/* make sure it is a string method name we start with */
     {
@@ -2357,7 +2357,7 @@
 
   AMF_Dump(&obj);
   AMFProp_GetString(AMF_GetProp(&obj, NULL, 0), &method);
-  txn = (int)AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 1));
+  txn = AMFProp_GetNumber(AMF_GetProp(&obj, NULL, 1));
   RTMP_Log(RTMP_LOGDEBUG, "%s, server invoking <%s>", __FUNCTION__, method.av_val);
 
   if (AVMATCH(&method, &av__result))
@@ -2366,14 +2366,14 @@
       int i;
 
       for (i=0; i<r->m_numCalls; i++) {
-  	if (r->m_methodCalls[i].num == txn) {
+	if (r->m_methodCalls[i].num == (int)txn) {
 	  methodInvoked = r->m_methodCalls[i].name;
 	  AV_erase(r->m_methodCalls, &r->m_numCalls, i, FALSE);
 	  break;
 	}
       }
       if (!methodInvoked.av_val) {
-        RTMP_Log(RTMP_LOGDEBUG, "%s, received result id %d without matching request",
+        RTMP_Log(RTMP_LOGDEBUG, "%s, received result id %f without matching request",
 	  __FUNCTION__, txn);
 	goto leave;
       }
@@ -2584,7 +2584,7 @@
 
       if (AVMATCH(&prop->p_name, name))
 	{
-	  *p = *prop;
+	  memcpy(p, prop, sizeof(*prop));
 	  return TRUE;
 	}
 
@@ -2610,7 +2610,7 @@
       if (prop->p_name.av_len > name->av_len &&
       	  !memcmp(prop->p_name.av_val, name->av_val, name->av_len))
 	{
-	  *p = *prop;
+	  memcpy(p, prop, sizeof(*prop));
 	  return TRUE;
 	}
 
@@ -3055,7 +3055,7 @@
 
   if (ReadN(r, packet->m_body + packet->m_nBytesRead, nChunk) != nChunk)
     {
-      RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet body. len: %lu",
+      RTMP_Log(RTMP_LOGERROR, "%s, failed to read RTMP packet body. len: %u",
 	  __FUNCTION__, packet->m_nBodySize);
       return FALSE;
     }
@@ -4176,7 +4176,7 @@
 		  if (pos + 11 + dataSize > nPacketLen)
 		    {
 		      RTMP_Log(RTMP_LOGERROR,
-			  "Wrong data size (%lu), stream corrupted, aborting!",
+			  "Wrong data size (%u), stream corrupted, aborting!",
 			  dataSize);
 		      ret = RTMP_READ_ERROR;
 		      break;

rtmpdump-2.3.99.git20110728.tar.bz2/librtmp/rtmp_sys.h -> rtmpdump-2.3.99.git20111114.tar.bz2/librtmp/rtmp_sys.h Changed

rtmpdump-2.3.99.git20110728.tar.bz2/rtmpdump.c -> rtmpdump-2.3.99.git20111114.tar.bz2/rtmpdump.c Changed

@@ -46,6 +46,7 @@
 #define RD_SUCCESS		0
 #define RD_FAILED		1
 #define RD_INCOMPLETE		2
+#define RD_NO_CONNECT		3
 
 #define DEF_TIMEOUT	30	/* seconds */
 #define DEF_BUFTIME	(10 * 60 * 60 * 1000)	/* 10 hours default */
@@ -685,7 +686,7 @@
 	  RTMP_LogPrintf
 	    ("--resume|-e             Resume a partial RTMP download\n");
 	  RTMP_LogPrintf
-	    ("--timeout|-m num        Timeout connection num seconds (default: %lu)\n",
+	    ("--timeout|-m num        Timeout connection num seconds (default: %u)\n",
 	     DEF_TIMEOUT);
 	  RTMP_LogPrintf
 	    ("--start|-A num          Start at num seconds into stream (not valid when using --live)\n");
@@ -698,7 +699,7 @@
 	  RTMP_LogPrintf
 	    ("--hashes|-#             Display progress with hashes, not with the byte counter\n");
 	  RTMP_LogPrintf
-	    ("--buffer|-b             Buffer time in milliseconds (default: %lu)\n",
+	    ("--buffer|-b             Buffer time in milliseconds (default: %u)\n",
 	     DEF_BUFTIME);
 	  RTMP_LogPrintf
 	    ("--skip|-k num           Skip num keyframes when looking for last keyframe to resume from. Useful if resume fails (default: %d)\n\n",
@@ -1151,13 +1152,14 @@
 
   if (tcUrl.av_len == 0)
     {
-      char str[512] = { 0 };
-
-      tcUrl.av_len = snprintf(str, 511, "%s://%.*s:%d/%.*s",
+	  tcUrl.av_len = strlen(RTMPProtocolStringsLower[protocol]) +
+	  	hostname.av_len + app.av_len + sizeof("://:65535/");
+      tcUrl.av_val = (char *) malloc(tcUrl.av_len);
+	  if (!tcUrl.av_val)
+	    return RD_FAILED;
+      tcUrl.av_len = snprintf(tcUrl.av_val, tcUrl.av_len, "%s://%.*s:%d/%.*s",
 	  	   RTMPProtocolStringsLower[protocol], hostname.av_len,
 		   hostname.av_val, port, app.av_len, app.av_val);
-      tcUrl.av_val = (char *) malloc(tcUrl.av_len + 1);
-      strcpy(tcUrl.av_val, str);
     }
 
   int first = 1;
@@ -1253,7 +1255,7 @@
 
 	  if (!RTMP_Connect(&rtmp, NULL))
 	    {
-	      nStatus = RD_FAILED;
+	      nStatus = RD_NO_CONNECT;
 	      break;
 	    }

rtmpdump-2.3.99.git20110728.tar.bz2/rtmpgw.c -> rtmpdump-2.3.99.git20111114.tar.bz2/rtmpgw.c Changed

rtmpdump-2.3.99.git20110728.tar.bz2/rtmpsrv.c -> rtmpdump-2.3.99.git20111114.tar.bz2/rtmpsrv.c Changed

@@ -1,6 +1,6 @@
 /*  Simple RTMP Server
  *  Copyright (C) 2009 Andrej Stepanchuk
- *  Copyright (C) 2009 Howard Chu
+ *  Copyright (C) 2009-2011 Howard Chu
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -95,6 +95,10 @@
 
 STREAMING_SERVER *startStreaming(const char *address, int port);
 void stopStreaming(STREAMING_SERVER * server);
+void AVreplace(AVal *src, const AVal *orig, const AVal *repl);
+
+static const AVal av_dquote = AVC("\"");
+static const AVal av_escdquote = AVC("\\\"");
 
 typedef struct
 {
@@ -261,6 +265,7 @@
 static const AVal av_Stopped_playing = AVC("Stopped playing");
 SAVC(details);
 SAVC(clientid);
+static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken");
 
 static int
 SendPlayStart(RTMP *r)
@@ -575,6 +580,15 @@
     {
       SendResultNumber(r, txn, 10.0);
     }
+  else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken))
+    {
+      AVal usherToken;
+      AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &usherToken);
+      AVreplace(&usherToken, &av_dquote, &av_escdquote);
+      server->arglen += 6 + usherToken.av_len;
+      server->argc += 2;
+      r->Link.usherToken = usherToken;
+    }
   else if (AVMATCH(&method, &av_play))
     {
       char *file, *p, *q, *cmd, *ptr;
@@ -640,6 +654,17 @@
 	      ptr += sprintf(ptr, " -p \"%s\"", r->Link.pageUrl.av_val);
 	      argv[argc++].av_len = r->Link.pageUrl.av_len;
 	    }
+	  if (r->Link.usherToken.av_val)
+	    {
+	      argv[argc].av_val = ptr + 1;
+	      argv[argc++].av_len = 2;
+	      argv[argc].av_val = ptr + 5;
+	      ptr += sprintf(ptr, " -j \"%s\"", r->Link.usherToken.av_val);
+	      argv[argc++].av_len = r->Link.usherToken.av_len;
+	      free(r->Link.usherToken.av_val);
+	      r->Link.usherToken.av_val = NULL;
+	      r->Link.usherToken.av_len = 0;
+	    }
 	  if (r->Link.extras.o_num) {
 	    ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc);
 	    AMF_Reset(&r->Link.extras);
@@ -740,7 +765,7 @@
 {
   int ret = 0;
 
-  RTMP_Log(RTMP_LOGDEBUG, "%s, received packet type %02X, size %lu bytes", __FUNCTION__,
+  RTMP_Log(RTMP_LOGDEBUG, "%s, received packet type %02X, size %u bytes", __FUNCTION__,
     packet->m_packetType, packet->m_nBodySize);
 
   switch (packet->m_packetType)
@@ -787,7 +812,7 @@
 
     case 0x11:			// flex message
       {
-	RTMP_Log(RTMP_LOGDEBUG, "%s, flex message, size %lu bytes, not fully supported",
+	RTMP_Log(RTMP_LOGDEBUG, "%s, flex message, size %u bytes, not fully supported",
 	    __FUNCTION__, packet->m_nBodySize);
 	//RTMP_LogHex(packet.m_body, packet.m_nBodySize);
 
@@ -815,7 +840,7 @@
 
     case 0x14:
       // invoke
-      RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %lu bytes", __FUNCTION__,
+      RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %u bytes", __FUNCTION__,
 	  packet->m_nBodySize);
       //RTMP_LogHex(packet.m_body, packet.m_nBodySize);
 
@@ -911,6 +936,11 @@
   rtmp.Link.pageUrl.av_val = NULL;
   rtmp.Link.app.av_val = NULL;
   rtmp.Link.flashVer.av_val = NULL;
+  if (rtmp.Link.usherToken.av_val)
+    {
+      free(rtmp.Link.usherToken.av_val);
+      rtmp.Link.usherToken.av_val = NULL;
+    }
   RTMP_LogPrintf("done!\n\n");
 
 quit:
@@ -1023,7 +1053,7 @@
 
       if (closesocket(server->socket))
 	RTMP_Log(RTMP_LOGERROR, "%s: Failed to close listening socket, error %d",
-	    GetSockError());
+	    __FUNCTION__, GetSockError());
 
       server->state = STREAMING_STOPPED;
     }
@@ -1111,3 +1141,43 @@
 #endif
   return nStatus;
 }
+
+void
+AVreplace(AVal *src, const AVal *orig, const AVal *repl)
+{
+  char *srcbeg = src->av_val;
+  char *srcend = src->av_val + src->av_len;
+  char *dest, *sptr, *dptr;
+  int n = 0;
+
+  /* count occurrences of orig in src */
+  sptr = src->av_val;
+  while (sptr < srcend && (sptr = strstr(sptr, orig->av_val)))
+    {
+      n++;
+      sptr += orig->av_len;
+    }
+  if (!n)
+    return;
+
+  dest = malloc(src->av_len + 1 + (repl->av_len - orig->av_len) * n);
+
+  sptr = src->av_val;
+  dptr = dest;
+  while (sptr < srcend && (sptr = strstr(sptr, orig->av_val)))
+    {
+      n = sptr - srcbeg;
+      memcpy(dptr, srcbeg, n);
+      dptr += n;
+      memcpy(dptr, repl->av_val, repl->av_len);
+      dptr += repl->av_len;
+      sptr += orig->av_len;
+      srcbeg = sptr;
+    }
+  n = srcend - srcbeg;
+  memcpy(dptr, srcbeg, n);
+  dptr += n;
+  *dptr = '\0';
+  src->av_val = dest;
+  src->av_len = dptr - dest;
+}

rtmpdump-2.3.99.git20110728.tar.bz2/rtmpsuck.c -> rtmpdump-2.3.99.git20111114.tar.bz2/rtmpsuck.c Changed

Changes of Revision 7