diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 3510ae8e8..7a7b580c4 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -297,6 +297,7 @@ vhost hooks.callback.srs.com { # "action": "on_connect", # "client_id": 1985, # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", + # "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a", # "pageUrl": "http://www.test.com/live.html" # } # if valid, the hook must return HTTP code 200(Stauts OK) and response diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 376797890..c8b9eca39 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -133,8 +133,8 @@ class RESTClients(object): def __on_connect(self, req): code = Error.success - trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, pageUrl=%s"%( - req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["pageUrl"] + trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, tcUrl=%s, pageUrl=%s"%( + req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["tcUrl"], req["pageUrl"] )) # TODO: process the on_connect event diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index fb12087cf..68988fb46 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -69,6 +69,7 @@ int SrsHttpHooks::on_connect(string url, int client_id, string ip, SrsRequest* r << JFIELD_STR("ip", ip) << JFIELD_CONT << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT << JFIELD_STR("app", req->app) << JFIELD_CONT + << JFIELD_STR("tcUrl", req->tcUrl) << JFIELD_CONT << JFIELD_STR("pageUrl", req->pageUrl) << JOBJECT_END; std::string data = ss.str(); diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 24f6ed5d9..e1e26dcd8 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "108" +#define VERSION_REVISION "109" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS"