Skip to content

tcp_trsp: don't drop sock_mut mid-send in send()/check_connection #558

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
hecko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tcp_trsp: don't drop sock_mut mid-send in send()/check_connection #558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions core/sip/tcp_trsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,18 +238,16 @@ int tcp_trsp_socket::check_connection()
create_events();

if(ret < 0) {
add_write_event_ul(server_sock->get_connect_timeout());
add_write_event(server_sock->get_connect_timeout());
DBG("connect event added...");

// because of unlock in ad_write_event_ul,
// on_connect() might already have been scheduled
if(closed)
return -1;
}
else {
// connect succeeded immediatly
connected = true;
add_read_event_ul();
add_read_event();
}
}

Expand All @@ -267,7 +265,7 @@ int tcp_trsp_socket::send(const sockaddr_storage* sa, const char* msg,
send_q.push_back(new msg_buf(sa,msg,msg_len));

if(connected) {
add_write_event_ul();
add_write_event();
DBG("write event added...");
}

Expand Down
Loading