ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 18:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: get rid of Interface::print

Browse Source 
Actually interfaces have no own human-readable identifier. They shall instead
use the print functionality of their domain.

Issue #2609
This commit is contained in:
Martin Stein 2017-11-13 23:05:10 +01:00 committed by Christian Helmuth
parent 2d153c40e4
commit b63d83e6a3
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/src/server/nic_router/interface.cc
View File

@ -205,7 +205,7 @@ Interface::_new_link(L3_protocol const protocol,
_tcp_links.insert(&link.client());
remote_interface._tcp_links.insert(&link.server());
if (_config().verbose()) {
log("New TCP client link: ", link.client(), " at ", *this);
log("New TCP client link: ", link.client(), " at ", _domain);
log("New TCP server link: ", link.server(),
" at ", remote_interface._domain);
}
@ -219,7 +219,7 @@ Interface::_new_link(L3_protocol const protocol,
_udp_links.insert(&link.client());
remote_interface._udp_links.insert(&link.server());
if (_config().verbose()) {
log("New UDP client link: ", link.client(), " at ", *this);
log("New UDP client link: ", link.client(), " at ", _domain);
log("New UDP server link: ", link.server(),
" at ", remote_interface._domain);
}
@ -403,7 +403,7 @@ void Interface::_send_dhcp_reply(Dhcp_server const &dhcp_srv,
void Interface::_release_dhcp_allocation(Dhcp_allocation &allocation)
{
if (_config().verbose()) {
log("Release DHCP allocation: ", allocation, " at ", *this);
log("Release DHCP allocation: ", allocation, " at ", _domain);
}
_dhcp_allocations.remove(&allocation);
}
@ -421,7 +421,7 @@ void Interface::_new_dhcp_allocation(Ethernet_frame &eth,
_dhcp_allocations.insert(&allocation);
if (_config().verbose()) {
log("Offer DHCP allocation: ", allocation,
" at ", *this);
" at ", _domain);
}
_send_dhcp_reply(dhcp_srv, eth.src(),
allocation.ip(),
@ -486,7 +486,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
allocation.lifetime(dhcp_srv.ip_lease_time());
if (_config().verbose()) {
log("Bind DHCP allocation: ", allocation,
" at ", *this);
" at ", _domain);
}
_send_dhcp_reply(dhcp_srv, eth.src(),
allocation.ip(),
@ -1029,9 +1029,3 @@ Configuration &Interface::_config() const { return _domain.config(); }
Ipv4_config const &Interface::_ip_config() const { return _domain.ip_config(); }
void Interface::print(Output &output) const
{
Genode::print(output, "\"", _domain.name(), "\"");
}

7
repos/os/src/server/nic_router/interface.h
View File

@ -229,13 +229,6 @@ class Net::Interface
void send(Ethernet_frame &eth, Genode::size_t const eth_size);
/*********
** log **
*********/
void print(Genode::Output &output) const;
/***************
** Accessors **
***************/

4
repos/os/src/server/nic_router/link.cc
View File

@ -151,8 +151,8 @@ void Link::dissolve()
if (_config.verbose()) {
log("Free ", l3_protocol_name(_protocol),
" port ", _server.dst_port(),
" at ", _server.interface(),
" that was used by ", _client.interface());
" at ", _server.interface().domain(),
" that was used by ", _client.interface().domain());
}
}
catch (Pointer<Port_allocator_guard>::Invalid) { }