From ec35f95e13f4f2f756c81a35ded0980245acc5f4 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Wed, 24 Mar 2021 14:12:42 +0100
Subject: Add initial support for DTLS-SRTP

---
 xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala | 5 ++++-
 xmpp-vala/src/module/xep/0167_jingle_rtp/jingle_rtp_module.vala  | 2 +-
 xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'xmpp-vala/src/module/xep/0167_jingle_rtp')

diff --git a/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala b/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
index cca03543..32ea1df6 100644
--- a/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
+++ b/xmpp-vala/src/module/xep/0167_jingle_rtp/content_parameters.vala
@@ -34,7 +34,7 @@ public class Xmpp.Xep.JingleRtp.Parameters : Jingle.ContentParameters, Object {
         this.parent = parent;
         this.media = media;
         this.ssrc = ssrc;
-        this.rtcp_mux = rtcp_mux;
+        this.rtcp_mux = true;
         this.bandwidth = bandwidth;
         this.bandwidth_type = bandwidth_type;
         this.encryption_required = encryption_required;
@@ -175,6 +175,9 @@ public class Xmpp.Xep.JingleRtp.Parameters : Jingle.ContentParameters, Object {
             ret.put_node(new StanzaNode.build("encryption", NS_URI)
                 .put_node(local_crypto.to_xml()));
         }
+        if (rtcp_mux) {
+            ret.put_node(new StanzaNode.build("rtcp-mux", NS_URI));
+        }
         return ret;
     }
 }
\ No newline at end of file
diff --git a/xmpp-vala/src/module/xep/0167_jingle_rtp/jingle_rtp_module.vala b/xmpp-vala/src/module/xep/0167_jingle_rtp/jingle_rtp_module.vala
index 23aee6c9..3a9ea09f 100644
--- a/xmpp-vala/src/module/xep/0167_jingle_rtp/jingle_rtp_module.vala
+++ b/xmpp-vala/src/module/xep/0167_jingle_rtp/jingle_rtp_module.vala
@@ -84,7 +84,7 @@ public abstract class Module : XmppStreamModule {
         Jid receiver_full_jid = session.peer_full_jid;
 
         Jingle.Content? content = null;
-        foreach (Jingle.Content c in session.contents.values) {
+        foreach (Jingle.Content c in session.contents) {
             Parameters? parameters = c.content_params as Parameters;
             if (parameters == null) continue;
 
diff --git a/xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala b/xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala
index d36255f0..32cd9016 100644
--- a/xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala
+++ b/xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala
@@ -50,7 +50,7 @@ namespace Xmpp.Xep.JingleRtp {
         public void send_mute(Jingle.Session session, bool mute, string media) {
             string node_name = mute ? "mute" : "unmute";
 
-            foreach (Jingle.Content content in session.contents.values) {
+            foreach (Jingle.Content content in session.contents) {
                 Parameters? parameters = content.content_params as Parameters;
                 if (parameters != null && parameters.media == media) {
                     StanzaNode session_info_content = new StanzaNode.build(node_name, NS_URI).add_self_xmlns().put_attribute("name", content.content_name);
-- 
cgit v1.2.3-54-g00ecf