From e63c65ea37839865f1625cf4786f6c7476238360 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 14 Dec 2018 20:48:48 +0100 Subject: [PATCH] Fixed DTSC/RTSP analysers --- src/analysers/analyser_dtsc.cpp | 7 ++++++- src/analysers/analyser_dtsc.h | 1 + src/analysers/analyser_rtsp.cpp | 7 ++++++- src/analysers/analyser_rtsp.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/analysers/analyser_dtsc.cpp b/src/analysers/analyser_dtsc.cpp index 75a33bb8..2c4dd140 100644 --- a/src/analysers/analyser_dtsc.cpp +++ b/src/analysers/analyser_dtsc.cpp @@ -12,9 +12,14 @@ void AnalyserDTSC::init(Util::Config &conf){ opt.null(); } -AnalyserDTSC::AnalyserDTSC(Util::Config &conf) : Analyser(conf){ +bool AnalyserDTSC::open(const std::string &filename){ + if (!Analyser::open(filename)){return false;} conn = Socket::Connection(1, 0); totalBytes = 0; + return true; +} + +AnalyserDTSC::AnalyserDTSC(Util::Config &conf) : Analyser(conf){ headLess = conf.getBool("headless"); } diff --git a/src/analysers/analyser_dtsc.h b/src/analysers/analyser_dtsc.h index 6ddd7200..389753d2 100644 --- a/src/analysers/analyser_dtsc.h +++ b/src/analysers/analyser_dtsc.h @@ -6,6 +6,7 @@ public: AnalyserDTSC(Util::Config &conf); bool parsePacket(); static void init(Util::Config &conf); + virtual bool open(const std::string &filename); private: bool headLess; diff --git a/src/analysers/analyser_rtsp.cpp b/src/analysers/analyser_rtsp.cpp index 9042b18a..0adf690b 100644 --- a/src/analysers/analyser_rtsp.cpp +++ b/src/analysers/analyser_rtsp.cpp @@ -25,8 +25,13 @@ void AnalyserRTSP::incoming(const DTSC::Packet &pkt){ } } -AnalyserRTSP::AnalyserRTSP(Util::Config &conf) : Analyser(conf){ +bool AnalyserRTSP::open(const std::string &filename){ + if (!Analyser::open(filename)){return false;} myConn = Socket::Connection(1, 0); + return true; +} + +AnalyserRTSP::AnalyserRTSP(Util::Config &conf) : Analyser(conf){ sdpState.myMeta = &myMeta; sdpState.incomingPacketCallback = incomingPacket; classPointer = this; diff --git a/src/analysers/analyser_rtsp.h b/src/analysers/analyser_rtsp.h index 4194d7fe..05ff760e 100644 --- a/src/analysers/analyser_rtsp.h +++ b/src/analysers/analyser_rtsp.h @@ -12,6 +12,7 @@ public: static void init(Util::Config &cfg); bool parsePacket(); void incoming(const DTSC::Packet &pkt); + virtual bool open(const std::string &filename); bool isOpen(); private: