From 8ac97b0027373ae504361eca54defae6372d0ace Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 21 Mar 2021 19:40:52 +0100 Subject: [PATCH] disable extmap_allow_mixed by default --- src/main/java/eu/siacs/conversations/Config.java | 1 + .../eu/siacs/conversations/xmpp/jingle/SessionDescription.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 96df56b1f87ea23b6eebcbfa24e3f969a1b1031d..667b9e76e71f9f6dc68ab96d2e9560f19eca9732 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -106,6 +106,7 @@ public final class Config { public static final boolean USE_BOOKMARKS2 = false; + public static final boolean PROCESS_EXTMAP_ALLOW_MIXED = false; public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true; public static final boolean DISABLE_HTTP_UPLOAD = false; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java index 39031c4a9c2b5bc183cc3b8e7320785488cc2a03..9a506513b4f372f772bbcae7ab340291e4ee35b1 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java @@ -215,7 +215,7 @@ public class SessionDescription { mediaAttributes.put("extmap", id + " " + uri); } - if (description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) { + if (Config.PROCESS_EXTMAP_ALLOW_MIXED && description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) { mediaAttributes.put("extmap-allow-mixed", ""); }