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

IPv4: Move more stuff from IPv4Socket to TCPSocket.

Browse source
This commit is contained in:
Andreas Kling 2019-03-14 12:28:30 +01:00
parent d2176eddfc
commit 274b500bac
5 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Kernel/IPv4Socket.cpp
View file

@ -20,28 +20,6 @@ Lockable<HashMap<word, IPv4Socket*>>& IPv4Socket::sockets_by_udp_port()
return *s_map;
}
Lockable<HashMap<word, TCPSocket*>>& IPv4Socket::sockets_by_tcp_port()
{
static Lockable<HashMap<word, TCPSocket*>>* s_map;
if (!s_map)
s_map = new Lockable<HashMap<word, TCPSocket*>>;
return *s_map;
}
TCPSocketHandle IPv4Socket::from_tcp_port(word port)
{
RetainPtr<TCPSocket> socket;
{
LOCKER(sockets_by_tcp_port().lock());
auto it = sockets_by_tcp_port().resource().find(port);
if (it == sockets_by_tcp_port().resource().end())
return { };
socket = (*it).value;
ASSERT(socket);
}
return { move(socket) };
}
IPv4SocketHandle IPv4Socket::from_udp_port(word port)
{
RetainPtr<IPv4Socket> socket;
@ -89,10 +67,6 @@ IPv4Socket::~IPv4Socket()
LOCKER(sockets_by_udp_port().lock());
sockets_by_udp_port().resource().remove(m_source_port);
}
if (type() == SOCK_STREAM) {
LOCKER(sockets_by_tcp_port().lock());
sockets_by_tcp_port().resource().remove(m_source_port);
}
}
bool IPv4Socket::get_address(sockaddr* address, socklen_t* address_size)
@ -180,19 +154,11 @@ void IPv4Socket::allocate_source_port_if_needed()
ASSERT_NOT_REACHED();
}
if (type() == SOCK_STREAM) {
// This is not a very efficient allocation algorithm.
// FIXME: Replace it with a bitmap or some other fast-paced looker-upper.
LOCKER(sockets_by_tcp_port().lock());
for (word port = 2000; port < 60000; ++port) {
auto it = sockets_by_tcp_port().resource().find(port);
if (it == sockets_by_tcp_port().resource().end()) {
m_source_port = port;
sockets_by_tcp_port().resource().set(port, static_cast<TCPSocket*>(this));
return;
}
}
ASSERT_NOT_REACHED();
protocol_allocate_source_port();
return;
}
ASSERT_NOT_REACHED();
}
ssize_t IPv4Socket::sendto(const void* data, size_t data_length, int flags, const sockaddr* addr, socklen_t addr_length)