Skip to content

Device logging updates #722

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
curtishall wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Device logging updates #722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a739f9
Strip credentials and show full URL in error messages
curtishall Dec 28, 2024
565813d
Update lavf_device.cpp
curtishall Dec 28, 2024
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
18 changes: 13 additions & 5 deletions lib/lavf_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,20 @@ int lavf_device::start()
int re = avformat_open_input(&ctx, url, input_fmt, &avopt_open_input);
av_dict_free(&avopt_open_input);

if (re != 0)
{
if (re != 0) {
av_strerror(re, error_message, sizeof(error_message));
bc_log(Error, "Failed to open stream. Error: %d (%s)", re, error_message);
ctx = NULL;
return -1;
char safe_url[512];
strlcpy(safe_url, url, sizeof(safe_url));
/* Strip the username and password from the Find the @ symbol that separates credentials from host */
char *at_pos = strchr(safe_url, '@');
if (at_pos && strncmp(safe_url, "rtsp://", 7) == 0) {
memmove(safe_url + 7, at_pos + 1, strlen(at_pos + 1) + 1);
}

bc_log(Error, "Failed to open stream for device %s Error: %d (%s) (** login credentials removed **)",
safe_url, re, error_message);
ctx = NULL;
return -1;
}

AVDictionary *avopt_find_stream_info = NULL;
Expand Down