From 3d0d43c5dc1bd219fc6fcea6f23e8e21cc422572 Mon Sep 17 00:00:00 2001
From: tufang14 <breadbean1449@gmail.com>
Date: Tue, 2 Dec 2014 14:38:54 +0800
Subject: [PATCH] token bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

多级origin-edge模式，edge上功能不生效
---
 trunk/src/app/srs_app_rtmp_conn.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
index 97aefb326..35b19f902 100644
--- a/trunk/src/app/srs_app_rtmp_conn.cpp
+++ b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -244,6 +244,16 @@ int SrsRtmpConn::service_cycle()
         return bandwidth->bandwidth_check(rtmp, skt, req, local_ip);
     }
     
+    // do token traverse before serve it.
+    bool vhost_is_edge = _srs_config->get_vhost_is_edge(req->vhost);
+    bool edge_traverse = _srs_config->get_vhost_edge_token_traverse(req->vhost);
+    if (vhost_is_edge && edge_traverse) {
+        if ((ret = check_edge_token_traverse_auth()) != ERROR_SUCCESS) {
+            srs_warn("token auth failed, ret=%d", ret);
+            return ret;
+        }
+    }
+    
     if ((ret = rtmp->response_connect_app(req, local_ip.c_str())) != ERROR_SUCCESS) {
         srs_error("response connect app failed. ret=%d", ret);
         return ret;
@@ -326,15 +336,7 @@ int SrsRtmpConn::stream_service_cycle()
     }
     srs_info("set chunk_size=%d success", chunk_size);
     
-    // do token traverse before serve it.
     bool vhost_is_edge = _srs_config->get_vhost_is_edge(req->vhost);
-    bool edge_traverse = _srs_config->get_vhost_edge_token_traverse(req->vhost);
-    if (vhost_is_edge && edge_traverse) {
-        if ((ret = check_edge_token_traverse_auth()) != ERROR_SUCCESS) {
-            srs_warn("token auth failed, ret=%d", ret);
-            return ret;
-        }
-    }
     
     // find a source to serve.
     SrsSource* source = NULL;