From 9955463c939f22762979d5f323d655db1fcecda4 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Mon, 3 Aug 2020 23:20:17 +0200 Subject: [PATCH] teach nmmsender to also transmit already serialized messages --- nmmsender.cc | 14 ++++++++++---- nmmsender.hh | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/nmmsender.cc b/nmmsender.cc index c9dc61b..b4531ea 100644 --- a/nmmsender.cc +++ b/nmmsender.cc @@ -175,16 +175,22 @@ void NMMSender::sendTCPThread(Destination* d) void NMMSender::emitNMM(const NavMonMessage& nmm) +{ + string out; + nmm.SerializeToString(& out); + emitNMM(out); +} + +void NMMSender::emitNMM(const std::string& out) { for(auto& d : d_dests) { - d->emitNMM(nmm, d_compress); + d->emitNMM(out, d_compress); } } -void NMMSender::Destination::emitNMM(const NavMonMessage& nmm, bool compressed) + +void NMMSender::Destination::emitNMM(const std::string& out, bool compressed) { - string out; - nmm.SerializeToString(& out); string msg; if(dst.empty() || !compressed) msg="bert"; diff --git a/nmmsender.hh b/nmmsender.hh index 8bff2fe..4f0d107 100644 --- a/nmmsender.hh +++ b/nmmsender.hh @@ -16,7 +16,7 @@ class NMMSender std::deque queue; std::mutex mut; - void emitNMM(const NavMonMessage& nmm, bool compress); + void emitNMM(const std::string& out, bool compress); }; public: @@ -45,6 +45,7 @@ public: void sendTCPThread(Destination* d); void emitNMM(const NavMonMessage& nmm); + void emitNMM(const std::string& out); bool d_debug{false}; bool d_compress{false}; // set BEFORE launch bool d_pleaseQuit{false};