RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:48:14 +00:00
Code Issues Activity Actions

CSocket: Don't create the read notifier until after we've connected

Browse source 
This makes it so that "on_connected" always gets called first.
Since accepted sockets are connected before construction, they have
to manually set CSocket::m_connected.
This commit is contained in:
Andreas Kling 2019-09-22 21:46:46 +02:00
parent 65409e8f04
commit a1907011b2
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Libraries/LibCore/CSocket.cpp
View file

@ -89,6 +89,7 @@ bool CSocket::common_connect(const struct sockaddr* addr, socklen_t addrlen)
m_notifier->on_ready_to_write = [this] {
dbg() << *this << " connected!";
m_connected = true;
ensure_read_notifier();
m_notifier->set_event_mask(CNotifier::Event::None);
if (on_connected)
on_connected();
@ -100,6 +101,7 @@ bool CSocket::common_connect(const struct sockaddr* addr, socklen_t addrlen)
}
dbg() << *this << " connected ok!";
m_connected = true;
ensure_read_notifier();
if (on_connected)
on_connected();
return true;
@ -132,7 +134,18 @@ void CSocket::did_update_fd(int fd)
m_read_notifier = nullptr;
return;
}
m_read_notifier = CNotifier::construct(fd, CNotifier::Event::Read, this);
if (m_connected) {
ensure_read_notifier();
} else {
// I don't think it would be right if we updated the fd while not connected *but* while having a notifier..
ASSERT(!m_read_notifier);
}
}
void CSocket::ensure_read_notifier()
{
ASSERT(m_connected);
m_read_notifier = CNotifier::construct(fd(), CNotifier::Event::Read, this);
m_read_notifier->on_ready_to_read = [this] {
if (on_ready_to_read)
on_ready_to_read();