[rtmpdump] r465 - in trunk: librtmp/parseurl.c librtmp/rtmp.c librtmp/rtmp.h rtmpdump.1 rtmpdump.c rtmpgw.8 rtmpgw.c

hyc subversion at mplayerhq.hu
Sun May 2 17:43:04 CEST 2010


Author: hyc
Date: Sun May  2 17:43:03 2010
New Revision: 465

Log:
Looks like rtmps doesn't tunnel by default, so add rtmpts

Modified:
   trunk/librtmp/parseurl.c
   trunk/librtmp/rtmp.c
   trunk/librtmp/rtmp.h
   trunk/rtmpdump.1
   trunk/rtmpdump.c
   trunk/rtmpgw.8
   trunk/rtmpgw.c

Modified: trunk/librtmp/parseurl.c
==============================================================================
--- trunk/librtmp/parseurl.c	Sat May  1 13:00:04 2010	(r464)
+++ trunk/librtmp/parseurl.c	Sun May  2 17:43:03 2010	(r465)
@@ -66,6 +66,8 @@ bool RTMP_ParseURL(const char *url, int 
 	        *protocol = RTMP_PROTOCOL_RTMFP;
 	else if(len == 6 && strncasecmp(url, "rtmpte", 6)==0)
 	        *protocol = RTMP_PROTOCOL_RTMPTE;
+	else if(len == 6 && strncasecmp(url, "rtmpts", 6)==0)
+	        *protocol = RTMP_PROTOCOL_RTMPTS;
 	else {
 		RTMP_Log(RTMP_LOGWARNING, "Unknown protocol!\n");
 		goto parsehost;

Modified: trunk/librtmp/rtmp.c
==============================================================================
--- trunk/librtmp/rtmp.c	Sat May  1 13:00:04 2010	(r464)
+++ trunk/librtmp/rtmp.c	Sun May  2 17:43:03 2010	(r465)
@@ -54,8 +54,8 @@ const char RTMPProtocolStrings[][7] = {
   "RTMPT",
   "RTMPE",
   "RTMPTE",
-  "",
   "RTMPS",
+  "RTMPTS",
   "",
   "",
   "RTMFP"
@@ -66,8 +66,8 @@ const char RTMPProtocolStringsLower[][7]
   "rtmpt",
   "rtmpe",
   "rtmpte",
-  "",
   "rtmps",
+  "rtmpts",
   "",
   "",
   "rtmfp"

Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h	Sat May  1 13:00:04 2010	(r464)
+++ trunk/librtmp/rtmp.h	Sun May  2 17:43:03 2010	(r465)
@@ -52,8 +52,9 @@ extern "C"
 #define RTMP_PROTOCOL_RTMP      0
 #define RTMP_PROTOCOL_RTMPE     RTMP_FEATURE_ENC
 #define RTMP_PROTOCOL_RTMPT     RTMP_FEATURE_HTTP
-#define RTMP_PROTOCOL_RTMPS     (RTMP_FEATURE_HTTP|RTMP_FEATURE_SSL)
+#define RTMP_PROTOCOL_RTMPS     RTMP_FEATURE_SSL
 #define RTMP_PROTOCOL_RTMPTE    (RTMP_FEATURE_HTTP|RTMP_FEATURE_ENC)
+#define RTMP_PROTOCOL_RTMPTS    (RTMP_FEATURE_HTTP|RTMP_FEATURE_SSL)
 #define RTMP_PROTOCOL_RTMFP     RTMP_FEATURE_MFP
 
 #define RTMP_DEFAULT_CHUNKSIZE	128

Modified: trunk/rtmpdump.1
==============================================================================
--- trunk/rtmpdump.1	Sat May  1 13:00:04 2010	(r464)
+++ trunk/rtmpdump.1	Sun May  2 17:43:03 2010	(r465)
@@ -104,7 +104,8 @@ Overrides the protocol in the RTMP URL.
   1 = rtmpt
   2 = rtmpe
   3 = rtmpte
-  5 = rtmps
+  4 = rtmps
+  5 = rtmpts
 .fi
 .TP
 \fB\-\-socks		\-S\fP\ \fIhost:port\fP

Modified: trunk/rtmpdump.c
==============================================================================
--- trunk/rtmpdump.c	Sat May  1 13:00:04 2010	(r464)
+++ trunk/rtmpdump.c	Sun May  2 17:43:03 2010	(r465)
@@ -939,7 +939,7 @@ main(int argc, char **argv)
 	  break;
 	case 'l':
 	  protocol = atoi(optarg);
-	  if (protocol < RTMP_PROTOCOL_RTMP || protocol > RTMP_PROTOCOL_RTMPS)
+	  if (protocol < RTMP_PROTOCOL_RTMP || protocol > RTMP_PROTOCOL_RTMPTS)
 	    {
 	      RTMP_Log(RTMP_LOGERROR, "Unknown protocol specified: %d", protocol);
 	      return RD_FAILED;

Modified: trunk/rtmpgw.8
==============================================================================
--- trunk/rtmpgw.8	Sat May  1 13:00:04 2010	(r464)
+++ trunk/rtmpgw.8	Sun May  2 17:43:03 2010	(r465)
@@ -100,7 +100,8 @@ Overrides the protocol in the RTMP URL.
   1 = rtmpt
   2 = rtmpe
   3 = rtmpte
-  5 = rtmps
+  4 = rtmps
+  5 = rtmpts
 .fi
 .TP
 \fB\-\-socks		\-S\fP\ \fIhost:port\fP

Modified: trunk/rtmpgw.c
==============================================================================
--- trunk/rtmpgw.c	Sat May  1 13:00:04 2010	(r464)
+++ trunk/rtmpgw.c	Sun May  2 17:43:03 2010	(r465)
@@ -858,7 +858,7 @@ ParseOption(char opt, char *arg, RTMP_RE
     case 'l':
       {
 	int protocol = atoi(arg);
-	if (protocol != RTMP_PROTOCOL_RTMP && protocol != RTMP_PROTOCOL_RTMPE)
+	if (protocol < RTMP_PROTOCOL_RTMP || protocol > RTMP_PROTOCOL_RTMPTS)
 	  {
 	    RTMP_Log(RTMP_LOGERROR, "Unknown protocol specified: %d, using default",
 		protocol);


More information about the rtmpdump mailing list