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

nic_router_dhcp: fix signal handler in test client

Browse Source 
The test client did not react upon packet_avail and ack_avail signals.

genodelabs/genode#4555
This commit is contained in:
Johannes Schlatow 2022-07-18 11:18:31 +02:00 committed by Christian Helmuth
parent 9a37ccfe29
commit 8df8f78fe2
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/os/src/test/nic_router_dhcp/client/nic.cc
View File

@ -18,14 +18,14 @@ using namespace Net;
using namespace Genode; using namespace Genode;
void Net::Nic::_ready_to_ack() void Net::Nic::_handle_source()
{ {
while (_source().ack_avail()) { while (_source().ack_avail()) {
_source().release_packet(_source().get_acked_packet()); } _source().release_packet(_source().get_acked_packet()); }
} }
void Net::Nic::_ready_to_submit() void Net::Nic::_handle_sink()
{ {
while (_sink().packet_avail()) { while (_sink().packet_avail()) {

20
repos/os/src/test/nic_router_dhcp/client/nic.h
View File

@ -61,10 +61,8 @@ class Net::Nic
bool const &_verbose; bool const &_verbose;
::Nic::Packet_allocator _pkt_alloc { &_alloc }; ::Nic::Packet_allocator _pkt_alloc { &_alloc };
::Nic::Connection _nic { _env, &_pkt_alloc, BUF_SIZE, BUF_SIZE }; ::Nic::Connection _nic { _env, &_pkt_alloc, BUF_SIZE, BUF_SIZE };
Signal_handler _sink_ack { _env.ep(), *this, &Nic::_ack_avail }; Signal_handler _sink_handler { _env.ep(), *this, &Nic::_handle_sink };
Signal_handler _sink_submit { _env.ep(), *this, &Nic::_ready_to_submit }; Signal_handler _source_handler { _env.ep(), *this, &Nic::_handle_source };
Signal_handler _source_ack { _env.ep(), *this, &Nic::_ready_to_ack };
Signal_handler _source_submit { _env.ep(), *this, &Nic::_packet_avail };
Signal_handler _link_state_handler { _env.ep(), *this, &Nic::handle_link_state }; Signal_handler _link_state_handler { _env.ep(), *this, &Nic::handle_link_state };
Mac_address const _mac { _nic.mac_address() }; Mac_address const _mac { _nic.mac_address() };
@ -76,10 +74,8 @@ class Net::Nic
** Packet-stream signal handlers ** ** Packet-stream signal handlers **
***********************************/ ***********************************/
void _ready_to_submit(); void _handle_sink();
void _ack_avail() { } void _handle_source();
void _ready_to_ack();
void _packet_avail() { }
public: public:
@ -93,10 +89,10 @@ class Net::Nic
_handler (handler), _handler (handler),
_verbose (verbose) _verbose (verbose)
{ {
_nic.rx_channel()->sigh_ready_to_ack(_sink_ack); _nic.rx_channel()->sigh_ready_to_ack(_sink_handler);
_nic.rx_channel()->sigh_packet_avail(_sink_submit); _nic.rx_channel()->sigh_packet_avail(_sink_handler);
_nic.tx_channel()->sigh_ack_avail(_source_ack); _nic.tx_channel()->sigh_ack_avail(_source_handler);
_nic.tx_channel()->sigh_ready_to_submit(_source_submit); _nic.tx_channel()->sigh_ready_to_submit(_source_handler);
_nic.link_state_sigh(_link_state_handler); _nic.link_state_sigh(_link_state_handler);
} }