[rtmpdump] r217 - in tags/rel-2.1c: . rtmpdump.c rtmpsrv.c streams.c

[hyc]

Author: hyc
Date: Sat Jan  9 03:11:52 2010
New Revision: 217

Log:
Merge --conn NULL support

Modified:
   tags/rel-2.1c/   (props changed)
   tags/rel-2.1c/rtmpdump.c
   tags/rel-2.1c/rtmpsrv.c
   tags/rel-2.1c/streams.c

Modified: tags/rel-2.1c/rtmpdump.c
==============================================================================
--- tags/rel-2.1c/rtmpdump.c	Sat Jan  9 03:09:50 2010	(r216)
+++ tags/rel-2.1c/rtmpdump.c	Sat Jan  9 03:11:52 2010	(r217)
@@ -1074,6 +1074,9 @@ parseAMF(AMFObject *obj, const char *arg
           prop.p_type = AMF_NUMBER;
           prop.p_vu.p_number = strtod(p, NULL);
           break;
+        case 'Z':
+          prop.p_type = AMF_NULL;
+          break;
         case 'O':
           i = atoi(p);
           if (i)
@@ -1320,7 +1323,7 @@ main(int argc, char **argv)
 	  LogPrintf
 	    ("                        B:boolean(0|1), S:string, N:number, O:object-flag(0|1),\n");
 	  LogPrintf
-	    ("                        NB:name:boolean, NS:name:string, NN:name:number\n");
+	    ("                        Z:(null), NB:name:boolean, NS:name:string, NN:name:number\n");
 	  LogPrintf
 	    ("--flashVer|-f string    Flash version string (default: \"%s\")\n",
 	     DEFAULT_FLASH_VER);

Modified: tags/rel-2.1c/rtmpsrv.c
==============================================================================
--- tags/rel-2.1c/rtmpsrv.c	Sat Jan  9 03:09:50 2010	(r216)
+++ tags/rel-2.1c/rtmpsrv.c	Sat Jan  9 03:11:52 2010	(r217)
@@ -245,7 +245,7 @@ static void
 dumpAMF(AMFObject *obj)
 {
    int i;
-   const char opt[] = "NBSO";
+   const char opt[] = "NBSO Z";
 
    for (i=0; i < obj->o_num; i++)
      {
@@ -272,6 +272,8 @@ dumpAMF(AMFObject *obj)
            dumpAMF(&p->p_vu.p_object);
            LogPrintf(" -C O:0");
            break;
+         case AMF_NULL:
+           break;
          default:
            LogPrintf("<type %d>", p->p_type);
          }

Modified: tags/rel-2.1c/streams.c
==============================================================================
--- tags/rel-2.1c/streams.c	Sat Jan  9 03:09:50 2010	(r216)
+++ tags/rel-2.1c/streams.c	Sat Jan  9 03:11:52 2010	(r217)
@@ -131,6 +131,9 @@ parseAMF(AMFObject *obj, const char *arg
           prop.p_type = AMF_NUMBER;
           prop.p_vu.p_number = strtod(p, NULL);
           break;
+        case 'Z':
+          prop.p_type = AMF_NULL;
+          break;
         case 'O':
           i = atoi(p);
           if (i)
@@ -1251,7 +1254,7 @@ main(int argc, char **argv)
 	  LogPrintf
 	    ("                        B:boolean(0|1), S:string, N:number, O:object-flag(0|1),\n");
 	  LogPrintf
-	    ("                        NB:name:boolean, NS:name:string, NN:name:number\n");
+	    ("                        Z:(null), NB:name:boolean, NS:name:string, NN:name:number\n");
 	  LogPrintf
 	    ("--flashVer|-f string    Flash version string (default: \"%s\")\n",
 	     DEFAULT_FLASH_VER);