From 11e11005acd00f2a53e5c0bf629f002cb85488de Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 24 Dec 2015 19:14:23 +0800
Subject: [PATCH] specifies the try default vhost

---
 trunk/src/app/srs_app_rtmp_conn.cpp | 8 ++++----
 trunk/src/app/srs_app_rtmp_conn.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
index 92f4dc13c..94fa2f0b7 100644
--- a/trunk/src/app/srs_app_rtmp_conn.cpp
+++ b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -418,8 +418,8 @@ int SrsRtmpConn::do_cycle()
         return ret;
     }
     
-    // check vhost
-    if ((ret = check_vhost()) != ERROR_SUCCESS) {
+    // check vhost, allow default vhost.
+    if ((ret = check_vhost(true)) != ERROR_SUCCESS) {
         srs_error("check vhost failed. ret=%d", ret);
         return ret;
     }
@@ -787,13 +787,13 @@ int SrsRtmpConn::stream_service_cycle()
     return ret;
 }
 
-int SrsRtmpConn::check_vhost()
+int SrsRtmpConn::check_vhost(bool try_default_vhost)
 {
     int ret = ERROR_SUCCESS;
     
     srs_assert(req != NULL);
     
-    SrsConfDirective* vhost = _srs_config->get_vhost(req->vhost);
+    SrsConfDirective* vhost = _srs_config->get_vhost(req->vhost, try_default_vhost);
     if (vhost == NULL) {
         ret = ERROR_RTMP_VHOST_NOT_FOUND;
         srs_error("vhost %s not found. ret=%d", req->vhost.c_str(), ret);
diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp
index 3dc13187d..244f509b6 100644
--- a/trunk/src/app/srs_app_rtmp_conn.hpp
+++ b/trunk/src/app/srs_app_rtmp_conn.hpp
@@ -171,7 +171,7 @@ private:
     virtual int service_cycle();
     // stream(play/publish) service cycle, identify client first.
     virtual int stream_service_cycle();
-    virtual int check_vhost();
+    virtual int check_vhost(bool try_default_vhost);
     virtual int playing(SrsSource* source);
     virtual int do_playing(SrsSource* source, SrsConsumer* consumer, SrsQueueRecvThread* trd);
     virtual int publishing(SrsSource* source);