[rtmpdump] r123 - in trunk: README rtmpdump.c streams.c

[hyc]

Author: hyc
Date: Tue Dec 29 00:17:26 2009
New Revision: 123

Log:
Add note about automatic SWF verification

Modified:
   trunk/README
   trunk/rtmpdump.c
   trunk/streams.c

Modified: trunk/README
==============================================================================
--- trunk/README	Tue Dec 29 00:08:06 2009	(r122)
+++ trunk/README	Tue Dec 29 00:17:26 2009	(r123)
@@ -37,6 +37,10 @@ and use the --swfhash "01234..." option 
 
 e.g. $ ./rtmpdump --swfhash "123456..." --swfsize 987...
 
+Note: all of this is now done automatically if you provide the SWF URL using
+the -W (--swfVfy) option instead of the -s (--swfUrl) option. Also, the hash info
+is cached in ~/.swfinfo so it doesn't need to be recalculated all the time.
+
 Building OpenSSL 0.9.8k
 -----------------------
 arm:

Modified: trunk/rtmpdump.c
==============================================================================
--- trunk/rtmpdump.c	Tue Dec 29 00:08:06 2009	(r122)
+++ trunk/rtmpdump.c	Tue Dec 29 00:17:26 2009	(r123)
@@ -1296,6 +1296,7 @@ main(int argc, char **argv)
 	    break;
 	  }
         case 'W':
+	  STR2AVAL(swfUrl, optarg);
           if (SWFVerify(optarg, &swfSize, hash) == 0)
             {
               swfHash.av_val = (char *)hash;

Modified: trunk/streams.c
==============================================================================
--- trunk/streams.c	Tue Dec 29 00:08:06 2009	(r122)
+++ trunk/streams.c	Tue Dec 29 00:17:26 2009	(r123)
@@ -951,6 +951,8 @@ ParseOption(char opt, char *arg, RTMP_RE
     case 'W':
       {
         unsigned char hash[HASHLEN];
+
+        STR2AVAL(req->swfUrl, arg);
         if (SWFVerify(arg, &req->swfSize, hash) == 0)
           {
             req->swfHash.av_val = malloc(HASHLEN);