ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

init: handle Service_denied for forwarded sessions 

This patch propages the 'Service_denied' condition of forwarded sessions
to the parent. Without it, the invalid session request stays pending
infinitely, which leads to the problem described in issue #2542. It
turns out that suggested solution given in the issue text is actually
not needed when applying this fix.

Fixes #2542
This commit is contained in:
Norman Feske 2017-10-19 16:07:28 +02:00 committed by Christian Helmuth
parent 1ccd9a2fdb
commit 3a350b65a3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/src/init/server.cc
View File

@ -142,10 +142,14 @@ void Init::Server::session_ready(Session_state &session)
_env.parent().deliver_session_cap(id, session.cap);
session.phase = Session_state::CAP_HANDED_OUT;
}
if (session.phase == Session_state::SERVICE_DENIED)
_close_session(session, Parent::SERVICE_DENIED);
}
void Init::Server::session_closed(Session_state &session)
void Init::Server::_close_session(Session_state &session,
Parent::Session_response response)
{
_report_update_trigger.trigger_report_update();
@ -162,7 +166,13 @@ void Init::Server::session_closed(Session_state &session)
session.destroy();
_env.parent().session_response(id, Parent::SESSION_CLOSED);
_env.parent().session_response(id, response);
}
void Init::Server::session_closed(Session_state &session)
{
_close_session(session, Parent::SESSION_CLOSED);
}
@ -342,7 +352,7 @@ void Init::Server::_handle_session_requests()
Xml_node const requests = _session_requests->xml();
requests.for_each_sub_node([&] (Xml_node request) {
_handle_session_request(request); });
_handle_session_request(request); });
_report_update_trigger.trigger_report_update();
}

2
repos/os/src/init/server.h
View File

@ -86,6 +86,8 @@ class Init::Server : Session_state::Ready_callback,
void _handle_session_request(Xml_node);
void _handle_session_requests();
void _close_session(Session_state &, Parent::Session_response response);
/**
* Session_state::Closed_callback interface
*/