Merge branch 'atcommands'

configuration needs to be pulled out of main and implemented as a Mode object

Conflicts:
	main.cpp

1 files changed, 57 insertions, 0 deletions

diff --git a/CommandTerminal/CmdNetworkSessionKey.cpp b/CommandTerminal/CmdNetworkSessionKey.cpp
new file mode 100644
index 0000000..4d42505
--- /dev/null
+++ b/CommandTerminal/CmdNetworkSessionKey.cpp
@@ -0,0 +1,57 @@
+#include "CmdNetworkSessionKey.h"
+
+CmdNetworkSessionKey::CmdNetworkSessionKey(mDot* dot, mts::MTSSerial& serial) :
+    Command(dot, "Network Session Key", "AT+NSK", "Network session encryption key (16 bytes)"), _serial(serial)
+{
+    _help = std::string(text()) + ": " + std::string(desc());
+    _usage = "(hex:16)";
+    _queryable = true;
+}
+
+uint32_t CmdNetworkSessionKey::action(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+    {
+        if (_dot->getVerbose())
+            _serial.writef("Network Session Key: ");
+
+        _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getNetworkSessionKey(), ".").c_str());
+    }
+    else if (args.size() == 2)
+    {
+        int32_t code;
+        std::vector<uint8_t> NewKey;
+
+        // Read in the key components...
+        readByteArray(args[1], NewKey, KEY_LENGTH);
+
+        if ((code = _dot->setNetworkSessionKey(NewKey)) == mDot::MDOT_OK) {
+            _serial.writef("Set Network Session Key: ");
+            _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, ".").c_str());
+        } else {
+            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
+            setErrorMessage(error);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+bool CmdNetworkSessionKey::verify(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+        return true;
+
+    if (args.size() == 2) {
+        if (!isHexString(args[1], 16)) {
+            setErrorMessage("Invalid key, expects (hex:16)");
+            return false;
+        }
+
+        return true;
+    }
+
+    setErrorMessage("Invalid arguments");
+    return false;
+}