onebinary: fix global state collisions in RTSP and SDP

Author: iameli

meson.build

@@ -224,7 +224,7 @@ onebinary_stuff += 'MistInMP3'
 onebinary_stuff += 'MistInMP4'
 onebinary_stuff += 'MistInOGG'
 onebinary_stuff += 'MistInPlaylist'
-# onebinary_stuff += 'MistInRTSP'
+onebinary_stuff += 'MistInRTSP'
 onebinary_stuff += 'MistInSDP'
 # onebinary_stuff += 'MistInSubRip'
 onebinary_stuff += 'MistInTS'

src/input/input_rtsp.cpp

@@ -3,10 +3,10 @@
 Mist::InputRTSP *classPointer = 0;
 Socket::Connection *mainConn = 0;
 
-void incomingPacket(const DTSC::Packet &pkt){
+void incomingPacketRTSP(const DTSC::Packet &pkt){
   classPointer->incoming(pkt);
 }
-void insertRTP(const uint64_t track, const RTP::Packet &p){
+void insertRTPRTSP(const uint64_t track, const RTP::Packet &p){
   classPointer->incomingRTP(track, p);
 }
 
@@ -15,7 +15,7 @@ void insertRTP(const uint64_t track, const RTP::Packet &p){
 ///\param data The RTP Packet that needs to be sent
 ///\param len The size of data
 ///\param channel Not used here, but is kept for compatibility with sendTCP
-void sendUDP(void *socket, const char *data, size_t len, uint8_t channel){
+void sendUDPRTSP(void *socket, const char *data, size_t len, uint8_t channel){
   ((Socket::UDPConnection *)socket)->SendNow(data, len);
   if (mainConn){mainConn->addUp(len);}
 }
@@ -31,7 +31,7 @@ namespace Mist{
     packetOffset = 0;
     TCPmode = true;
     sdpState.myMeta = &meta;
-    sdpState.incomingPacketCallback = incomingPacket;
+    sdpState.incomingPacketCallback = incomingPacketRTSP;
     classPointer = this;
     standAlone = false;
     seenSDP = false;
@@ -363,7 +363,7 @@ namespace Mist{
     for (std::map<uint64_t, SDP::Track>::iterator it = sdpState.tracks.begin();
          it != sdpState.tracks.end(); ++it){
       Socket::UDPConnection &s = it->second.data;
-      it->second.sorter.setCallback(it->first, insertRTP);
+      it->second.sorter.setCallback(it->first, insertRTPRTSP);
       while (s.Receive()){
         r = true;
         // if (s.getDestPort() != it->second.sPortA){
@@ -377,7 +377,7 @@ namespace Mist{
       }
       if (Util::bootSecs() != it->second.rtcpSent){
         it->second.rtcpSent = Util::bootSecs();
-        it->second.pack.sendRTCP_RR(it->second, sendUDP);
+        it->second.pack.sendRTCP_RR(it->second, sendUDPRTSP);
       }
     }
     return r;

src/input/input_sdp.cpp

@@ -1,22 +1,22 @@
 #include "input_sdp.h"
 
 // Will point to current InputSDP obj after constructor is called
-Mist::InputSDP *classPointer = 0;
+Mist::InputSDP *classPointerSDP = 0;
 size_t bytesUp = 0;
 // CB used to receive DTSC packets back from RTP sorter
-void incomingPacket(const DTSC::Packet &pkt){
-  classPointer->incoming(pkt);
+void incomingPacketSDP(const DTSC::Packet &pkt){
+  classPointerSDP->incoming(pkt);
 }
 void insertRTP(const uint64_t track, const RTP::Packet &p){
-  classPointer->incomingRTP(track, p);
+  classPointerSDP->incomingRTP(track, p);
 }
 
 /// Function used to send RTCP packets over UDP
 ///\param socket A UDP Connection pointer, sent as a void*, to keep portability.
 ///\param data The RTP Packet that needs to be sent
 ///\param len The size of data
 ///\param channel Not used here, but is kept for compatibility with sendTCP
-void sendUDP(void *socket, const char *data, size_t len, uint8_t channel){
+void sendUDPSDP(void *socket, const char *data, size_t len, uint8_t channel){
   ((Socket::UDPConnection *)socket)->SendNow(data, len);
   bytesUp += len;
 }
@@ -30,8 +30,8 @@ namespace Mist{
     setPacketOffset = false;
     packetOffset = 0;
     sdpState.myMeta = &meta;
-    sdpState.incomingPacketCallback = incomingPacket;
-    classPointer = this;
+    sdpState.incomingPacketCallback = incomingPacketSDP;
+    classPointerSDP = this;
     standAlone = false;
     hasBork = false;
     bytesRead = 0;
@@ -280,7 +280,7 @@ namespace Mist{
       // Send RTCP packet back to host
       if (Util::bootSecs() > it->second.rtcpSent + rtcpInterval){
         it->second.rtcpSent = Util::bootSecs();
-        it->second.pack.sendRTCP_RR(it->second, sendUDP);
+        it->second.pack.sendRTCP_RR(it->second, sendUDPSDP);
       }
     }
     if (!receivedPacket){