From 32839127f49ede1b9b88868ac18f4dd0fef55395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@iki.fi>
Date: Thu, 3 Mar 2022 10:31:36 +0200
Subject: [PATCH] common: Use shared_ptr for managing socket memory

---
 include/uvgrtp/media_stream.hh |  2 +-
 include/uvgrtp/rtcp.hh         | 10 +++++-----
 src/formats/h264.cc            |  2 +-
 src/formats/h264.hh            |  2 +-
 src/formats/h265.cc            |  2 +-
 src/formats/h265.hh            |  2 +-
 src/formats/h266.cc            |  2 +-
 src/formats/h266.hh            |  2 +-
 src/formats/h26x.cc            |  2 +-
 src/formats/h26x.hh            |  2 +-
 src/formats/media.cc           |  2 +-
 src/formats/media.hh           |  4 ++--
 src/holepuncher.cc             |  2 +-
 src/holepuncher.hh             |  5 +++--
 src/media_stream.cc            |  3 +--
 src/poll.cc                    |  2 +-
 src/poll.hh                    |  3 ++-
 src/queue.cc                   |  2 +-
 src/queue.hh                   |  4 ++--
 src/reception_flow.cc          |  4 ++--
 src/reception_flow.hh          |  4 ++--
 src/rtcp.cc                    | 14 +++++++++-----
 src/zrtp.cc                    |  6 +++---
 src/zrtp.hh                    | 10 +++++-----
 src/zrtp/zrtp_message.cc       |  2 +-
 src/zrtp/zrtp_message.hh       |  3 ++-
 src/zrtp/zrtp_receiver.cc      |  2 +-
 src/zrtp/zrtp_receiver.hh      |  4 +++-
 28 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/include/uvgrtp/media_stream.hh b/include/uvgrtp/media_stream.hh
index 627f4be..6be4005 100644
--- a/include/uvgrtp/media_stream.hh
+++ b/include/uvgrtp/media_stream.hh
@@ -315,7 +315,7 @@ namespace uvgrtp {
 
             uvgrtp::srtp   *srtp_;
             uvgrtp::srtcp  *srtcp_;
-            uvgrtp::socket *socket_;
+            std::shared_ptr<uvgrtp::socket> socket_;
             std::shared_ptr<uvgrtp::rtp> rtp_;
             uvgrtp::rtcp   *rtcp_;
 
diff --git a/include/uvgrtp/rtcp.hh b/include/uvgrtp/rtcp.hh
index cd8f589..704da42 100644
--- a/include/uvgrtp/rtcp.hh
+++ b/include/uvgrtp/rtcp.hh
@@ -57,12 +57,12 @@ namespace uvgrtp {
     };
 
     struct rtcp_participant {
-        uvgrtp::socket *socket = nullptr; /* socket associated with this participant */
-        sockaddr_in address;         /* address of the participant */
-        struct receiver_statistics stats; /* RTCP session statistics of the participant */
+        std::shared_ptr<uvgrtp::socket> socket = nullptr; /* socket associated with this participant */
+        sockaddr_in address;                              /* address of the participant */
+        struct receiver_statistics stats;                 /* RTCP session statistics of the participant */
 
-        uint32_t probation = 0;           /* has the participant been fully accepted to the session */
-        int role = 0;                /* is the participant a sender or a receiver */
+        uint32_t probation = 0;                           /* has the participant been fully accepted to the session */
+        int role = 0;                                     /* is the participant a sender or a receiver */
 
         /* Save the latest RTCP packets received from this participant
          * Users can query these packets using the SSRC of participant */
diff --git a/src/formats/h264.cc b/src/formats/h264.cc
index b338f29..bb529cb 100644
--- a/src/formats/h264.cc
+++ b/src/formats/h264.cc
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #endif
 
-uvgrtp::formats::h264::h264(uvgrtp::socket* socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
+uvgrtp::formats::h264::h264(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
     h26x(socket, rtp, flags)
 {
 }
diff --git a/src/formats/h264.hh b/src/formats/h264.hh
index a30036e..4d31a5c 100644
--- a/src/formats/h264.hh
+++ b/src/formats/h264.hh
@@ -39,7 +39,7 @@ namespace uvgrtp {
 
         class h264 : public h26x {
             public:
-                h264(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
+                h264(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
                 ~h264();
 
             protected:
diff --git a/src/formats/h265.cc b/src/formats/h265.cc
index 73e50d7..7698c7f 100644
--- a/src/formats/h265.cc
+++ b/src/formats/h265.cc
@@ -20,7 +20,7 @@
 
 
 
-uvgrtp::formats::h265::h265(uvgrtp::socket* socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
+uvgrtp::formats::h265::h265(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
     h26x(socket, rtp, flags)
 {}
 
diff --git a/src/formats/h265.hh b/src/formats/h265.hh
index af9894d..dc71802 100644
--- a/src/formats/h265.hh
+++ b/src/formats/h265.hh
@@ -40,7 +40,7 @@ namespace uvgrtp {
 
         class h265 : public h26x {
             public:
-                h265(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
+                h265(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
                 ~h265();
 
             protected:
diff --git a/src/formats/h266.cc b/src/formats/h266.cc
index eb0d0e5..c0004d1 100644
--- a/src/formats/h266.cc
+++ b/src/formats/h266.cc
@@ -21,7 +21,7 @@
 
 
 
-uvgrtp::formats::h266::h266(uvgrtp::socket* socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
+uvgrtp::formats::h266::h266(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
     h26x(socket, rtp, flags)
 {}
 
diff --git a/src/formats/h266.hh b/src/formats/h266.hh
index 3bfc553..4c0e046 100644
--- a/src/formats/h266.hh
+++ b/src/formats/h266.hh
@@ -38,7 +38,7 @@ namespace uvgrtp {
 
         class h266 : public h26x {
             public:
-                h266(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
+                h266(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
                 ~h266();
 
             protected:
diff --git a/src/formats/h26x.cc b/src/formats/h26x.cc
index f7d9f52..f495356 100644
--- a/src/formats/h26x.cc
+++ b/src/formats/h26x.cc
@@ -80,7 +80,7 @@ static inline unsigned __find_h26x_start(uint32_t value,bool& additional_byte)
     return 0;
 }
 
-uvgrtp::formats::h26x::h26x(uvgrtp::socket* socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
+uvgrtp::formats::h26x::h26x(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags) :
     media(socket, rtp, flags), 
     queued_(), 
     frames_(), 
diff --git a/src/formats/h26x.hh b/src/formats/h26x.hh
index 6fee0ed..0e0b315 100644
--- a/src/formats/h26x.hh
+++ b/src/formats/h26x.hh
@@ -60,7 +60,7 @@ namespace uvgrtp {
 
         class h26x : public media {
             public:
-                h26x(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
+                h26x(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
                 virtual ~h26x();
 
                 /* Find H26x start code from "data"
diff --git a/src/formats/media.cc b/src/formats/media.cc
index 021257d..26b3907 100644
--- a/src/formats/media.cc
+++ b/src/formats/media.cc
@@ -13,7 +13,7 @@
 
 #define INVALID_SEQ 0xffffffff
 
-uvgrtp::formats::media::media(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp_ctx, int flags):
+uvgrtp::formats::media::media(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp_ctx, int flags):
     socket_(socket), rtp_ctx_(rtp_ctx), flags_(flags), minfo_{}
 {
     fqueue_ = new uvgrtp::frame_queue(socket, rtp_ctx, flags);
diff --git a/src/formats/media.hh b/src/formats/media.hh
index b958757..3bd6df3 100644
--- a/src/formats/media.hh
+++ b/src/formats/media.hh
@@ -36,7 +36,7 @@ namespace uvgrtp {
 
         class media {
             public:
-                media(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp_ctx, int flags);
+                media(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp_ctx, int flags);
                 virtual ~media();
 
                 /* These two functions are called by media_stream which is self is called by the application.
@@ -65,7 +65,7 @@ namespace uvgrtp {
             protected:
                 virtual rtp_error_t push_media_frame(uint8_t *data, size_t data_len, int flags);
 
-                uvgrtp::socket *socket_;
+                std::shared_ptr<uvgrtp::socket> socket_;
                 std::shared_ptr<uvgrtp::rtp> rtp_ctx_;
                 int flags_;
                 uvgrtp::frame_queue *fqueue_;
diff --git a/src/holepuncher.cc b/src/holepuncher.cc
index b359d4e..31e2e6c 100644
--- a/src/holepuncher.cc
+++ b/src/holepuncher.cc
@@ -7,7 +7,7 @@
 
 #define THRESHOLD 2000
 
-uvgrtp::holepuncher::holepuncher(uvgrtp::socket *socket):
+uvgrtp::holepuncher::holepuncher(std::shared_ptr<uvgrtp::socket> socket):
     socket_(socket),
     last_dgram_sent_(0)
 {
diff --git a/src/holepuncher.hh b/src/holepuncher.hh
index 8658b9f..81b724b 100644
--- a/src/holepuncher.hh
+++ b/src/holepuncher.hh
@@ -4,6 +4,7 @@
 #include "uvgrtp/util.hh"
 
 #include <atomic>
+#include <memory>
 
 namespace uvgrtp {
 
@@ -11,7 +12,7 @@ namespace uvgrtp {
 
     class holepuncher : public runner {
         public:
-            holepuncher(uvgrtp::socket *socket);
+            holepuncher(std::shared_ptr<uvgrtp::socket> socket);
             ~holepuncher();
 
             /* Create new thread object and start the holepuncher
@@ -30,7 +31,7 @@ namespace uvgrtp {
         private:
             void keepalive();
 
-            uvgrtp::socket *socket_;
+            std::shared_ptr<uvgrtp::socket> socket_;
             std::atomic<uint64_t> last_dgram_sent_;
     };
 }
diff --git a/src/media_stream.cc b/src/media_stream.cc
index 45f551a..5f54536 100644
--- a/src/media_stream.cc
+++ b/src/media_stream.cc
@@ -78,7 +78,7 @@ rtp_error_t uvgrtp::media_stream::init_connection()
 {
     rtp_error_t ret = RTP_OK;
 
-    socket_ = new uvgrtp::socket(ctx_config_.flags);
+    socket_ = std::shared_ptr<uvgrtp::socket> (new uvgrtp::socket(ctx_config_.flags));
 
     if ((ret = socket_->init(AF_INET, SOCK_DGRAM, 0)) != RTP_OK)
         return ret;
@@ -220,7 +220,6 @@ rtp_error_t uvgrtp::media_stream::free_resources(rtp_error_t ret)
 
     if (socket_)
     {
-        delete socket_;
         socket_ = nullptr;
     }
 
diff --git a/src/poll.cc b/src/poll.cc
index 427584a..a66b88d 100644
--- a/src/poll.cc
+++ b/src/poll.cc
@@ -16,7 +16,7 @@
 
 
 
-rtp_error_t uvgrtp::poll::blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read)
+rtp_error_t uvgrtp::poll::blocked_recv(std::shared_ptr<uvgrtp::socket> socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read)
 {
     if (!buf|| !buf_len)
         return RTP_INVALID_VALUE;
diff --git a/src/poll.hh b/src/poll.hh
index 1b31885..c956049 100644
--- a/src/poll.hh
+++ b/src/poll.hh
@@ -3,6 +3,7 @@
 #include "uvgrtp/util.hh"
 
 #include <vector>
+#include <memory>
 
 namespace uvgrtp {
     class socket;
@@ -19,7 +20,7 @@ namespace uvgrtp {
         rtp_error_t poll(std::vector<uvgrtp::socket>& sockets, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read);
 
         /* TODO:  */
-        rtp_error_t blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read);
+        rtp_error_t blocked_recv(std::shared_ptr<uvgrtp::socket> socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read);
     }
 }
 
diff --git a/src/queue.cc b/src/queue.cc
index 60665b6..7a017c6 100644
--- a/src/queue.cc
+++ b/src/queue.cc
@@ -22,7 +22,7 @@
 #endif
 
 
-uvgrtp::frame_queue::frame_queue(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags):
+uvgrtp::frame_queue::frame_queue(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags):
     rtp_(rtp), socket_(socket), flags_(flags)
 {
     active_     = nullptr;
diff --git a/src/queue.hh b/src/queue.hh
index 258bd20..7a15ac9 100644
--- a/src/queue.hh
+++ b/src/queue.hh
@@ -93,7 +93,7 @@ namespace uvgrtp {
 
     class frame_queue {
         public:
-            frame_queue(uvgrtp::socket *socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
+            frame_queue(std::shared_ptr<uvgrtp::socket> socket, std::shared_ptr<uvgrtp::rtp> rtp, int flags);
             ~frame_queue();
 
             rtp_error_t init_transaction();
@@ -196,7 +196,7 @@ namespace uvgrtp {
             ssize_t max_ccount_; /* number of chunks per message */
 
             std::shared_ptr<uvgrtp::rtp> rtp_;
-            uvgrtp::socket *socket_;
+            std::shared_ptr<uvgrtp::socket> socket_;
 
             /* RTP context flags */
             int flags_;
diff --git a/src/reception_flow.cc b/src/reception_flow.cc
index 1e7738d..e7ab566 100644
--- a/src/reception_flow.cc
+++ b/src/reception_flow.cc
@@ -70,7 +70,7 @@ void uvgrtp::reception_flow::set_buffer_size(ssize_t& value)
     create_ring_buffer();
 }
 
-rtp_error_t uvgrtp::reception_flow::start(uvgrtp::socket *socket, int flags)
+rtp_error_t uvgrtp::reception_flow::start(std::shared_ptr<uvgrtp::socket> socket, int flags)
 {
     should_stop_ = false;
     processor_ = std::unique_ptr<std::thread>(new std::thread(&uvgrtp::reception_flow::process_packet, this, flags));
@@ -313,7 +313,7 @@ void uvgrtp::reception_flow::call_aux_handlers(uint32_t key, int flags, uvgrtp::
     }
 }
 
-void uvgrtp::reception_flow::receiver(uvgrtp::socket *socket, int flags)
+void uvgrtp::reception_flow::receiver(std::shared_ptr<uvgrtp::socket> socket, int flags)
 {
     LOG_DEBUG("Start reception loop");
 
diff --git a/src/reception_flow.hh b/src/reception_flow.hh
index 1d8fe6e..9e1dc4c 100644
--- a/src/reception_flow.hh
+++ b/src/reception_flow.hh
@@ -126,7 +126,7 @@ namespace uvgrtp {
              *
              * Return RTP_OK on success
              * Return RTP_MEMORY_ERROR if allocation of a thread object fails */
-            rtp_error_t start(uvgrtp::socket *socket, int flags);
+            rtp_error_t start(std::shared_ptr<uvgrtp::socket> socket, int flags);
 
             /* Stop the RTP reception flow and wait until the receive loop is exited
              * to make sure that destroying the object is safe.
@@ -149,7 +149,7 @@ namespace uvgrtp {
 
         private:
             /* RTP packet receiver thread */
-            void receiver(uvgrtp::socket *socket, int flags);
+            void receiver(std::shared_ptr<uvgrtp::socket> socket, int flags);
 
             /* RTP packet dispatcher thread */
             void process_packet(int flags);
diff --git a/src/rtcp.cc b/src/rtcp.cc
index b03005a..f4ae8e4 100644
--- a/src/rtcp.cc
+++ b/src/rtcp.cc
@@ -100,7 +100,7 @@ rtp_error_t uvgrtp::rtcp::stop()
         /* free all receiver statistic structs */
         for (auto& participant : participants_)
         {
-            delete participant.second->socket;
+            participant.second->socket = nullptr;
             delete participant.second;
         }
 
@@ -194,7 +194,7 @@ rtp_error_t uvgrtp::rtcp::add_participant(std::string dst_addr, uint16_t dst_por
 
     zero_stats(&p->stats);
 
-    p->socket = new uvgrtp::socket(0);
+    p->socket = std::shared_ptr<uvgrtp::socket> (new uvgrtp::socket(0));
 
     if ((ret = p->socket->init(AF_INET, SOCK_DGRAM, 0)) != RTP_OK)
     {
@@ -768,7 +768,7 @@ rtp_error_t uvgrtp::rtcp::handle_incoming_packet(uint8_t *buffer, size_t size)
     uvgrtp::frame::rtcp_header header;
     read_rtcp_header(buffer, header);
 
-    if (size < header.length)
+    if (size < header.length) // TODO: This length in header is not supposed to be bytes, but 32-bit words - 1
     {
         LOG_ERROR("Received partial rtcp packet. Not supported");
         return RTP_NOT_SUPPORTED;
@@ -897,7 +897,7 @@ rtp_error_t uvgrtp::rtcp::handle_bye_packet(uint8_t* packet, size_t size)
             continue;
         }
 
-        delete participants_[ssrc]->socket;
+        participants_[ssrc]->socket = nullptr;
         delete participants_[ssrc];
         participants_.erase(ssrc);
     }
@@ -1198,6 +1198,8 @@ rtp_error_t uvgrtp::rtcp::generate_report()
         frame_size += UVG_SRTCP_INDEX_LENGTH + UVG_AUTH_TAG_LENGTH;
     }
 
+    // see https://datatracker.ietf.org/doc/html/rfc3550#section-6.4.1
+
     if (our_role_ == SENDER && our_stats.sent_rtp_packet)
     {
         LOG_DEBUG("Generating RTCP Sender report");
@@ -1240,7 +1242,9 @@ rtp_error_t uvgrtp::rtcp::generate_report()
         if (p.second->stats.received_rtp_packet)
         {
             int dropped = p.second->stats.dropped_pkts;
-            uint8_t frac = dropped ? p.second->stats.received_bytes / dropped : 0;
+            // TODO: This should be the number of packets lost compared to number of packets expected (see fraction lost in RFC 3550)
+            // see https://datatracker.ietf.org/doc/html/rfc3550#appendix-A.3
+            uint8_t frac = dropped ? p.second->stats.received_bytes / dropped : 0; 
 
             SET_NEXT_FIELD_32(frame, ptr, htonl(p.first)); /* ssrc */
             SET_NEXT_FIELD_32(frame, ptr, htonl((frac << 24) | p.second->stats.dropped_pkts));
diff --git a/src/zrtp.cc b/src/zrtp.cc
index 67071b5..ad70a11 100644
--- a/src/zrtp.cc
+++ b/src/zrtp.cc
@@ -617,7 +617,7 @@ rtp_error_t uvgrtp::zrtp::initiator_finalize_session()
     return RTP_TIMEOUT;
 }
 
-rtp_error_t uvgrtp::zrtp::init(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr)
+rtp_error_t uvgrtp::zrtp::init(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr)
 {
     std::lock_guard<std::mutex> lock(zrtp_mtx_);
 
@@ -626,7 +626,7 @@ rtp_error_t uvgrtp::zrtp::init(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_i
     return init_msm(ssrc, socket, addr);
 }
 
-rtp_error_t uvgrtp::zrtp::init_dhm(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr)
+rtp_error_t uvgrtp::zrtp::init_dhm(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr)
 {
     rtp_error_t ret = RTP_OK;
 
@@ -723,7 +723,7 @@ rtp_error_t uvgrtp::zrtp::init_dhm(uint32_t ssrc, uvgrtp::socket *socket, sockad
     return RTP_OK;
 }
 
-rtp_error_t uvgrtp::zrtp::init_msm(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr)
+rtp_error_t uvgrtp::zrtp::init_msm(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr)
 {
     rtp_error_t ret;
 
diff --git a/src/zrtp.hh b/src/zrtp.hh
index 5f46899..d1a23be 100644
--- a/src/zrtp.hh
+++ b/src/zrtp.hh
@@ -14,7 +14,7 @@
 
 #include <mutex>
 #include <vector>
-
+#include <memory>
 
 
 namespace uvgrtp {
@@ -186,7 +186,7 @@ namespace uvgrtp {
              *
              * Return RTP_OK on success
              * Return RTP_TIMEOUT if remote did not send messages in timely manner */
-            rtp_error_t init(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr);
+            rtp_error_t init(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr);
 
             /* Get SRTP keys for the session that was just initialized
              *
@@ -219,13 +219,13 @@ namespace uvgrtp {
              *
              * Return RTP_OK on success
              * Return RTP_TIMEOUT if remote did not send messages in timely manner */
-            rtp_error_t init_dhm(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr);
+            rtp_error_t init_dhm(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr);
 
             /* Initialize ZRTP session between us and remote using Multistream mode
              *
              * Return RTP_OK on success
              * Return RTP_TIMEOUT if remote did not send messages in timely manner */
-            rtp_error_t init_msm(uint32_t ssrc, uvgrtp::socket *socket, sockaddr_in& addr);
+            rtp_error_t init_msm(uint32_t ssrc, std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr);
 
             /* Generate zid for this ZRTP instance. ZID is a unique, 96-bit long ID */
             void generate_zid();
@@ -300,7 +300,7 @@ namespace uvgrtp {
             rtp_error_t initiator_finalize_session();
 
             uint32_t ssrc_;
-            uvgrtp::socket *socket_;
+            std::shared_ptr<uvgrtp::socket> socket_;
             sockaddr_in addr_;
 
             /* Has the ZRTP connection been initialized using DH */
diff --git a/src/zrtp/zrtp_message.cc b/src/zrtp/zrtp_message.cc
index ced97bd..76e5a76 100644
--- a/src/zrtp/zrtp_message.cc
+++ b/src/zrtp/zrtp_message.cc
@@ -26,7 +26,7 @@ uvgrtp::zrtp_msg::zrtp_message::~zrtp_message()
     (void)uvgrtp::frame::dealloc_frame(rframe_);
 }
 
-rtp_error_t uvgrtp::zrtp_msg::zrtp_message::send_msg(uvgrtp::socket *socket, sockaddr_in& addr)
+rtp_error_t uvgrtp::zrtp_msg::zrtp_message::send_msg(std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr)
 {
     rtp_error_t ret;
 
diff --git a/src/zrtp/zrtp_message.hh b/src/zrtp/zrtp_message.hh
index b4f723b..75462cc 100644
--- a/src/zrtp/zrtp_message.hh
+++ b/src/zrtp/zrtp_message.hh
@@ -6,6 +6,7 @@
 #include "uvgrtp/frame.hh"
 #include "uvgrtp/util.hh"
 
+#include <memory>
 
 namespace uvgrtp {
 
@@ -16,7 +17,7 @@ namespace uvgrtp {
             zrtp_message();
             ~zrtp_message();
 
-            rtp_error_t send_msg(uvgrtp::socket* socket, sockaddr_in& addr);
+            rtp_error_t send_msg(std::shared_ptr<uvgrtp::socket> socket, sockaddr_in& addr);
 
             /* TODO: description */
             virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver,
diff --git a/src/zrtp/zrtp_receiver.cc b/src/zrtp/zrtp_receiver.cc
index 3082f01..cd38ea8 100644
--- a/src/zrtp/zrtp_receiver.cc
+++ b/src/zrtp/zrtp_receiver.cc
@@ -43,7 +43,7 @@ uvgrtp::zrtp_msg::receiver::~receiver()
     delete[] mem_;
 }
 
-int uvgrtp::zrtp_msg::receiver::recv_msg(uvgrtp::socket *socket, int timeout, int flags)
+int uvgrtp::zrtp_msg::receiver::recv_msg(std::shared_ptr<uvgrtp::socket> socket, int timeout, int flags)
 {
     rtp_error_t ret = RTP_GENERIC_ERROR;
     int nread       = 0;
diff --git a/src/zrtp/zrtp_receiver.hh b/src/zrtp/zrtp_receiver.hh
index 3f77edd..70e27de 100644
--- a/src/zrtp/zrtp_receiver.hh
+++ b/src/zrtp/zrtp_receiver.hh
@@ -6,6 +6,8 @@
 #include <netinet/in.h>
 #endif
 
+#include <memory>
+
 namespace uvgrtp {
 
     class socket;
@@ -25,7 +27,7 @@ namespace uvgrtp {
                  * Return -EPROTONOSUPPORT if message contains incompatible version number
                  * Return -ENOPNOTSUPP if message type is not supported
                  * Return -errno for any other error */
-                int recv_msg(uvgrtp::socket *socket, int timeout, int flags);
+                int recv_msg(std::shared_ptr<uvgrtp::socket> socket, int timeout, int flags);
 
                 /* TODO:  */
                 ssize_t get_msg(void *ptr, size_t len);