Fixed receiver address changing

Author: MartinPulec

src/video_rxtx/rtp.cpp

@@ -93,6 +93,7 @@ void rtp_video_rxtx::process_message(struct msg_sender *msg)
                         		fprintf(stderr, "Changing rtcp receiver to: %s failed!\n",
                         	                    msg->receiver);
                         }
+                        m_requested_receiver = msg->receiver;
                         break;
                 case SENDER_MSG_CHANGE_PORT:
                         change_tx_port(msg->port);
@@ -139,8 +140,8 @@ rtp_video_rxtx::rtp_video_rxtx(map<string, param_u> const &params) :
                 m_recv_port_number = 0;
         }
 
-        if ((m_network_devices = initialize_network(m_requested_receiver, m_recv_port_number, m_send_port_number,
-                                        m_participants, m_ipv6, m_requested_mcast_if))
+        if ((m_network_devices = initialize_network(m_requested_receiver.c_str(), m_recv_port_number, m_send_port_number,
+                                        m_participants, m_ipv6, m_requested_mcast_if.c_str()))
                         == NULL) {
                 throw string("Unable to open network");
         } else {
@@ -196,9 +197,9 @@ void rtp_video_rxtx::change_tx_port(int tx_port)
 
         destroy_rtp_devices(m_network_devices);
         m_send_port_number = tx_port;
-        m_network_devices = initialize_network(m_requested_receiver, m_recv_port_number,
+        m_network_devices = initialize_network(m_requested_receiver.c_str(), m_recv_port_number,
                         m_send_port_number, m_participants, m_ipv6,
-                        m_requested_mcast_if);
+                        m_requested_mcast_if.c_str());
         if (!m_network_devices) {
                 throw string("Changing RX port failed!\n");
         }

src/video_rxtx/rtp.h

@@ -41,6 +41,7 @@
 #include "video_rxtx.h"
 
 #include <mutex>
+#include <string>
 
 #ifdef HAVE_MACOSX
 #define INITIAL_VIDEO_RECV_BUFFER_SIZE  5944320
@@ -71,11 +72,11 @@ class rtp_video_rxtx : public video_rxtx {
         std::mutex m_network_devices_lock;
         struct tx *m_tx;
         struct pdb *m_participants;
-        const char      *m_requested_receiver;
+        std::string      m_requested_receiver;
         int              m_recv_port_number;
         int              m_send_port_number;
         bool             m_ipv6;
-        const char      *m_requested_mcast_if;
+        std::string      m_requested_mcast_if;
         fec             *m_fec_state;
 private:
         void process_message(struct msg_sender *);

src/video_rxtx/ultragrid_rtp.cpp

@@ -178,9 +178,10 @@ void ultragrid_rtp_video_rxtx::receiver_process_messages()
                         assert(m_rxtx_mode == MODE_RECEIVER); // receiver only
                         destroy_rtp_devices(m_network_devices);
                         m_recv_port_number = msg->new_rx_port;
-                        m_network_devices = initialize_network(m_requested_receiver, m_recv_port_number,
+                        m_network_devices = initialize_network(m_requested_receiver.c_str(),
+                                        m_recv_port_number,
                                         m_send_port_number, m_participants, m_ipv6,
-                                        m_requested_mcast_if);
+                                        m_requested_mcast_if.c_str());
                         if (!m_network_devices) {
                                 throw runtime_error("Changing RX port failed!");
                         }