[fix] fix on_connect and on_play command bugs and server matching bug.

Author: winshining

ngx_http_flv_live_module.c

@@ -953,10 +953,10 @@ ngx_http_flv_live_request(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         ngx_http_flv_live_play_handler(&ctx->play);
 
         if (r->main->blocked == 0) {
-            r->blocked++;
+            r->main->blocked++;
         }
 
-        return NGX_OK;
+        return ctx->error ? NGX_ERROR : NGX_OK;
     }
 
     return ngx_rtmp_play(s, &v);
@@ -1137,14 +1137,18 @@ ngx_http_flv_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
     }
 
     r = s->data;
-    if (r == NULL || s->wait_notify_play) {
+    if (r == NULL) {
         goto next;
     }
 
     if (r->main->blocked == 0) {
         r->main->blocked++;
     }
 
+    if (s->wait_notify_play) {
+        goto next;
+    }
+
     /* join stream as a subscriber */
 
     if (ngx_http_flv_live_join(s, v->name, 0) == NGX_ERROR) {
@@ -1297,20 +1301,19 @@ ngx_http_flv_live_play_handler(ngx_event_t *ev)
     ngx_http_flv_live_ctx_t    *ctx;
 
     c = ev->data;
-    r = c->data;
+    if (c->destroyed) {
+        return;
+    }
 
+    r = c->data;
     ctx = ngx_http_get_module_ctx(r, ngx_http_flv_live_module);
     s = ctx->s;
 
-    if (c->destroyed) {
-        return;
+    if (ev->timer_set) {
+        ngx_del_timer(ev);
     }
 
     if (!s->wait_notify_connect) {
-        if (ev->timer_set) {
-            ngx_del_timer(ev);
-        }
-
         ngx_memzero(&v, sizeof(ngx_rtmp_play_t));
 
         ngx_memcpy(v.name, ctx->stream.data, ngx_min(ctx->stream.len,
@@ -1329,7 +1332,9 @@ ngx_http_flv_live_play_handler(ngx_event_t *ev)
             r->blocked--;
         }
 
-        ngx_rtmp_play(s, &v);
+        if (ngx_rtmp_play(s, &v) != NGX_OK) {
+            ctx->error = 1;
+        }
     } else {
         ngx_add_timer(ev, 20);
     }
@@ -1826,6 +1831,13 @@ ngx_http_flv_live_connect_init(ngx_rtmp_session_t *s, ngx_str_t *app,
 
 #undef NGX_RTMP_SET_STRPAR
 
+    if (ngx_rtmp_process_virtual_host(s) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "flv live: failed to process virtual host");
+
+        return NGX_ERROR;
+    }
+
     s->stream.len = stream->len;
     s->stream.data = ngx_pstrdup(s->connection->pool, stream);
 

ngx_http_flv_live_module.h

@@ -32,6 +32,7 @@ typedef struct ngx_http_flv_live_ctx_s {
     ngx_rtmp_session_t  *s;
     ngx_flag_t           flv_live;
     ngx_flag_t           header_sent;
+    ngx_flag_t           error;
 
     ngx_str_t            app;
     ngx_str_t            port;

ngx_rtmp_cmd_module.c

@@ -176,6 +176,32 @@ ngx_rtmp_cmd_connect_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         return NGX_ERROR;
     }
 
+#define NGX_RTMP_SET_STRPAR(name)                                             \
+    s->name.len = ngx_strlen(v.name);                                         \
+    s->name.data = ngx_palloc(s->connection->pool, s->name.len);              \
+    ngx_memcpy(s->name.data, v.name, s->name.len)
+
+    NGX_RTMP_SET_STRPAR(app);
+    NGX_RTMP_SET_STRPAR(args);
+    NGX_RTMP_SET_STRPAR(flashver);
+    NGX_RTMP_SET_STRPAR(swf_url);
+    NGX_RTMP_SET_STRPAR(tc_url);
+    NGX_RTMP_SET_STRPAR(page_url);
+
+#undef NGX_RTMP_SET_STRPAR
+
+    if (s->auto_pushed) {
+        s->host_start = v.server_name;
+        s->host_end = v.server_name + ngx_strlen(v.server_name);
+    }
+
+    if (ngx_rtmp_process_virtual_host(s) != NGX_OK) {
+        ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
+                      "connect: failed to process virtual host");
+
+        return NGX_ERROR;
+    }
+
     len = ngx_strlen(v.app);
     if (len > 10 && !ngx_memcmp(v.app + len - 10, "/_definst_", 10)) {
         v.app[len - 10] = 0;
@@ -265,6 +291,8 @@ ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
         return NGX_ERROR;
     }
 
+    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
+
     trans = v->trans;
 
     /* fill session parameters */
@@ -276,9 +304,15 @@ ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
 
 
 #define NGX_RTMP_SET_STRPAR(name)                                             \
-    s->name.len = ngx_strlen(v->name);                                        \
-    s->name.data = ngx_palloc(s->connection->pool, s->name.len);              \
-    ngx_memcpy(s->name.data, v->name, s->name.len)
+    do {                                                                      \
+        if (s->name.len != ngx_strlen(v->name)                                \
+            || ngx_strncasecmp(s->name.data, v->name, s->name.len))           \
+        {                                                                     \
+            s->name.len = ngx_strlen(v->name);                                \
+            s->name.data = ngx_palloc(s->connection->pool, s->name.len);      \
+            ngx_memcpy(s->name.data, v->name, s->name.len);                   \
+        }                                                                     \
+    } while (0)
 
     NGX_RTMP_SET_STRPAR(app);
     NGX_RTMP_SET_STRPAR(args);
@@ -289,17 +323,6 @@ ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v)
 
 #undef NGX_RTMP_SET_STRPAR
 
-    if (s->auto_pushed) {
-        s->host_start = v->server_name;
-        s->host_end = v->server_name + ngx_strlen(v->server_name);
-    }
-
-    if (ngx_rtmp_process_virtual_host(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
-    cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
-
     p = ngx_strlchr(s->app.data, s->app.data + s->app.len, '?');
     if (p) {
         s->app.len = (p - s->app.data);