michaelkuc6/U2FDevice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separated waiting for message from acting on message.

Browse Source 
Necessary refactoring of parameter types propagated through source.
This commit is contained in:
Michael Kuc
2019-08-21 15:55:33 +01:00
parent 2f8e417d00
commit 2987cbe26e
12 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Controller.cpp
View File

@@ -29,6 +29,16 @@ Controller::Controller(const uint32_t startChannel)
{}
void Controller::handleTransaction()
{
auto msg = U2FMessage::readNonBlock();
if (!msg)
return;
handleTransaction(*msg);
}
void Controller::handleTransaction(const U2FMessage& msg)
{
try
{
@@ -36,20 +46,15 @@ void Controller::handleTransaction()
toggleACTLED();
else
enableACTLED(false);
}
}
catch (runtime_error& ignored)
{}
auto msg = U2FMessage::readNonBlock();
if (!msg)
return;
lastMessage = chrono::system_clock::now();
auto opChannel = msg->cid;
auto opChannel = msg.cid;
if (msg->cmd == U2FHID_INIT)
if (msg.cmd == U2FHID_INIT)
{
opChannel = nextChannel();
auto channel = Channel{ opChannel };
@@ -66,7 +71,7 @@ void Controller::handleTransaction()
#ifdef DEBUG_MSGS
clog << "Message:" << endl;
clog << "cid: " << msg->cid << ", cmd: " << static_cast<unsigned int>(msg->cmd) << endl;
clog << "cid: " << msg.cid << ", cmd: " << static_cast<unsigned int>(msg.cmd) << endl;
#endif
channels.at(opChannel).handle(msg);