diff options
Diffstat (limited to 'kernel/network')
-rw-r--r-- | kernel/network/arp.c | 4 | ||||
-rw-r--r-- | kernel/network/bytes.c | 8 | ||||
-rw-r--r-- | kernel/network/ipv4.c | 4 | ||||
-rw-r--r-- | kernel/network/ipv4.h | 3 | ||||
-rw-r--r-- | kernel/network/tcp.c | 2 | ||||
-rw-r--r-- | kernel/network/tcp.h | 3 | ||||
-rw-r--r-- | kernel/network/udp.c | 3 | ||||
-rw-r--r-- | kernel/network/udp.h | 3 |
8 files changed, 15 insertions, 15 deletions
diff --git a/kernel/network/arp.c b/kernel/network/arp.c index baff528..6e589ec 100644 --- a/kernel/network/arp.c +++ b/kernel/network/arp.c @@ -14,10 +14,10 @@ struct ARP_DATA { u16 opcode; // ARP Operation Code u8 srchw[6]; // Source hardware address - hlen bytes (see above) u8 srcpr[4]; // Source protocol address - plen bytes (see above). - // If IPv4 can just be a "u32" type. + // If IPv4 can just be a "u32" type. u8 dsthw[6]; // Destination hardware address - hlen bytes (see above) u8 dstpr[4]; // Destination protocol address - plen bytes (see - // above). If IPv4 can just be a "u32" type. + // above). If IPv4 can just be a "u32" type. }; struct ARP_TABLE_ENTRY { diff --git a/kernel/network/bytes.c b/kernel/network/bytes.c index f502caf..1d49143 100644 --- a/kernel/network/bytes.c +++ b/kernel/network/bytes.c @@ -1,8 +1,12 @@ #include <network/bytes.h> -u16 ntohs(u16 net) { return (net >> 8) | (net << 8); } +u16 ntohs(u16 net) { + return (net >> 8) | (net << 8); +} -u16 htons(u16 net) { return (net >> 8) | (net << 8); } +u16 htons(u16 net) { + return (net >> 8) | (net << 8); +} u32 htonl(u32 net) { return (((net & 0x000000FF) << 24) | ((net & 0x0000FF00) << 8) | diff --git a/kernel/network/ipv4.c b/kernel/network/ipv4.c index 9565bb5..6aa03ba 100644 --- a/kernel/network/ipv4.c +++ b/kernel/network/ipv4.c @@ -73,8 +73,8 @@ void handle_ipv4(const u8 *payload, u32 packet_length) { *(u16 *)(payload + 10) = 0; u16 calc_checksum = ip_checksum((u8 *)payload, 20); *(u16 *)(payload + 10) = saved_checksum; - if(calc_checksum != saved_checksum) - return; + if (calc_checksum != saved_checksum) + return; u8 version = (*payload & 0xF0) >> 4; u8 IHL = (*payload & 0xF); diff --git a/kernel/network/ipv4.h b/kernel/network/ipv4.h index cd15fce..002aaa7 100644 --- a/kernel/network/ipv4.h +++ b/kernel/network/ipv4.h @@ -1,5 +1,4 @@ #include <typedefs.h> void handle_ipv4(const u8 *payload, u32 packet_length); -void send_ipv4_packet(u32 ip, u8 protocol, const u8 *payload, - u16 length); +void send_ipv4_packet(u32 ip, u8 protocol, const u8 *payload, u16 length); diff --git a/kernel/network/tcp.c b/kernel/network/tcp.c index e4b0891..86cfdd1 100644 --- a/kernel/network/tcp.c +++ b/kernel/network/tcp.c @@ -117,7 +117,7 @@ void send_tcp_packet(struct INCOMING_TCP_CONNECTION *inc, u8 *payload, send_tcp_packet(inc, payload, 1500 - 20 - sizeof(struct TCP_HEADER)); payload_length -= 1500 - 20 - sizeof(struct TCP_HEADER); payload += 1500 - 20 - sizeof(struct TCP_HEADER); - return send_tcp_packet(inc, payload, payload_length); + return send_tcp_packet(inc, payload, payload_length); } struct TCP_HEADER header = {0}; header.src_port = htons(inc->dst_port); diff --git a/kernel/network/tcp.h b/kernel/network/tcp.h index 7143e4d..2a836a4 100644 --- a/kernel/network/tcp.h +++ b/kernel/network/tcp.h @@ -1,5 +1,4 @@ -void handle_tcp(u8 src_ip[4], const u8 *payload, - u32 payload_length); +void handle_tcp(u8 src_ip[4], const u8 *payload, u32 payload_length); void send_tcp_packet(struct INCOMING_TCP_CONNECTION *inc, u8 *payload, u16 payload_length); void tcp_close_connection(struct INCOMING_TCP_CONNECTION *s); diff --git a/kernel/network/udp.c b/kernel/network/udp.c index 8c28610..5aae050 100644 --- a/kernel/network/udp.c +++ b/kernel/network/udp.c @@ -19,8 +19,7 @@ void send_udp_packet(struct sockaddr_in *src, const struct sockaddr_in *dst, kfree(packet); } -void handle_udp(u8 src_ip[4], const u8 *payload, - u32 packet_length) { +void handle_udp(u8 src_ip[4], const u8 *payload, u32 packet_length) { assert(packet_length >= 8); // n_.* means network format(big endian) // h_.* means host format((probably) little endian) diff --git a/kernel/network/udp.h b/kernel/network/udp.h index ea1aafc..fe21b0f 100644 --- a/kernel/network/udp.h +++ b/kernel/network/udp.h @@ -1,7 +1,6 @@ #include <socket.h> #include <typedefs.h> -void handle_udp(u8 src_ip[4], const u8 *payload, - u32 packet_length); +void handle_udp(u8 src_ip[4], const u8 *payload, u32 packet_length); void send_udp_packet(struct sockaddr_in *src, const struct sockaddr_in *dst, const u8 *payload, u16 payload_length); |