1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:07:35 +00:00

Add clang-format file

Also run it across the whole tree to get everything using the One True Style.
We don't yet run this in an automated fashion as it's a little slow, but
there is a snippet to do so in makeall.sh.
This commit is contained in:
Robin Burchell 2019-05-28 11:53:16 +02:00 committed by Andreas Kling
parent c11351ac50
commit 0dc9af5f7e
286 changed files with 3244 additions and 2424 deletions

View file

@ -1,23 +1,26 @@
#pragma once
#include <Kernel/Net/MACAddress.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/EtherType.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/MACAddress.h>
struct ARPOperation {
enum : word {
Request = 1,
Response = 2,
};
enum : word
{
Request = 1,
Response = 2,
};
};
struct ARPHardwareType {
enum : word {
Ethernet = 1,
};
enum : word
{
Ethernet = 1,
};
};
class [[gnu::packed]] ARPPacket {
class [[gnu::packed]] ARPPacket
{
public:
word hardware_type() const { return ntohs(m_hardware_type); }
void set_hardware_type(word w) { m_hardware_type = htons(w); }

View file

@ -1,12 +1,13 @@
#pragma once
#include <AK/OwnPtr.h>
#include <Kernel/IRQHandler.h>
#include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/PCI.h>
#include <Kernel/VM/MemoryManager.h>
#include <Kernel/IRQHandler.h>
#include <AK/OwnPtr.h>
class E1000NetworkAdapter final : public NetworkAdapter, public IRQHandler {
class E1000NetworkAdapter final : public NetworkAdapter
, public IRQHandler {
public:
static E1000NetworkAdapter* the();
@ -21,7 +22,8 @@ private:
virtual void handle_irq() override;
virtual const char* class_name() const override { return "E1000NetworkAdapter"; }
struct [[gnu::packed]] e1000_rx_desc {
struct [[gnu::packed]] e1000_rx_desc
{
volatile uint64_t addr { 0 };
volatile uint16_t length { 0 };
volatile uint16_t checksum { 0 };
@ -30,7 +32,8 @@ private:
volatile uint16_t special { 0 };
};
struct [[gnu::packed]] e1000_tx_desc {
struct [[gnu::packed]] e1000_tx_desc
{
volatile uint64_t addr { 0 };
volatile uint16_t length { 0 };
volatile uint8_t cso { 0 };

View file

@ -3,8 +3,9 @@
#include <AK/Types.h>
struct EtherType {
enum : word {
ARP = 0x0806,
IPv4 = 0x0800,
};
enum : word
{
ARP = 0x0806,
IPv4 = 0x0800,
};
};

View file

@ -1,12 +1,13 @@
#pragma once
#include <Kernel/Net/MACAddress.h>
#include <AK/NetworkOrdered.h>
#include <Kernel/Net/MACAddress.h>
class [[gnu::packed]] EthernetFrameHeader {
class [[gnu::packed]] EthernetFrameHeader
{
public:
EthernetFrameHeader() { }
~EthernetFrameHeader() { }
EthernetFrameHeader() {}
~EthernetFrameHeader() {}
MACAddress destination() const { return m_destination; }
void set_destination(const MACAddress& address) { m_destination = address; }
@ -28,4 +29,3 @@ private:
};
static_assert(sizeof(EthernetFrameHeader) == 14);

View file

@ -1,19 +1,21 @@
#pragma once
#include <Kernel/Net/MACAddress.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/MACAddress.h>
struct ICMPType {
enum {
EchoReply = 0,
EchoRequest = 8,
};
enum
{
EchoReply = 0,
EchoRequest = 8,
};
};
class [[gnu::packed]] ICMPHeader {
class [[gnu::packed]] ICMPHeader
{
public:
ICMPHeader() { }
~ICMPHeader() { }
ICMPHeader() {}
~ICMPHeader() {}
byte type() const { return m_type; }
void set_type(byte b) { m_type = b; }
@ -36,7 +38,8 @@ private:
static_assert(sizeof(ICMPHeader) == 4);
struct [[gnu::packed]] ICMPEchoPacket {
struct [[gnu::packed]] ICMPEchoPacket
{
ICMPHeader header;
NetworkOrdered<word> identifier;
NetworkOrdered<word> sequence_number;

View file

@ -5,7 +5,8 @@
#include <AK/NetworkOrdered.h>
#include <AK/Types.h>
enum class IPv4Protocol : word {
enum class IPv4Protocol : word
{
ICMP = 1,
TCP = 6,
UDP = 17,
@ -13,9 +14,10 @@ enum class IPv4Protocol : word {
NetworkOrdered<word> internet_checksum(const void*, size_t);
class [[gnu::packed]] IPv4Address {
class [[gnu::packed]] IPv4Address
{
public:
IPv4Address() { }
IPv4Address() {}
IPv4Address(const byte data[4])
{
m_data[0] = data[0];
@ -64,7 +66,8 @@ struct Traits<IPv4Address> {
}
class [[gnu::packed]] IPv4Packet {
class [[gnu::packed]] IPv4Packet
{
public:
byte version() const { return (m_version_and_ihl >> 4) & 0xf; }
void set_version(byte version) { m_version_and_ihl = (m_version_and_ihl & 0x0f) | (version << 4); }

View file

@ -1,11 +1,11 @@
#pragma once
#include <Kernel/Net/Socket.h>
#include <Kernel/DoubleBuffer.h>
#include <Kernel/Net/IPv4.h>
#include <AK/HashMap.h>
#include <Kernel/Lock.h>
#include <AK/SinglyLinkedList.h>
#include <Kernel/DoubleBuffer.h>
#include <Kernel/Lock.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/Socket.h>
class IPv4SocketHandle;
class TCPSocketHandle;
@ -86,7 +86,7 @@ private:
class IPv4SocketHandle : public SocketHandle {
public:
IPv4SocketHandle() { }
IPv4SocketHandle() {}
IPv4SocketHandle(RetainPtr<IPv4Socket>&& socket)
: SocketHandle(move(socket))

View file

@ -1,7 +1,7 @@
#pragma once
#include <Kernel/Net/Socket.h>
#include <Kernel/DoubleBuffer.h>
#include <Kernel/Net/Socket.h>
class FileDescriptor;
@ -39,4 +39,3 @@ private:
DoubleBuffer m_for_client;
DoubleBuffer m_for_server;
};

View file

@ -1,18 +1,19 @@
#pragma once
#include <AK/Assertions.h>
#include <AK/AKString.h>
#include <AK/Assertions.h>
#include <AK/Types.h>
#include <Kernel/StdLib.h>
class [[gnu::packed]] MACAddress {
class [[gnu::packed]] MACAddress
{
public:
MACAddress() { }
MACAddress() {}
MACAddress(const byte data[6])
{
memcpy(m_data, data, 6);
}
~MACAddress() { }
~MACAddress() {}
byte operator[](int i) const
{

View file

@ -3,19 +3,23 @@
#include <AK/ByteBuffer.h>
#include <AK/SinglyLinkedList.h>
#include <AK/Types.h>
#include <Kernel/Net/MACAddress.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Alarm.h>
#include <Kernel/Net/ARP.h>
#include <Kernel/Net/ICMP.h>
#include <Kernel/Alarm.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/MACAddress.h>
class NetworkAdapter;
class PacketQueueAlarm final : public Alarm {
public:
PacketQueueAlarm(NetworkAdapter& adapter) : m_adapter(adapter) { }
virtual ~PacketQueueAlarm() override { }
PacketQueueAlarm(NetworkAdapter& adapter)
: m_adapter(adapter)
{
}
virtual ~PacketQueueAlarm() override {}
virtual bool is_ringing() const override;
private:
NetworkAdapter& m_adapter;
};

View file

@ -1,16 +1,27 @@
#pragma once
#include <Kernel/Lock.h>
#include <AK/Retainable.h>
#include <AK/RetainPtr.h>
#include <AK/HashTable.h>
#include <AK/RetainPtr.h>
#include <AK/Retainable.h>
#include <AK/Vector.h>
#include <Kernel/File.h>
#include <Kernel/UnixTypes.h>
#include <Kernel/KResult.h>
#include <Kernel/Lock.h>
#include <Kernel/UnixTypes.h>
enum class SocketRole : byte { None, Listener, Accepted, Connected, Connecting };
enum class ShouldBlock { No = 0, Yes = 1 };
enum class SocketRole : byte
{
None,
Listener,
Accepted,
Connected,
Connecting
};
enum class ShouldBlock
{
No = 0,
Yes = 1
};
class FileDescriptor;
@ -85,7 +96,7 @@ private:
class SocketHandle {
public:
SocketHandle() { }
SocketHandle() {}
SocketHandle(RetainPtr<Socket>&& socket)
: m_socket(move(socket))

View file

@ -3,20 +3,22 @@
#include <Kernel/Net/IPv4.h>
struct TCPFlags {
enum : word {
FIN = 0x01,
SYN = 0x02,
RST = 0x04,
PUSH = 0x08,
ACK = 0x10,
URG = 0x20
};
enum : word
{
FIN = 0x01,
SYN = 0x02,
RST = 0x04,
PUSH = 0x08,
ACK = 0x10,
URG = 0x20
};
};
class [[gnu::packed]] TCPPacket {
class [[gnu::packed]] TCPPacket
{
public:
TCPPacket() { }
~TCPPacket() { }
TCPPacket() {}
~TCPPacket() {}
size_t header_size() const { return data_offset() * sizeof(dword); }

View file

@ -7,7 +7,8 @@ public:
static Retained<TCPSocket> create(int protocol);
virtual ~TCPSocket() override;
enum class State {
enum class State
{
Disconnected,
Connecting,
Connected,
@ -47,7 +48,7 @@ private:
class TCPSocketHandle : public SocketHandle {
public:
TCPSocketHandle() { }
TCPSocketHandle() {}
TCPSocketHandle(RetainPtr<TCPSocket>&& socket)
: SocketHandle(move(socket))

View file

@ -2,10 +2,11 @@
#include <Kernel/Net/IPv4.h>
class [[gnu::packed]] UDPPacket {
class [[gnu::packed]] UDPPacket
{
public:
UDPPacket() { }
~UDPPacket() { }
UDPPacket() {}
~UDPPacket() {}
word source_port() const { return m_source_port; }
void set_source_port(word port) { m_source_port = port; }

View file

@ -25,7 +25,7 @@ private:
class UDPSocketHandle : public SocketHandle {
public:
UDPSocketHandle() { }
UDPSocketHandle() {}
UDPSocketHandle(RetainPtr<UDPSocket>&& socket)
: SocketHandle(move(socket))
@ -46,4 +46,3 @@ public:
UDPSocket& socket() { return static_cast<UDPSocket&>(SocketHandle::socket()); }
const UDPSocket& socket() const { return static_cast<const UDPSocket&>(SocketHandle::socket()); }
};