merge with security bug fix.

trunk/configure

@@ -389,7 +389,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
             "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" 
             "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge"
             "srs_app_kbps" "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_avc_aac"
-            "srs_app_recv_thread" "srs_app_security")
+            "srs_app_recv_thread" "srs_app_security" "srs_app_statistic")
     APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh
     APP_OBJS="${MODULE_OBJS[@]}"
 fi

trunk/src/app/srs_app_http_api.cpp

@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef SRS_AUTO_HTTP_API
 
 #include <sstream>
+#include <set>
 using namespace std;
 
 #include <srs_kernel_log.hpp>
@@ -35,6 +36,8 @@ using namespace std;
 #include <srs_app_json.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_app_statistic.hpp>
+#include <srs_protocol_rtmp.hpp>
 
 SrsApiRoot::SrsApiRoot()
 {
@@ -122,6 +125,8 @@ SrsApiV1::SrsApiV1()
     handlers.push_back(new SrsApiMemInfos());
     handlers.push_back(new SrsApiAuthors());
     handlers.push_back(new SrsApiRequests());
+    handlers.push_back(new SrsApiVhosts());
+    handlers.push_back(new SrsApiStreams());
 }
 
 SrsApiV1::~SrsApiV1()
@@ -147,7 +152,9 @@ int SrsApiV1::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
             << __SRS_JFIELD_STR("system_proc_stats", "the system process stats") << __SRS_JFIELD_CONT
             << __SRS_JFIELD_STR("meminfos", "the meminfo of system") << __SRS_JFIELD_CONT
             << __SRS_JFIELD_STR("authors", "the primary authors and contributors") << __SRS_JFIELD_CONT
-            << __SRS_JFIELD_STR("requests", "the request itself, for http debug")
+            << __SRS_JFIELD_STR("requests", "the request itself, for http debug") << __SRS_JFIELD_CONT
+            << __SRS_JFIELD_STR("vhosts", "list all vhosts") << __SRS_JFIELD_CONT
+            << __SRS_JFIELD_STR("streams", "list streams that match the name or vhost")
         << __SRS_JOBJECT_END
         << __SRS_JOBJECT_END;
     
@@ -500,6 +507,103 @@ int SrsApiAuthors::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
     return res_json(skt, req, ss.str());
 }
 
+SrsApiVhosts::SrsApiVhosts()
+{
+}
+
+SrsApiVhosts::~SrsApiVhosts()
+{
+}
+
+bool SrsApiVhosts::can_handle(const char* path, int length, const char** /*pchild*/)
+{
+    return srs_path_equals("/vhosts", path, length);
+}
+
+int SrsApiVhosts::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
+{
+    std::stringstream ss;
+    
+    std::set<std::string> vhost_set;
+    SrsStreamInfoMap* pool = SrsStatistic::instance()->get_pool();
+    SrsStreamInfoMap::iterator it;
+    for (it = pool->begin(); it != pool->end(); it++) {
+        if (it->second->_req == NULL)
+            continue;
+        vhost_set.insert(it->second->_req->vhost);
+    }
+
+    ss << __SRS_JARRAY_START;
+    bool first = true;
+    std::set<std::string>::iterator it_set;
+    for (it_set = vhost_set.begin(); it_set != vhost_set.end(); it_set++) {
+        if (first) {
+            first = false;
+        } else {
+            ss << __SRS_JFIELD_CONT;
+        }
+
+        ss << "\"" << (*it_set) << "\"";
+    }
+    ss << __SRS_JARRAY_END;
+    
+    return res_json(skt, req, ss.str());
+}
+
+SrsApiStreams::SrsApiStreams()
+{
+}
+
+SrsApiStreams::~SrsApiStreams()
+{
+}
+
+bool SrsApiStreams::can_handle(const char* path, int length, const char** /*pchild*/)
+{
+    return srs_path_equals("/streams", path, length);
+}
+
+int SrsApiStreams::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
+{
+    std::stringstream ss;
+    
+    std::string query_name = req->query_get("name");
+    std::string query_vhost = req->query_get("vhost");
+    if (query_name.size() > 0 || query_vhost.size() > 0) {
+        ss << __SRS_JARRAY_START;
+        bool first = true;
+        SrsStreamInfoMap* pool = SrsStatistic::instance()->get_pool();
+        SrsStreamInfoMap::iterator it;
+        for (it = pool->begin(); it != pool->end(); it++) {
+            SrsRequest* reqinfo = it->second->_req;
+            if (reqinfo == NULL)
+                continue;
+            
+            if (reqinfo->stream == query_name || reqinfo->vhost == query_vhost) {
+                if (first) {
+                    first = false;
+                } else {
+                    ss << __SRS_JFIELD_CONT;
+                }
+
+                ss << __SRS_JOBJECT_START
+                    << __SRS_JFIELD_STR("name", reqinfo->stream) << __SRS_JFIELD_CONT
+                    << __SRS_JFIELD_STR("url", reqinfo->tcUrl) << __SRS_JFIELD_CONT
+                    << __SRS_JFIELD_ORG("clients", 0) << __SRS_JFIELD_CONT
+                    << __SRS_JFIELD_STR("status", "idle") << __SRS_JFIELD_CONT
+                    << __SRS_JFIELD_STR("type", "") << __SRS_JFIELD_CONT
+                    << __SRS_JFIELD_STR("codec", "")
+                    << __SRS_JOBJECT_END;
+            }
+        }
+        ss << __SRS_JARRAY_END;
+    } else {
+        return res_error(skt, req, 400, "Bad Request", "unknown query");
+    }
+    
+    return res_json(skt, req, ss.str());
+}
+
 SrsHttpApi::SrsHttpApi(SrsServer* srs_server, st_netfd_t client_stfd, SrsHttpHandler* _handler) 
     : SrsConnection(srs_server, client_stfd)
 {

trunk/src/app/srs_app_http_api.hpp

@@ -164,6 +164,28 @@ protected:
     virtual int do_process_request(SrsStSocket* skt, SrsHttpMessage* req);
 };
 
+class SrsApiVhosts : public SrsHttpHandler
+{
+public:
+    SrsApiVhosts();
+    virtual ~SrsApiVhosts();
+public:
+    virtual bool can_handle(const char* path, int length, const char** pchild);
+protected:
+    virtual int do_process_request(SrsStSocket* skt, SrsHttpMessage* req);
+};
+
+class SrsApiStreams : public SrsHttpHandler
+{
+public:
+    SrsApiStreams();
+    virtual ~SrsApiStreams();
+public:
+    virtual bool can_handle(const char* path, int length, const char** pchild);
+protected:
+    virtual int do_process_request(SrsStSocket* skt, SrsHttpMessage* req);
+};
+
 class SrsHttpApi : public SrsConnection
 {
 private:

trunk/src/app/srs_app_rtmp_conn.cpp

@@ -52,6 +52,7 @@ using namespace std;
 #include <srs_core_performance.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_security.hpp>
+#include <srs_app_statistic.hpp>
 
 // when stream is busy, for example, streaming is already
 // publishing, when a new client to request to publish,
@@ -395,6 +396,8 @@ int SrsRtmpConn::stream_service_cycle()
     }
     srs_assert(source != NULL);
     
+    SrsStatistic::instance()->add_request_info(source, req);
+
     // check ASAP, to fail it faster if invalid.
     if (type != SrsRtmpConnPlay && !vhost_is_edge) {
         // check publish available

trunk/src/app/srs_app_source.cpp

@@ -1807,4 +1807,3 @@ void SrsSource::destroy_forwarders()
     forwarders.clear();
 }
 
-

trunk/src/app/srs_app_statistic.cpp

@@ -0,0 +1,75 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <srs_app_statistic.hpp>
+
+#include <srs_protocol_rtmp.hpp>
+
+SrsStreamInfo::SrsStreamInfo()
+{
+	_req = NULL;
+}
+
+SrsStreamInfo::~SrsStreamInfo()
+{
+	if (_req != NULL)
+		delete _req;
+}
+
+SrsStatistic *SrsStatistic::_instance = NULL;
+
+SrsStatistic::SrsStatistic()
+{
+
+}
+
+SrsStatistic::~SrsStatistic()
+{
+	SrsStreamInfoMap::iterator it;
+	for (it = pool.begin(); it != pool.end(); it++) {
+		delete it->second;
+	}
+}
+
+SrsStreamInfoMap* SrsStatistic::get_pool()
+{
+	return &pool;
+}
+
+SrsStreamInfo* SrsStatistic::get(void *p)
+{
+	SrsStreamInfoMap::iterator it = pool.find(p);
+	if (it == pool.end()) {
+		pool[p] = new SrsStreamInfo();
+		return pool[p];
+	} else {
+		return it->second;
+	}
+}
+
+void SrsStatistic::add_request_info(void *p, SrsRequest *req)
+{
+	SrsStreamInfo *info = get(p);
+	if (info->_req == NULL)
+		info->_req = req->copy();
+}

trunk/src/app/srs_app_statistic.hpp

@@ -0,0 +1,70 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_APP_STATISTIC_HPP
+#define SRS_APP_STATISTIC_HPP
+
+/*
+#include <srs_app_statistic.hpp>
+*/
+
+#include <srs_core.hpp>
+
+#include <map>
+
+class SrsRequest;
+
+class SrsStreamInfo
+{
+public:
+    SrsStreamInfo();
+    virtual ~SrsStreamInfo();
+
+    SrsRequest *_req;
+};
+typedef std::map<void*, SrsStreamInfo*> SrsStreamInfoMap;
+
+class SrsStatistic
+{
+public:
+    static SrsStatistic *instance()
+    {
+        if (_instance == NULL) {
+            _instance = new SrsStatistic();
+        }
+        return _instance;
+    }
+
+    virtual SrsStreamInfoMap* get_pool();
+
+    virtual void add_request_info(void *p, SrsRequest *req);
+    
+private:
+    SrsStatistic();
+    virtual ~SrsStatistic();
+    static SrsStatistic *_instance;
+    SrsStreamInfoMap pool;
+    virtual SrsStreamInfo *get(void *p);
+};
+
+#endif