From c791f14dd684ebf8a30b3bbc56b8d5eb9a44ff62 Mon Sep 17 00:00:00 2001
From: Heikki Tampio <heikki.tampio@tuni.fi>
Date: Mon, 24 Jul 2023 13:43:49 +0300
Subject: [PATCH] multiplex: Small optimizations

---
 src/rtcp_reader.cc   | 6 ++----
 src/session.cc       | 4 ----
 src/socketfactory.cc | 9 +--------
 src/socketfactory.hh | 4 ----
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/rtcp_reader.cc b/src/rtcp_reader.cc
index 5238cd1..5bd7f1a 100644
--- a/src/rtcp_reader.cc
+++ b/src/rtcp_reader.cc
@@ -62,13 +62,11 @@ void uvgrtp::rtcp_reader::rtcp_report_reader() {
 
     rtp_error_t ret = RTP_OK;
     int max_poll_timeout_ms = 100;
+    std::vector<std::shared_ptr<uvgrtp::socket>> temp = {};
+    temp.push_back(socket_);
 
     while (active_) {
         int nread = 0;
-
-        std::vector<std::shared_ptr<uvgrtp::socket>> temp = {};
-        temp.push_back(socket_);
-
         ret = uvgrtp::poll::poll(temp, buffer.get(), MAX_PACKET, max_poll_timeout_ms, &nread);
 
         if (ret == RTP_OK && nread > 0)
diff --git a/src/session.cc b/src/session.cc
index ac4911a..c99634e 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -38,10 +38,6 @@ uvgrtp::session::~session()
     for (auto&i : streams_) {
         (void)destroy_stream(i.second);
     }
-    if (sf_)
-    {
-        sf_->stop();
-    }
     streams_.clear();
     sf_ = nullptr;
 }
diff --git a/src/socketfactory.cc b/src/socketfactory.cc
index e78b3fa..7d7f9ad 100644
--- a/src/socketfactory.cc
+++ b/src/socketfactory.cc
@@ -33,8 +33,7 @@ uvgrtp::socketfactory::socketfactory(int rce_flags) :
     ipv6_(false),
     used_sockets_({}),
     reception_flows_({}),
-    rtcp_readers_to_ports_({}),
-    should_stop_(true)
+    rtcp_readers_to_ports_({})
 {
 }
 
@@ -42,12 +41,6 @@ uvgrtp::socketfactory::~socketfactory()
 {
 }
 
-rtp_error_t uvgrtp::socketfactory::stop()
-{
-    should_stop_ = true;
-    return RTP_OK;
-}
-
 rtp_error_t uvgrtp::socketfactory::set_local_interface(std::string local_addr)
 {
 
diff --git a/src/socketfactory.hh b/src/socketfactory.hh
index 4d6cb10..9d154c0 100644
--- a/src/socketfactory.hh
+++ b/src/socketfactory.hh
@@ -33,7 +33,6 @@ namespace uvgrtp {
         public:
             socketfactory(int rce_flags);
             ~socketfactory();
-            rtp_error_t stop();
 
             /* Set the local addres for socketfactory.
              * 
@@ -111,8 +110,5 @@ namespace uvgrtp {
             std::map<std::shared_ptr<uvgrtp::reception_flow>, std::shared_ptr<uvgrtp::socket>> reception_flows_;
             std::map<std::shared_ptr<uvgrtp::rtcp_reader>, uint16_t> rtcp_readers_to_ports_;
 
-            bool should_stop_;
-
-
     };
 }
\ No newline at end of file