v1.130.5

yeti-switch · Mar 19, 2024 · 936643c · 936643c
2 parents bec7912 + 9bfcc33
commit 936643c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/core/AmMediaTransport.cpp b/core/AmMediaTransport.cpp
@@ -1192,6 +1192,7 @@ void AmMediaTransport::onPacket(unsigned char* buf, unsigned int size, sockaddr_
                 conn->setDependentConnection(cur_rtp_conn);
             }
             conn->set_credentials(ice_cred.luser, ice_cred.lpassword, ice_cred.ruser, ice_cred.rpassword);
+            conn->updateStunTimer();
             addConnection(conn);
             s_conn = conn;
         } else return;

diff --git a/core/AmRtpStream.cpp b/core/AmRtpStream.cpp
@@ -666,9 +666,10 @@ int AmRtpStream::init(const AmSdp& local,
         while(sdp_it != local_media.payloads.end()) {
             int int_pt;
 
-            if ((local_media.transport == TP_RTPAVP ||
-                local_media.transport == TP_UDPTLSRTPSAVP ||
-                local_media.transport == TP_RTPSAVP) && sdp_it->payload_type < 20)
+            bool isAllowTransport = (local_media.transport == TP_RTPAVP ||
+                                     local_media.transport == TP_UDPTLSRTPSAVP ||
+                                     local_media.transport == TP_RTPSAVP);
+            if (isAllowTransport && sdp_it->payload_type < 20)
                 int_pt = sdp_it->payload_type;
             else int_pt = payload_provider->getDynPayload(sdp_it->encoding_name,
                                                         sdp_it->clock_rate,
@@ -721,7 +722,10 @@ int AmRtpStream::init(const AmSdp& local,
             //       Some codecs define multiple payloads
             //       with different encoding parameters
             PayloadMappingTable::iterator pmt_it = pl_map.end();
-            if(sdp_it->encoding_name.empty() || (local_media.transport == TP_RTPAVP && sdp_it->payload_type < 20))
+            bool isAllowTransport = (local_media.transport == TP_RTPAVP ||
+                                     local_media.transport == TP_UDPTLSRTPSAVP ||
+                                     local_media.transport == TP_RTPSAVP);
+            if(sdp_it->encoding_name.empty() || (isAllowTransport && sdp_it->payload_type < 20))
             {
                 // must be a static payload
                 pmt_it = pl_map.find(sdp_it->payload_type);

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,8 @@
+sems (1.130.5) stable; urgency=low
+  * fix trickled ICE candidate STUN timer set
+  * fix static payloads mapping for RTP/SAVP, UDP/TLS/RTP/SAVP media types
+ -- Michael Furmur <[email protected]>  Tue, 19 Mar 2024 23:35:39 +0200
+
 sems (1.130.4) stable; urgency=low
   * fix STUN timers processing deadlock
  -- Michael Furmur <[email protected]>  Tue, 19 Mar 2024 16:19:22 +0200