summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan.zalega@gmail.com>2016-03-21 08:46:27 +0100
committerSzczepan Zalega <szczepan.zalega@gmail.com>2016-03-21 08:46:27 +0100
commit75bbfc7d9e3d0f26a507c494b1e94fe71fa26ad0 (patch)
treef767c4062efbd8ef884c6cf8ae9a7f779d900afa
parent20028b40e61e79856c15181ed0b5061ab6d4fa29 (diff)
downloadlibnitrokey-75bbfc7d9e3d0f26a507c494b1e94fe71fa26ad0.tar.gz
libnitrokey-75bbfc7d9e3d0f26a507c494b1e94fe71fa26ad0.tar.bz2
fixed device status logging
-rw-r--r--include/dissect.h4
-rw-r--r--include/stick10_commands.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/include/dissect.h b/include/dissect.h
index f552950..993d348 100644
--- a/include/dissect.h
+++ b/include/dissect.h
@@ -63,12 +63,12 @@ class ResponseDissector : semantics::non_constructible {
out << ::nitrokey::misc::hexdump((const char *)(&pod), sizeof pod);
out << "Device status:\t" << pod.device_status + 0 << " "
- << cmd[pod.device_status] << std::endl;
+ << status[pod.device_status] << std::endl;
out << "Command ID:\t" << commandid_to_string((CommandID)(pod.command_id))
<< std::endl;
out << "Last command CRC:\t" << pod.last_command_crc << std::endl;
out << "Last command status:\t" << pod.last_command_status + 0 << " "
- << status[pod.last_command_status] << std::endl;
+ << cmd[pod.last_command_status] << std::endl;
out << "CRC:\t" << pod.crc << std::endl;
out << "Payload:" << std::endl;
diff --git a/include/stick10_commands.h b/include/stick10_commands.h
index 13aa24f..1c21eee 100644
--- a/include/stick10_commands.h
+++ b/include/stick10_commands.h
@@ -139,6 +139,11 @@ class GetHOTP : Command<CommandID::GET_CODE> {
uint8_t code[18];
bool isValid() const { return true; }
+ std::string dissect() const {
+ std::stringstream ss;
+ ss << "code:\t" << (code) << std::endl;
+ return ss.str();
+ }
} __packed;
typedef Transaction<command_id(), struct CommandPayload, struct EmptyPayload>