From 434a4db637e25c9230e2aa5866672f37bfdf247a Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 14 Jun 2023 11:52:02 +0200 Subject: [PATCH] lib/net: no color coding in packet print methods --- repos/libports/run/nic_bridge.run | 8 ++++---- repos/os/src/lib/net/arp.cc | 2 +- repos/os/src/lib/net/dhcp.cc | 8 ++++---- repos/os/src/lib/net/ethernet.cc | 2 +- repos/os/src/lib/net/icmp.cc | 3 +-- repos/os/src/lib/net/ipv4.cc | 2 +- repos/os/src/lib/net/tcp.cc | 3 +-- repos/os/src/lib/net/udp.cc | 3 +-- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 12b1f6199f..3f3a6ea02b 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -175,10 +175,10 @@ append qemu_args " -nographic " append_qemu_nic_args append done_string {.*?\[init -> client_3] .\[31mError: Nic-session creation failed} -append done_string {.*?\[client_1 -> lwip] rcv .\[32mETH.\[0m 02:02:02:02:42:0.} -append done_string {.*?\[client_2 -> lwip] rcv .\[32mETH.\[0m 02:02:02:02:79:00} -append done_string {.*?\[server_1 -> lwip] rcv .\[32mETH.\[0m 02:02:02:02:42:0.} -append done_string {.*?\[server_2 -> lwip] rcv .\[32mETH.\[0m 02:02:02:02:23:00} +append done_string {.*?\[client_1 -> lwip] rcv ETH 02:02:02:02:42:0.} +append done_string {.*?\[client_2 -> lwip] rcv ETH 02:02:02:02:79:00} +append done_string {.*?\[server_1 -> lwip] rcv ETH 02:02:02:02:42:0.} +append done_string {.*?\[server_2 -> lwip] rcv ETH 02:02:02:02:23:00} append done_string {.*?"client_." exited with exit value 0} append done_string {.*?"client_." exited with exit value 0} append done_string {.*?\n} diff --git a/repos/os/src/lib/net/arp.cc b/repos/os/src/lib/net/arp.cc index 629deeb8e7..49bd190607 100644 --- a/repos/os/src/lib/net/arp.cc +++ b/repos/os/src/lib/net/arp.cc @@ -22,6 +22,6 @@ void Net::Arp_packet::print(Genode::Output &output) const { if (!ethernet_ipv4()) { return; } - Genode::print(output, "\033[32mARP\033[0m ", src_mac(), " ", src_ip(), + Genode::print(output, "ARP ", src_mac(), " ", src_ip(), " > ", dst_mac(), " ", dst_ip(), " cmd ", opcode()); } diff --git a/repos/os/src/lib/net/dhcp.cc b/repos/os/src/lib/net/dhcp.cc index afb1060223..518b28ced4 100644 --- a/repos/os/src/lib/net/dhcp.cc +++ b/repos/os/src/lib/net/dhcp.cc @@ -60,14 +60,14 @@ void Net::Dhcp_packet::print(Genode::Output &output) const Message_type_option const &msg_type { *reinterpret_cast(&opt) }; - Genode::print(output, "\033[32mDHCP ", - msg_type_to_string(msg_type.value()), "\033[0m ", + Genode::print(output, "DHCP ", + msg_type_to_string(msg_type.value()), " ", client_mac(), " > ", siaddr()); } }); if (!msg_type_found) { - Genode::print(output, "\033[32mDHCP ", opcode_to_string(op()), - "\033[0m ", client_mac(), " > ", siaddr()); + Genode::print(output, "DHCP ", opcode_to_string(op()), + " ", client_mac(), " > ", siaddr()); } } diff --git a/repos/os/src/lib/net/ethernet.cc b/repos/os/src/lib/net/ethernet.cc index 1fee4275d6..07b8e5789c 100644 --- a/repos/os/src/lib/net/ethernet.cc +++ b/repos/os/src/lib/net/ethernet.cc @@ -20,7 +20,7 @@ void Net::Ethernet_frame::print(Genode::Output &output) const { - Genode::print(output, "\033[32mETH\033[0m ", src(), " > ", dst(), " "); + Genode::print(output, "ETH ", src(), " > ", dst(), " "); switch (type()) { case Ethernet_frame::Type::ARP: Genode::print(output, *reinterpret_cast(_data)); diff --git a/repos/os/src/lib/net/icmp.cc b/repos/os/src/lib/net/icmp.cc index 50d673a906..494269e873 100644 --- a/repos/os/src/lib/net/icmp.cc +++ b/repos/os/src/lib/net/icmp.cc @@ -22,8 +22,7 @@ using namespace Genode; void Net::Icmp_packet::print(Output &output) const { - Genode::print(output, "\033[32mICMP\033[0m ", (unsigned)type(), " ", - (unsigned)code()); + Genode::print(output, "ICMP ", (unsigned)type(), " ", (unsigned)code()); } diff --git a/repos/os/src/lib/net/ipv4.cc b/repos/os/src/lib/net/ipv4.cc index bc02a96b13..de61e1756d 100644 --- a/repos/os/src/lib/net/ipv4.cc +++ b/repos/os/src/lib/net/ipv4.cc @@ -26,7 +26,7 @@ using namespace Net; void Net::Ipv4_packet::print(Genode::Output &output) const { - Genode::print(output, "\033[32mIPV4\033[0m ", src(), " > ", dst(), " "); + Genode::print(output, "IPV4 ", src(), " > ", dst(), " "); switch (protocol()) { case Protocol::TCP: Genode::print(output, *reinterpret_cast(_data)); diff --git a/repos/os/src/lib/net/tcp.cc b/repos/os/src/lib/net/tcp.cc index d25d1ee277..955a69fe2c 100644 --- a/repos/os/src/lib/net/tcp.cc +++ b/repos/os/src/lib/net/tcp.cc @@ -22,8 +22,7 @@ using namespace Genode; void Net::Tcp_packet::print(Genode::Output &output) const { - Genode::print(output, "\033[32mTCP\033[0m ", src_port(), - " > ", dst_port(), " flags '"); + Genode::print(output, "TCP ", src_port(), " > ", dst_port(), " flags '"); if (fin()) { Genode::print(output, "f"); } if (syn()) { Genode::print(output, "s"); } diff --git a/repos/os/src/lib/net/udp.cc b/repos/os/src/lib/net/udp.cc index 0c99cff1bb..003cd62d2b 100644 --- a/repos/os/src/lib/net/udp.cc +++ b/repos/os/src/lib/net/udp.cc @@ -24,8 +24,7 @@ using namespace Genode; void Net::Udp_packet::print(Genode::Output &output) const { - Genode::print(output, "\033[32mUDP\033[0m ", src_port(), - " > ", dst_port(), " "); + Genode::print(output, "UDP ", src_port(), " > ", dst_port(), " "); if (Dhcp_packet::is_dhcp(this)) { Genode::print(output, *reinterpret_cast(_data)); }