[dev] optimize the last PR and force the stream name to be specified in pub and sub.

Author: winshining

ngx_rtmp_cmd_module.c

@@ -539,6 +539,13 @@ ngx_rtmp_cmd_publish_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     ngx_rtmp_cmd_fill_args(v.name, v.args);
 
+    if (ngx_strlen(v.name) == 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "publish: no stream name specified");
+
+        return NGX_ERROR;
+    }
+
     if (ngx_rtmp_process_request_line(s, v.name, v.args,
             (const u_char *) "publish") != NGX_OK)
     {
@@ -603,6 +610,13 @@ ngx_rtmp_cmd_play_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     ngx_rtmp_cmd_fill_args(v.name, v.args);
 
+    if (ngx_strlen(v.name) == 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "play: no stream name specified");
+
+        return NGX_ERROR;
+    }
+
     if (ngx_rtmp_process_request_line(s, v.name, v.args,
             (const u_char *) "play") != NGX_OK)
     {
@@ -671,6 +685,13 @@ ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     ngx_rtmp_cmd_fill_args(v.name, v.args);
 
+    if (ngx_strlen(v.name) == 0) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "play2: no stream name specified");
+        
+        return NGX_ERROR;
+    }
+
     ngx_log_error(NGX_LOG_INFO, s->connection->log, 0,
                   "play2: name='%s' args='%s' start=%i",
                   v.name, v.args, (ngx_int_t) v.start);

ngx_rtmp_stat_module.c

@@ -504,9 +504,9 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
     ngx_rtmp_live_ctx_t            *ctx;
     ngx_rtmp_session_t             *s;
     ngx_int_t                       n;
-    ngx_uint_t                      m;
     ngx_uint_t                      nclients, total_nclients;
     ngx_uint_t                      f;
+    ngx_flag_t                      prev;
     u_char                          buf[NGX_INT_T_LEN];
     u_char                          bbuf[NGX_INT32_LEN];
     ngx_rtmp_stat_loc_conf_t       *slcf;
@@ -527,18 +527,19 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
 
     total_nclients = 0;
     for (n = 0; n < lacf->nbuckets; ++n) {
-        m = 0;
-        if (n > 0 && lacf->streams[n - 1]) {
-            m = 1;
+        prev = 0;
+        if (n && lacf->streams[n - 1]) {
+            prev = 1;
         }
+
         for (stream = lacf->streams[n]; stream; stream = stream->next) {
-            
             if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
                 NGX_RTMP_STAT_L("<stream>\r\n");
             } else {
-                if (m == 1 || stream->next != NULL) {
+                if (prev || stream->next) {
                     NGX_RTMP_STAT_L(",");
                 }
+
                 NGX_RTMP_STAT_L("{");
             }
 
@@ -895,7 +896,8 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
 {
     ngx_rtmp_play_ctx_t            *ctx, *sctx;
     ngx_rtmp_session_t             *s;
-    ngx_uint_t                      m, n, nclients, total_nclients;
+    ngx_uint_t                      n, nclients, total_nclients;
+    ngx_flag_t                      prev;
     u_char                          buf[NGX_INT_T_LEN];
     u_char                          bbuf[NGX_INT32_LEN];
     ngx_rtmp_stat_loc_conf_t       *slcf;
@@ -915,21 +917,22 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
 
     total_nclients = 0;
     for (n = 0; n < pacf->nbuckets; ++n) {
-        m = 0;
-        if (n > 0 && pacf->ctx[n - 1]) {
-            m = 1;
+        prev = 0;
+        if (n && pacf->ctx[n - 1]) {
+            prev = 1;
         }
+
         for (ctx = pacf->ctx[n]; ctx; ) {
-            
             if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
                 NGX_RTMP_STAT_L("<stream>\r\n");
                 NGX_RTMP_STAT_L("<name>");
                 NGX_RTMP_STAT_ECS(ctx->name);
                 NGX_RTMP_STAT_L("</name>\r\n");
             } else {
-                if (m == 1 || ctx->next != NULL) {
+                if (prev || ctx->next) {
                     NGX_RTMP_STAT_L(",");
                 }
+
                 NGX_RTMP_STAT_L("{\"name\":\"");
                 NGX_RTMP_STAT_ECS(ctx->name);
                 NGX_RTMP_STAT_L("\",\"clients\":[");
@@ -938,7 +941,6 @@ ngx_rtmp_stat_play(ngx_http_request_t *r, ngx_chain_t ***lll,
             nclients = 0;
             sctx = ctx;
             for (; ctx; ctx = ctx->next) {
-                
                 if (ngx_strcmp(ctx->name, sctx->name)) {
                     break;
                 }