From 9965e59ad8313cdbd758c06099c5e83cf241b15a Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 25 Dec 2021 11:23:57 +0100
Subject: [PATCH] Kernel: Remove unnecessary SocketHandle<T> class

This was used to return a pre-locked UDPSocket in one place, but there
was really no need for that mechanism in the first place since the
caller ends up locking the socket anyway.
---
 Kernel/Net/Socket.h      | 38 --------------------------------------
 Kernel/Net/UDPSocket.cpp |  9 +++------
 Kernel/Net/UDPSocket.h   |  2 +-
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h
index 3c1d6c261c..72a159c843 100644
--- a/Kernel/Net/Socket.h
+++ b/Kernel/Net/Socket.h
@@ -183,44 +183,6 @@ private:
     NonnullRefPtrVector<Socket> m_pending;
 };
 
-template<typename SocketType>
-class SocketHandle {
-public:
-    SocketHandle() = default;
-
-    SocketHandle(NonnullRefPtr<SocketType>&& socket)
-        : m_socket(move(socket))
-    {
-        if (m_socket)
-            m_socket->mutex().lock();
-    }
-
-    SocketHandle(SocketHandle&& other)
-        : m_socket(move(other.m_socket))
-    {
-    }
-
-    ~SocketHandle()
-    {
-        if (m_socket)
-            m_socket->mutex().unlock();
-    }
-
-    SocketHandle(const SocketHandle&) = delete;
-    SocketHandle& operator=(const SocketHandle&) = delete;
-
-    operator bool() const { return m_socket; }
-
-    SocketType* operator->() { return &socket(); }
-    const SocketType* operator->() const { return &socket(); }
-
-    SocketType& socket() { return *m_socket; }
-    const SocketType& socket() const { return *m_socket; }
-
-private:
-    RefPtr<SocketType> m_socket;
-};
-
 // This is a special variant of TRY() that also updates the socket's SO_ERROR field on error.
 #define SOCKET_TRY(expression)                           \
     ({                                                   \
diff --git a/Kernel/Net/UDPSocket.cpp b/Kernel/Net/UDPSocket.cpp
index 691cc5dd49..75a93c0de7 100644
--- a/Kernel/Net/UDPSocket.cpp
+++ b/Kernel/Net/UDPSocket.cpp
@@ -29,16 +29,13 @@ MutexProtected<HashMap<u16, UDPSocket*>>& UDPSocket::sockets_by_port()
     return *s_map;
 }
 
-SocketHandle<UDPSocket> UDPSocket::from_port(u16 port)
+RefPtr<UDPSocket> UDPSocket::from_port(u16 port)
 {
-    return sockets_by_port().with_shared([&](const auto& table) -> SocketHandle<UDPSocket> {
-        RefPtr<UDPSocket> socket;
+    return sockets_by_port().with_shared([&](const auto& table) -> RefPtr<UDPSocket> {
         auto it = table.find(port);
         if (it == table.end())
             return {};
-        socket = (*it).value;
-        VERIFY(socket);
-        return { *socket };
+        return (*it).value;
     });
 }
 
diff --git a/Kernel/Net/UDPSocket.h b/Kernel/Net/UDPSocket.h
index 0678c207be..2e1dcd0496 100644
--- a/Kernel/Net/UDPSocket.h
+++ b/Kernel/Net/UDPSocket.h
@@ -17,7 +17,7 @@ public:
     static ErrorOr<NonnullRefPtr<UDPSocket>> try_create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer);
     virtual ~UDPSocket() override;
 
-    static SocketHandle<UDPSocket> from_port(u16);
+    static RefPtr<UDPSocket> from_port(u16);
     static void for_each(Function<void(const UDPSocket&)>);
 
 private: