浏览代码

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

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.
Andreas Kling 5 年之前
父节点
当前提交
a1907011b2
共有 4 个文件被更改,包括 19 次插入1 次删除
  1. 2 0
      Libraries/LibCore/CLocalSocket.cpp
  2. 14 1
      Libraries/LibCore/CSocket.cpp
  3. 1 0
      Libraries/LibCore/CSocket.h
  4. 2 0
      Libraries/LibCore/CTCPSocket.cpp

+ 2 - 0
Libraries/LibCore/CLocalSocket.cpp

@@ -5,6 +5,8 @@
 CLocalSocket::CLocalSocket(int fd, CObject* parent)
     : CSocket(CSocket::Type::Local, parent)
 {
+    // NOTE: This constructor is used by CLocalServer::accept(), so the socket is already connected.
+    m_connected = true;
     set_fd(fd);
     set_mode(CIODevice::ReadWrite);
     set_error(0);

+ 14 - 1
Libraries/LibCore/CSocket.cpp

@@ -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();

+ 1 - 0
Libraries/LibCore/CSocket.h

@@ -51,6 +51,7 @@ protected:
 private:
     virtual bool open(CIODevice::OpenMode) override { ASSERT_NOT_REACHED(); }
     bool common_connect(const struct sockaddr*, socklen_t);
+    void ensure_read_notifier();
 
     Type m_type { Type::Invalid };
     RefPtr<CNotifier> m_notifier;

+ 2 - 0
Libraries/LibCore/CTCPSocket.cpp

@@ -5,6 +5,8 @@
 CTCPSocket::CTCPSocket(int fd, CObject* parent)
     : CSocket(CSocket::Type::TCP, parent)
 {
+    // NOTE: This constructor is used by CTCPServer::accept(), so the socket is already connected.
+    m_connected = true;
     set_fd(fd);
     set_mode(CIODevice::ReadWrite);
     set_error(0);