RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:37:45 +00:00
Code Issues Activity Actions

IPv4: Rename source/destination in socket classes to local/peer.

Browse source 
It was way too ambiguous who's the source and who's the destination, and it
didn't really follow a logical pattern. "Local port" vs "Peer port" is super
obvious, so let's call it that.
This commit is contained in:
Andreas Kling 2019-05-04 16:40:34 +02:00
parent 780d2a08c4
commit 5e938868a2
7 changed files with 80 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Kernel/Net/IPv4Socket.h
View file

@ -32,27 +32,27 @@ public:
virtual ssize_t sendto(FileDescriptor&, const void*, size_t, int, const sockaddr*, socklen_t) override;
virtual ssize_t recvfrom(FileDescriptor&, void*, size_t, int flags, sockaddr*, socklen_t*) override;
void did_receive(const IPv4Address& source_address, word source_port, ByteBuffer&&);
void did_receive(const IPv4Address& peer_address, word peer_port, ByteBuffer&&);
const IPv4Address& source_address() const;
word source_port() const { return m_source_port; }
void set_source_port(word port) { m_source_port = port; }
const IPv4Address& local_address() const;
word local_port() const { return m_local_port; }
void set_local_port(word port) { m_local_port = port; }
const IPv4Address& destination_address() const { return m_destination_address; }
word destination_port() const { return m_destination_port; }
void set_destination_port(word port) { m_destination_port = port; }
const IPv4Address& peer_address() const { return m_peer_address; }
word peer_port() const { return m_peer_port; }
void set_peer_port(word port) { m_peer_port = port; }
protected:
IPv4Socket(int type, int protocol);
virtual const char* class_name() const override { return "IPv4Socket"; }
int allocate_source_port_if_needed();
int allocate_local_port_if_needed();
virtual KResult protocol_bind() { return KSuccess; }
virtual int protocol_receive(const ByteBuffer&, void*, size_t, int, sockaddr*, socklen_t*) { return -ENOTIMPL; }
virtual int protocol_send(const void*, int) { return -ENOTIMPL; }
virtual KResult protocol_connect(FileDescriptor&, ShouldBlock) { return KSuccess; }
virtual int protocol_allocate_source_port() { return 0; }
virtual int protocol_allocate_local_port() { return 0; }
virtual bool protocol_is_disconnected() const { return false; }
private:
@ -61,22 +61,22 @@ private:
bool m_bound { false };
int m_attached_fds { 0 };
IPv4Address m_source_address;
IPv4Address m_destination_address;
IPv4Address m_local_address;
IPv4Address m_peer_address;
DoubleBuffer m_for_client;
DoubleBuffer m_for_server;
struct ReceivedPacket {
IPv4Address source_address;
word source_port;
IPv4Address peer_address;
word peer_port;
ByteBuffer data;
};
SinglyLinkedList<ReceivedPacket> m_receive_queue;
word m_source_port { 0 };
word m_destination_port { 0 };
word m_local_port { 0 };
word m_peer_port { 0 };
dword m_bytes_received { 0 };