external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug #73, http callback api support authentication in tcUrl

Browse source
This commit is contained in:
winlin 2014-05-22 10:23:12 +08:00
parent f37faf7236
commit d4b8fee61a
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/conf/full.conf
View file

@ -297,6 +297,7 @@ vhost hooks.callback.srs.com {
# "action": "on_connect", # "action": "on_connect",
# "client_id": 1985, # "client_id": 1985,
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "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" # "pageUrl": "http://www.test.com/live.html"
# } # }
# if valid, the hook must return HTTP code 200(Stauts OK) and response # if valid, the hook must return HTTP code 200(Stauts OK) and response

4
trunk/research/api-server/server.py
View file

@ -133,8 +133,8 @@ class RESTClients(object):
def __on_connect(self, req): def __on_connect(self, req):
code = Error.success code = Error.success
trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, pageUrl=%s"%( 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["pageUrl"] req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["tcUrl"], req["pageUrl"]
)) ))
# TODO: process the on_connect event # TODO: process the on_connect event

1
trunk/src/app/srs_app_http_hooks.cpp
View file

@ -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("ip", ip) << JFIELD_CONT
<< JFIELD_STR("vhost", req->vhost) << JFIELD_CONT << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT
<< JFIELD_STR("app", req->app) << JFIELD_CONT << JFIELD_STR("app", req->app) << JFIELD_CONT
<< JFIELD_STR("tcUrl", req->tcUrl) << JFIELD_CONT
<< JFIELD_STR("pageUrl", req->pageUrl) << JFIELD_STR("pageUrl", req->pageUrl)
<< JOBJECT_END; << JOBJECT_END;
std::string data = ss.str(); std::string data = ss.str();

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "108" #define VERSION_REVISION "109"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"