[rtmpdump] r349 - in trunk: rtmpdump.c rtmpgw.c

[hyc]

Author: hyc
Date: Sun Mar 14 05:30:24 2010
New Revision: 349

Log:
Rever -r343, app is not required

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

Modified: trunk/rtmpdump.c
==============================================================================
--- trunk/rtmpdump.c	Sun Mar 14 00:54:10 2010	(r348)
+++ trunk/rtmpdump.c	Sun Mar 14 05:30:24 2010	(r349)
@@ -1129,19 +1129,13 @@ main(int argc, char **argv)
   if (hostname == 0)
     {
       Log(LOGERROR,
-	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
+	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/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]/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");
+	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
       return RD_FAILED;
     }
 
@@ -1213,7 +1207,7 @@ main(int argc, char **argv)
     }
 #endif
 
-  if (tcUrl.av_len == 0)
+  if (tcUrl.av_len == 0 && app.av_len != 0)
     {
       char str[512] = { 0 };
 

Modified: trunk/rtmpgw.c
==============================================================================
--- trunk/rtmpgw.c	Sun Mar 14 00:54:10 2010	(r348)
+++ trunk/rtmpgw.c	Sun Mar 14 05:30:24 2010	(r349)
@@ -465,23 +465,16 @@ void processTCPrequest(STREAMING_SERVER 
   if (req.hostname == 0)
     {
       Log(LOGERROR,
-	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
+	  "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname");
       status = "400 Missing Hostname";
       goto filenotfound;
     }
   if (req.playpath.av_len == 0)
     {
       Log(LOGERROR,
-	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/app/playpath\") containing a playpath");
+	  "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
       status = "400 Missing 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");
-      status = "400 Missing App";
-      goto filenotfound;
+      goto filenotfound;;
     }
 
   if (req.protocol == RTMP_PROTOCOL_UNDEFINED)