Selaa lähdekoodia

Kernel: Accept NNRP<Socket> instead of RP<Socket> in release_for_accept

This value is always non-null, so let's make it explicit.
Idan Horowitz 3 vuotta sitten
vanhempi
commit
4a270c93ed
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 3 3
      Kernel/Net/TCPSocket.cpp
  2. 1 1
      Kernel/Net/TCPSocket.h

+ 3 - 3
Kernel/Net/TCPSocket.cpp

@@ -150,16 +150,16 @@ ErrorOr<NonnullRefPtr<TCPSocket>> TCPSocket::try_create_client(IPv4Address const
 void TCPSocket::release_to_originator()
 {
     VERIFY(!!m_originator);
-    m_originator.strong_ref()->release_for_accept(this);
+    m_originator.strong_ref()->release_for_accept(*this);
     m_originator.clear();
 }
 
-void TCPSocket::release_for_accept(RefPtr<TCPSocket> socket)
+void TCPSocket::release_for_accept(NonnullRefPtr<TCPSocket> socket)
 {
     VERIFY(m_pending_release_for_accept.contains(socket->tuple()));
     m_pending_release_for_accept.remove(socket->tuple());
     // FIXME: Should we observe this error somehow?
-    [[maybe_unused]] auto rc = queue_connection_from(*socket);
+    [[maybe_unused]] auto rc = queue_connection_from(move(socket));
 }
 
 TCPSocket::TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, NonnullOwnPtr<KBuffer> scratch_buffer)

+ 1 - 1
Kernel/Net/TCPSocket.h

@@ -154,7 +154,7 @@ public:
     void set_originator(TCPSocket& originator) { m_originator = originator; }
     bool has_originator() { return !!m_originator; }
     void release_to_originator();
-    void release_for_accept(RefPtr<TCPSocket>);
+    void release_for_accept(NonnullRefPtr<TCPSocket>);
 
     void retransmit_packets();