mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-06-18 12:25:06 +02:00
added addr=<ip> to HTTP notifications
This commit is contained in:
parent
a28626f661
commit
cbaff8f1df
|
@ -128,6 +128,7 @@ ngx_rtmp_notify_publish_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
ngx_rtmp_notify_app_conf_t *nacf;
|
ngx_rtmp_notify_app_conf_t *nacf;
|
||||||
ngx_chain_t *hl, *cl, *pl;
|
ngx_chain_t *hl, *cl, *pl;
|
||||||
ngx_buf_t *b;
|
ngx_buf_t *b;
|
||||||
|
ngx_str_t *addr_text;
|
||||||
size_t name_len, type_len, args_len;
|
size_t name_len, type_len, args_len;
|
||||||
|
|
||||||
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
||||||
|
@ -149,9 +150,11 @@ ngx_rtmp_notify_publish_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
name_len = ngx_strlen(v->name);
|
name_len = ngx_strlen(v->name);
|
||||||
type_len = ngx_strlen(v->type);
|
type_len = ngx_strlen(v->type);
|
||||||
args_len = ngx_strlen(v->args);
|
args_len = ngx_strlen(v->args);
|
||||||
|
addr_text = &s->connection->addr_text;
|
||||||
|
|
||||||
b = ngx_create_temp_buf(pool,
|
b = ngx_create_temp_buf(pool,
|
||||||
sizeof("&call=publish") +
|
sizeof("&call=publish") +
|
||||||
|
sizeof("&addr=") + addr_text->len +
|
||||||
sizeof("&name=") + name_len * 3 +
|
sizeof("&name=") + name_len * 3 +
|
||||||
sizeof("&type=") + type_len * 3 +
|
sizeof("&type=") + type_len * 3 +
|
||||||
1 + args_len);
|
1 + args_len);
|
||||||
|
@ -164,6 +167,10 @@ ngx_rtmp_notify_publish_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&call=publish",
|
b->last = ngx_cpymem(b->last, (u_char*)"&call=publish",
|
||||||
sizeof("&call=publish") - 1);
|
sizeof("&call=publish") - 1);
|
||||||
|
|
||||||
|
b->last = ngx_cpymem(b->last, (u_char*)"&addr=", sizeof("&addr=") -1);
|
||||||
|
b->last = (u_char*)ngx_escape_uri(b->last, addr_text->data,
|
||||||
|
addr_text->len, 0);
|
||||||
|
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
||||||
b->last = (u_char*)ngx_escape_uri(b->last, v->name, name_len, 0);
|
b->last = (u_char*)ngx_escape_uri(b->last, v->name, name_len, 0);
|
||||||
|
|
||||||
|
@ -201,6 +208,7 @@ ngx_rtmp_notify_play_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
ngx_rtmp_notify_app_conf_t *nacf;
|
ngx_rtmp_notify_app_conf_t *nacf;
|
||||||
ngx_chain_t *hl, *cl, *pl;
|
ngx_chain_t *hl, *cl, *pl;
|
||||||
ngx_buf_t *b;
|
ngx_buf_t *b;
|
||||||
|
ngx_str_t *addr_text;
|
||||||
size_t name_len, args_len;
|
size_t name_len, args_len;
|
||||||
|
|
||||||
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
||||||
|
@ -221,9 +229,11 @@ ngx_rtmp_notify_play_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
|
|
||||||
name_len = ngx_strlen(v->name);
|
name_len = ngx_strlen(v->name);
|
||||||
args_len = ngx_strlen(v->args);
|
args_len = ngx_strlen(v->args);
|
||||||
|
addr_text = &s->connection->addr_text;
|
||||||
|
|
||||||
b = ngx_create_temp_buf(pool,
|
b = ngx_create_temp_buf(pool,
|
||||||
sizeof("&call=play") +
|
sizeof("&call=play") +
|
||||||
|
sizeof("&addr=") + addr_text->len +
|
||||||
sizeof("&name=") + name_len * 3 +
|
sizeof("&name=") + name_len * 3 +
|
||||||
sizeof("&start=&duration=&reset=") + NGX_OFF_T_LEN * 3
|
sizeof("&start=&duration=&reset=") + NGX_OFF_T_LEN * 3
|
||||||
+ 1 + args_len);
|
+ 1 + args_len);
|
||||||
|
@ -236,6 +246,10 @@ ngx_rtmp_notify_play_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&call=play",
|
b->last = ngx_cpymem(b->last, (u_char*)"&call=play",
|
||||||
sizeof("&call=play") - 1);
|
sizeof("&call=play") - 1);
|
||||||
|
|
||||||
|
b->last = ngx_cpymem(b->last, (u_char*)"&addr=", sizeof("&addr=") -1);
|
||||||
|
b->last = (u_char*)ngx_escape_uri(b->last, addr_text->data,
|
||||||
|
addr_text->len, 0);
|
||||||
|
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
||||||
b->last = (u_char*)ngx_escape_uri(b->last, v->name, name_len, 0);
|
b->last = (u_char*)ngx_escape_uri(b->last, v->name, name_len, 0);
|
||||||
|
|
||||||
|
@ -273,6 +287,7 @@ ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
ngx_chain_t *hl, *cl, *pl;
|
ngx_chain_t *hl, *cl, *pl;
|
||||||
ngx_buf_t *b;
|
ngx_buf_t *b;
|
||||||
size_t name_len, args_len;
|
size_t name_len, args_len;
|
||||||
|
ngx_str_t *addr_text;
|
||||||
ngx_rtmp_notify_ctx_t *ctx;
|
ngx_rtmp_notify_ctx_t *ctx;
|
||||||
|
|
||||||
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
nacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_notify_module);
|
||||||
|
@ -293,9 +308,11 @@ ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
|
|
||||||
name_len = ctx ? ngx_strlen(ctx->name) : 0;
|
name_len = ctx ? ngx_strlen(ctx->name) : 0;
|
||||||
args_len = ctx ? ngx_strlen(ctx->args) : 0;
|
args_len = ctx ? ngx_strlen(ctx->args) : 0;
|
||||||
|
addr_text = &s->connection->addr_text;
|
||||||
|
|
||||||
b = ngx_create_temp_buf(pool,
|
b = ngx_create_temp_buf(pool,
|
||||||
sizeof("&call=done") +
|
sizeof("&call=done") +
|
||||||
|
sizeof("&addr=") + addr_text->len +
|
||||||
sizeof("&name=") + name_len * 3
|
sizeof("&name=") + name_len * 3
|
||||||
+ 1 + args_len);
|
+ 1 + args_len);
|
||||||
if (b == NULL) {
|
if (b == NULL) {
|
||||||
|
@ -307,6 +324,10 @@ ngx_rtmp_notify_done_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&call=done",
|
b->last = ngx_cpymem(b->last, (u_char*)"&call=done",
|
||||||
sizeof("&call=done") - 1);
|
sizeof("&call=done") - 1);
|
||||||
|
|
||||||
|
b->last = ngx_cpymem(b->last, (u_char*)"&addr=", sizeof("&addr=") -1);
|
||||||
|
b->last = (u_char*)ngx_escape_uri(b->last, addr_text->data,
|
||||||
|
addr_text->len, 0);
|
||||||
|
|
||||||
if (name_len) {
|
if (name_len) {
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
||||||
b->last = (u_char*)ngx_escape_uri(b->last, ctx->name, name_len, 0);
|
b->last = (u_char*)ngx_escape_uri(b->last, ctx->name, name_len, 0);
|
||||||
|
|
|
@ -340,6 +340,7 @@ ngx_rtmp_record_notify_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
ngx_rtmp_record_ctx_t *ctx;
|
ngx_rtmp_record_ctx_t *ctx;
|
||||||
ngx_chain_t *hl, *cl, *pl;
|
ngx_chain_t *hl, *cl, *pl;
|
||||||
ngx_buf_t *b;
|
ngx_buf_t *b;
|
||||||
|
ngx_str_t *addr_text;
|
||||||
size_t path_len, name_len, args_len;
|
size_t path_len, name_len, args_len;
|
||||||
u_char *path;
|
u_char *path;
|
||||||
|
|
||||||
|
@ -369,9 +370,11 @@ ngx_rtmp_record_notify_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
path_len = ngx_strlen(path);
|
path_len = ngx_strlen(path);
|
||||||
name_len = ngx_strlen(ctx->name);
|
name_len = ngx_strlen(ctx->name);
|
||||||
args_len = ngx_strlen(ctx->args);
|
args_len = ngx_strlen(ctx->args);
|
||||||
|
addr_text = &s->connection->addr_text;
|
||||||
|
|
||||||
b = ngx_create_temp_buf(pool,
|
b = ngx_create_temp_buf(pool,
|
||||||
sizeof("&call=record_done") +
|
sizeof("&call=record_done") +
|
||||||
|
sizeof("&addr=") + addr_text->len +
|
||||||
sizeof("&name=") + name_len * 3 +
|
sizeof("&name=") + name_len * 3 +
|
||||||
sizeof("&path=") + path_len * 3 +
|
sizeof("&path=") + path_len * 3 +
|
||||||
+ 1 + args_len);
|
+ 1 + args_len);
|
||||||
|
@ -384,6 +387,10 @@ ngx_rtmp_record_notify_create(ngx_rtmp_session_t *s, void *arg,
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&call=record_done",
|
b->last = ngx_cpymem(b->last, (u_char*)"&call=record_done",
|
||||||
sizeof("&call=record_done") - 1);
|
sizeof("&call=record_done") - 1);
|
||||||
|
|
||||||
|
b->last = ngx_cpymem(b->last, (u_char*)"&addr=", sizeof("&addr=") -1);
|
||||||
|
b->last = (u_char*)ngx_escape_uri(b->last, addr_text->data,
|
||||||
|
addr_text->len, 0);
|
||||||
|
|
||||||
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
b->last = ngx_cpymem(b->last, (u_char*)"&name=", sizeof("&name=") - 1);
|
||||||
b->last = (u_char*)ngx_escape_uri(b->last, ctx->name, name_len, 0);
|
b->last = (u_char*)ngx_escape_uri(b->last, ctx->name, name_len, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue