1.1 --- a/DJMFix.cpp Mon Jan 04 15:45:12 2021 +0100
1.2 +++ b/DJMFix.cpp Mon Jan 04 17:11:57 2021 +0100
1.3 @@ -35,6 +35,8 @@
1.4 private:
1.5 MidiSender* midiSender;
1.6 djmfix::logging::Logger* logger;
1.7 + const int keepAliveInterval = 200;
1.8 + int keepAliveCounter = 0;
1.9 std::thread keepAliveThread;
1.10 std::recursive_mutex midiMutex;
1.11 std::atomic<bool> running{false};
1.12 @@ -46,7 +48,9 @@
1.13 while (!stopped) {
1.14 logger->log(L::FINE, "DJMFixImpl::run()");
1.15 if (sendKeepAlive) send({0xf0, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x17, 0x00, 0x50, 0x01, 0xf7});
1.16 - std::this_thread::sleep_for(std::chrono::milliseconds(200));
1.17 + std::this_thread::sleep_for(std::chrono::milliseconds(keepAliveInterval));
1.18 + keepAliveCounter++;
1.19 + if (keepAliveCounter % (60 * 1000 / keepAliveInterval) == 0) logger->log(L::INFO, "Still sending periodic keep-alive messages (each " + std::to_string(keepAliveInterval) + " ms).");
1.20 }
1.21 }
1.22
1.23 @@ -62,7 +66,7 @@
1.24 }
1.25
1.26 Bytes normalize(const Bytes& data) {
1.27 - if (data.size() % 2) throw std::invalid_argument("data before normalization must have even number of bytes");
1.28 + if (data.size() % 2) throw std::invalid_argument("Data before normalization must have even number of bytes.");
1.29 Bytes result;
1.30 result.reserve(data.size() / 2);
1.31 for (size_t i = 0; i < data.size() / 2; i++) result.push_back((data[i * 2] & 0x0F) << 4 | (data[i * 2 + 1] & 0x0F));
1.32 @@ -111,7 +115,7 @@
1.33 }
1.34
1.35 template<typename T> std::vector<T> xOR(const std::vector<T>& a, const std::vector<T>& b) {
1.36 - if (a.size() != b.size()) throw std::invalid_argument("xor: both must be the same length");
1.37 + if (a.size() != b.size()) throw std::invalid_argument("Both must be the same length when doing XOR.");
1.38 std::vector<T> result;
1.39 result.reserve(a.size());
1.40 for (size_t i = 0; i < a.size(); i++) result.push_back(a[i] ^ b[i]);
1.41 @@ -124,28 +128,30 @@
1.42 }
1.43
1.44 virtual ~DJMFixImpl() override {
1.45 - logger->log(L::FINE, "~DJMFixImpl()");
1.46 + logger->log(L::FINER, "~DJMFixImpl()");
1.47 if (running) stop();
1.48 }
1.49
1.50 void setMidiSender(MidiSender* midiSender) {
1.51 - logger->log(L::FINE, "DJMFixImpl::setMidiSender()");
1.52 + logger->log(L::FINER, "DJMFixImpl::setMidiSender()");
1.53 this->midiSender = midiSender;
1.54 }
1.55
1.56 virtual void receive(const MidiMessage& midiMessage) override {
1.57 - logger->log(L::INFO, "received message: size = " + std::to_string(midiMessage.size()) + " data = " + toString(midiMessage));
1.58 + logger->log(L::FINE, "Received a message: size = " + std::to_string(midiMessage.size()) + " data = " + toString(midiMessage));
1.59 std::lock_guard<std::recursive_mutex> lock(midiMutex);
1.60
1.61
1.62 if (midiMessage.size() == 12 && midiMessage[9] == 0x11) {
1.63 + logger->log(L::INFO, "Received greeting message.");
1.64 send({0xf0, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x17, 0x00, 0x12, 0x2a, 0x01, 0x0b, 0x50, 0x69, 0x6f, 0x6e, 0x65, 0x65, 0x72, 0x44, 0x4a, 0x02, 0x0b, 0x72, 0x65, 0x6b, 0x6f, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x03, 0x12, 0x02, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0xf7});
1.65 + logger->log(L::INFO, "Sent message with seed1.");
1.66 } else if (midiMessage.size() == 54 && midiMessage[9] == 0x13 && midiMessage[33] == 0x04 && midiMessage[43] == 0x03) {
1.67 Bytes hash1(midiMessage.begin() + 35, midiMessage.begin() + 35 + 8);
1.68 seed2 = Bytes(midiMessage.begin() + 45, midiMessage.begin() + 45 + 8);
1.69 hash1 = normalize(hash1);
1.70 seed2 = normalize(seed2);
1.71 - logger->log(L::INFO, "got message with hash1 = " + toString(hash1) + " and seed2 = " + toString(seed2));
1.72 + logger->log(L::INFO, "Received message with hash1 = " + toString(hash1) + " and seed2 = " + toString(seed2));
1.73
1.74 Bytes seed0 = {0x68, 0x01, 0x31, 0xFB};
1.75 Bytes seed1 = {0x29, 0x00, 0x00, 0x00, 0x23, 0x48, 0x00, 0x00};
1.76 @@ -153,13 +159,14 @@
1.77 Bytes hash1check = toBytes(fnv32hash(concat(seed1, xOR(seed0, seed2))));
1.78
1.79 if (equals(hash1, hash1check)) {
1.80 - logger->log(L::INFO, "hash1 verification: OK");
1.81 + logger->log(L::INFO, "Verification of hash1 was successful.");
1.82 Bytes hash2 = toBytes(fnv32hash(concat(seed2, xOR(seed0, seed2))));
1.83 send(concat({0xf0, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x17, 0x00, 0x14, 0x38, 0x01, 0x0b, 0x50, 0x69, 0x6f, 0x6e, 0x65, 0x65, 0x72, 0x44, 0x4a, 0x02, 0x0b, 0x72, 0x65, 0x6b, 0x6f, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x04, 0x0a}, concat(denormalize(hash2),{0x05, 0x16, 0x05, 0x09, 0x0b, 0x05, 0x04, 0x0b, 0x0f, 0x0e, 0x0e, 0x04, 0x04, 0x0a, 0x05, 0x0a, 0x0c, 0x08, 0x0e, 0x04, 0x0c, 0x05, 0xf7})));
1.84 + logger->log(L::INFO, "Sent message with hash2.");
1.85 } else {
1.86 std::stringstream logMessage;
1.87 logMessage
1.88 - << "hash1 verification failed: "
1.89 + << "Verification of hash1 failed: "
1.90 << " midiMessage = " << toString(midiMessage)
1.91 << " seed0 = " << toString(seed0)
1.92 << " seed1 = " << toString(seed1)
1.93 @@ -171,16 +178,18 @@
1.94 }
1.95 } else if (midiMessage.size() == 12 && midiMessage[9] == 0x15) {
1.96 sendKeepAlive = true;
1.97 + logger->log(L::INFO, "Received acknowledgment message. Started sending keep-alive messages. LINE/PHONO channels should work now.");
1.98 }
1.99
1.100 }
1.101
1.102 void start() override {
1.103 logger->log(L::FINE, "DJMFixImpl::start()");
1.104 - if (midiSender == nullptr) throw std::logic_error("need a midiSender when starting DJMFix");
1.105 + if (midiSender == nullptr) throw std::logic_error("Need a midiSender when starting DJMFix");
1.106
1.107 // TODO: methods for parsing and constructing messages from parts (TLV)
1.108 send({0xf0, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x17, 0x00, 0x50, 0x01, 0xf7});
1.109 + logger->log(L::INFO, "Sent greeting message.");
1.110
1.111 keepAliveThread = std::thread(&DJMFixImpl::run, this);
1.112 running = true;