Skip to content
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

Jump to bottom

[core]Fixing the group option that should be taken from a socket #2912

Merged
merged 5 commits into from
Aug 14, 2024
Merged

[core]Fixing the group option that should be taken from a socket #2912

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
919501d
[core]Fixing the group option that should be taken from a socket
Mar 11, 2024
662cba8
Merge branch 'master' into dev-fix-group-option-get
Aug 13, 2024
812e60d
Fixed groupwise option preferred over first socket. Fixed group KMSTA…
Aug 13, 2024
6048225
Added PBKEYLEN allowed group option getting. Added more options to gr…
Aug 13, 2024
3e6eb3f
Update srtcore/group.cpp
ethouris Aug 14, 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
11 changes: 11 additions & 0 deletions srtcore/group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,17 @@ void CUDTGroup::getOpt(SRT_SOCKOPT optname, void* pw_optval, int& w_optlen)
default:; // pass on
}

{
ScopedLock cg(m_GroupLock);
gli_t gi = m_Group.begin();
if (gi != m_Group.end())
{
// Return the value from the first member socket, if any is present
gi->ps->core().getOpt(optname, (pw_optval), (w_optlen));
return;
}
}

// Check if the option is in the storage, which means that
// it was modified on the group.

Expand Down
Loading