Skip to content

Fix receive amf checking #1782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix receive amf checking #1782

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648b686
Fixing ngx_rtmp_receive_amf error-checking
Fahnenfluchtige Feb 5, 2025
fe6a8f8
Adding error-logging
Fahnenfluchtige Feb 5, 2025
ef87a60
Little fix
Fahnenfluchtige Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ngx_rtmp_relay_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,11 +1289,23 @@ ngx_rtmp_relay_on_status(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,

ngx_memzero(&v, sizeof(v));
if (h->type == NGX_RTMP_MSG_AMF_META) {
ngx_rtmp_receive_amf(s, in, in_elts_meta,
sizeof(in_elts_meta) / sizeof(in_elts_meta[0]));
if (ngx_rtmp_receive_amf(s, in, in_elts_meta,
sizeof(in_elts_meta) / sizeof(in_elts_meta[0])) != NGX_OK)
{
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"relay: failed to parse AMF metadata");

return NGX_ERROR;
}
} else {
ngx_rtmp_receive_amf(s, in, in_elts,
sizeof(in_elts) / sizeof(in_elts[0]));
if (ngx_rtmp_receive_amf(s, in, in_elts,
sizeof(in_elts) / sizeof(in_elts[0])) != NGX_OK)
{
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"relay: failed to parse AMF message");

return NGX_ERROR;
}
}

ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
Expand Down