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

Kernel: Improve some network-related log messages

Browse source
This commit is contained in:
Conrad Pankoff 2019-08-09 12:35:56 +10:00 • committed by Andreas Kling
parent 4fcbbd24f7
commit 5c66c67f32
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Net/IPv4Socket.cpp
View file

@ -84,7 +84,7 @@ KResult IPv4Socket::bind(const sockaddr* address, socklen_t address_size)
m_local_address = IPv4Address((const u8*)&ia.sin_addr.s_addr); m_local_address = IPv4Address((const u8*)&ia.sin_addr.s_addr);
m_local_port = ntohs(ia.sin_port); m_local_port = ntohs(ia.sin_port);
dbgprintf("IPv4Socket::bind %s{%p} to port %u\n", class_name(), this, m_local_port); dbgprintf("IPv4Socket::bind %s{%p} to %s:%u\n", class_name(), this, m_local_address.to_string().characters(), m_local_port);
return protocol_bind(); return protocol_bind();
} }

12
Kernel/Net/NetworkTask.cpp
View file

@ -320,6 +320,10 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
IPv4SocketTuple tuple(ipv4_packet.destination(), tcp_packet.destination_port(), ipv4_packet.source(), tcp_packet.source_port()); IPv4SocketTuple tuple(ipv4_packet.destination(), tcp_packet.destination_port(), ipv4_packet.source(), tcp_packet.source_port());
#ifdef TCP_DEBUG
kprintf("handle_tcp: looking for socket; tuple=%s\n", tuple.to_string().characters());
#endif
auto socket = TCPSocket::from_tuple(tuple); auto socket = TCPSocket::from_tuple(tuple);
if (!socket) { if (!socket) {
kprintf("handle_tcp: No TCP socket for tuple %s\n", tuple.to_string().characters()); kprintf("handle_tcp: No TCP socket for tuple %s\n", tuple.to_string().characters());
@ -329,6 +333,10 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
ASSERT(socket->type() == SOCK_STREAM); ASSERT(socket->type() == SOCK_STREAM);
ASSERT(socket->local_port() == tcp_packet.destination_port()); ASSERT(socket->local_port() == tcp_packet.destination_port());
#ifdef TCP_DEBUG
kprintf("handle_tcp: got socket; state=%s\n", socket->tuple().to_string().characters(), TCPSocket::to_string(socket->state()));
#endif
if (tcp_packet.ack_number() != socket->sequence_number()) { if (tcp_packet.ack_number() != socket->sequence_number()) {
kprintf("handle_tcp: ack/seq mismatch: got %u, wanted %u\n", tcp_packet.ack_number(), socket->sequence_number()); kprintf("handle_tcp: ack/seq mismatch: got %u, wanted %u\n", tcp_packet.ack_number(), socket->sequence_number());
return; return;
@ -336,10 +344,6 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
socket->record_incoming_data(ipv4_packet.payload_size()); socket->record_incoming_data(ipv4_packet.payload_size());
#ifdef TCP_DEBUG
kprintf("handle_tcp: state=%s\n", TCPSocket::to_string(socket->state()));
#endif
switch (socket->state()) { switch (socket->state()) {
case TCPSocket::State::Closed: case TCPSocket::State::Closed:
kprintf("handle_tcp: unexpected flags in Closed state\n"); kprintf("handle_tcp: unexpected flags in Closed state\n");

8
Kernel/Net/TCPSocket.cpp
View file

@ -148,10 +148,10 @@ void TCPSocket::send_tcp_packet(u16 flags, const void* payload, int payload_size
local_port(), local_port(),
peer_address().to_string().characters(), peer_address().to_string().characters(),
peer_port(), peer_port(),
tcp_packet.has_syn() ? "SYN" : "", tcp_packet.has_syn() ? "SYN " : "",
tcp_packet.has_ack() ? "ACK" : "", tcp_packet.has_ack() ? "ACK " : "",
tcp_packet.has_fin() ? "FIN" : "", tcp_packet.has_fin() ? "FIN " : "",
tcp_packet.has_rst() ? "RST" : "", tcp_packet.has_rst() ? "RST " : "",
tcp_packet.sequence_number(), tcp_packet.sequence_number(),
tcp_packet.ack_number()); tcp_packet.ack_number());
#endif #endif