[rtmpdump] r343 - in trunk: librtmp/rtmp.c rtmpdump.c rtmpgw.c

[hyc]

Author: hyc
Date: Sat Mar 13 21:49:51 2010
New Revision: 343

Log:
app is a required parameter

Modified:
   trunk/librtmp/rtmp.c
   trunk/rtmpdump.c
   trunk/rtmpgw.c

Modified: trunk/librtmp/rtmp.c
==============================================================================
--- trunk/librtmp/rtmp.c	Sat Mar 13 06:05:00 2010	(r342)
+++ trunk/librtmp/rtmp.c	Sat Mar 13 21:49:51 2010	(r343)
@@ -2901,7 +2901,7 @@ Read_1_Packet(RTMP *r, char *buf, int bu
 	}
 
       if (r->m_read.flags & RTMP_READ_SEEKING)
-        {
+	{
 	  ret = RTMP_READ_IGNORE;
 	  break;
 	}

Modified: trunk/rtmpdump.c
==============================================================================
--- trunk/rtmpdump.c	Sat Mar 13 06:05:00 2010	(r342)
+++ trunk/rtmpdump.c	Sat Mar 13 21:49:51 2010	(r343)
@@ -1129,13 +1129,19 @@ main(int argc, char **argv)
   if (hostname == 0)
     {
       Log(LOGERROR,
-	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname");
+	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
       return RD_FAILED;
     }
   if (playpath.av_len == 0)
     {
       Log(LOGERROR,
-	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
+	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/app/playpath\") containing a playpath");
+      return RD_FAILED;
+    }
+  if (app.av_len == 0)
+    {
+      Log(LOGERROR,
+	  "You must specify an app (--app) or url (-r \"rtmp://host[:port]/app/playpath\") containing an app");
       return RD_FAILED;
     }
 
@@ -1207,7 +1213,7 @@ main(int argc, char **argv)
     }
 #endif
 
-  if (tcUrl.av_len == 0 && app.av_len != 0)
+  if (tcUrl.av_len == 0)
     {
       char str[512] = { 0 };
 

Modified: trunk/rtmpgw.c
==============================================================================
--- trunk/rtmpgw.c	Sat Mar 13 06:05:00 2010	(r342)
+++ trunk/rtmpgw.c	Sat Mar 13 21:49:51 2010	(r343)
@@ -464,14 +464,20 @@ void processTCPrequest(STREAMING_SERVER 
   if (req.hostname == 0)
     {
       Log(LOGERROR,
-	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname");
+	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
       goto filenotfound;
     }
   if (req.playpath.av_len == 0)
     {
       Log(LOGERROR,
-	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
-      goto filenotfound;;
+	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/app/playpath\") containing a playpath");
+      goto filenotfound;
+    }
+  if (req.app.av_len == 0)
+    {
+      Log(LOGERROR,
+	  "You must specify an app (--app) or url (-r \"rtmp://host[:port]/app/playpath\") containing an app");
+      goto filenotfound;
     }
 
   if (req.protocol == RTMP_PROTOCOL_UNDEFINED)