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

[core] Fixed a bug that responded a repeated conclusion HS with rejection #1650

Merged
merged 8 commits into from
Dec 10, 2020
Merged

[core] Fixed a bug that responded a repeated conclusion HS with rejection #1650

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20043be
[core] Fixed a bug that responded a repeated conclusion HS with rejec…
Nov 9, 2020
b39fea8
Merge branch 'master' into dev-fix-repeated-hs
Nov 24, 2020
7126842
Minor comment update
Nov 24, 2020
6226f35
Fixed proper crafting of the repeated handshake response
Nov 24, 2020
f68578d
Completed doxygen changes
Nov 27, 2020
12b7455
Fixed: rewritten negotiated values into the handshake and properly sent
Dec 3, 2020
50a0456
Updated and merged
Dec 3, 2020
bca2cbf
Fixed: save hs so that the repeated HS can use it
Dec 3, 2020
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
7 changes: 6 additions & 1 deletion srtcore/api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,10 @@ SRTSOCKET CUDTUnited::newSocket(CUDTSocket** pps)
}

int CUDTUnited::newConnection(const SRTSOCKET listen, const sockaddr_any& peer, const CPacket& hspkt,
CHandShake& w_hs, int& w_error)
CHandShake& w_hs, int& w_error, CUDT*& w_acpu)
{
CUDTSocket* ns = NULL;
w_acpu = NULL;

w_error = SRT_REJ_IPE;

Expand Down Expand Up @@ -534,6 +535,10 @@ int CUDTUnited::newConnection(const SRTSOCKET listen, const sockaddr_any& peer,
w_hs.m_iReqType = URQ_CONCLUSION;
w_hs.m_iID = ns->m_SocketID;

// Report the original UDT because it will be
// required to complete the HS data for conclusion response.
w_acpu = ns->m_pUDT;

return 0;

//except for this situation a new connection should be started
Expand Down
2 changes: 1 addition & 1 deletion srtcore/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ friend class CRendezvousQueue;
/// @return If the new connection is successfully created: 1 success, 0 already exist, -1 error.

int newConnection(const SRTSOCKET listen, const sockaddr_any& peer, const CPacket& hspkt,
CHandShake& w_hs, int& w_error);
CHandShake& w_hs, int& w_error, CUDT*& w_acpu);

int installAcceptHook(const SRTSOCKET lsn, srt_listen_callback_fn* hook, void* opaq);
int installConnectHook(const SRTSOCKET lsn, srt_connect_callback_fn* hook, void* opaq);
Expand Down
Loading