Make disableRtx configurable (and 'false' by default).

As suggested by George, disableRtx is generaly a good thing to have disabled. This commit makes the option configurable, and switches the default setting from 'true' to 'false'.
igniterealtime · Feb 16, 2019 · b6d6ae4 · b6d6ae4
1 parent ab3e688
commit b6d6ae4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/config/src/main/java/org/igniterealtime/openfire/plugin/ofmeet/config/OFMeetConfig.java b/config/src/main/java/org/igniterealtime/openfire/plugin/ofmeet/config/OFMeetConfig.java
@@ -107,7 +107,22 @@ public boolean getSimulcast()
 
     public void resetSimulcast()
     {
-        JiveGlobals.deleteXMLProperty("org.jitsi.videobridge.ofmeet.simulcast" );
+        JiveGlobals.deleteXMLProperty( "org.jitsi.videobridge.ofmeet.simulcast" );
+    }
+
+    public void setDisableRtx( boolean disableRtx )
+    {
+        JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.disableRtx", Boolean.toString( disableRtx ) );
+    }
+
+    public boolean getDisableRtx()
+    {
+        return JiveGlobals.getBooleanProperty( "org.jitsi.videobridge.ofmeet.disableRtx", false );
+    }
+
+    public void resetDisableRtx()
+    {
+        JiveGlobals.deleteXMLProperty( "org.jitsi.videobridge.ofmeet.disableRtx" );
     }
 
     public void setAdaptiveSimulcast( boolean simulcast )

diff --git a/ofmeet/src/i18n/ofmeet_i18n.properties b/ofmeet/src/i18n/ofmeet_i18n.properties
@@ -121,6 +121,7 @@ config.page.configuration.save.title=Save Settings
 config.page.configuration.save.success=Settings successfully saved!
 config.page.configuration.restart.warning=Changes to some of these parameters requires a restart of Openfire.
 config.page.configuration.ofmeet.title=Application Configuration
+config.page.configuration.ofmeet.disableRtx.enabled_desc=Enable RTX
 config.page.configuration.ofmeet.useipv6.enabled=Enable IPv6
 config.page.configuration.ofmeet.useipv6.enabled_desc=Enable webrtc to use IPv6
 config.page.configuration.ofmeet.useipv6.disabled=Disable IPv6

diff --git a/ofmeet/src/web/ofmeet-settings.jsp b/ofmeet/src/web/ofmeet-settings.jsp
@@ -44,6 +44,7 @@
         }
 
         final boolean securityenabled = ParamUtils.getBooleanParameter( request, "securityenabled" );
+        final boolean disableRtx = !ParamUtils.getBooleanParameter( request, "enableRtx" );
         final String authusername = request.getParameter( "authusername" );
         final String sippassword = request.getParameter( "sippassword" );
         final String server = request.getParameter( "server" );
@@ -133,6 +134,7 @@
             JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.allow.direct.sip", Boolean.toString( allowdirectsip ) );
             JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.sip.hq.voice", hqVoice );
 
+            ofmeetConfig.setDisableRtx( disableRtx );
             ofmeetConfig.setStartAudioOnly( startaudioonly );
             ofmeetConfig.setStartAudioMuted( startaudiomuted == null || startaudiomuted.isEmpty() ? null : Integer.parseInt( startaudiomuted ));
             ofmeetConfig.setStartVideoMuted( startvideomuted == null || startvideomuted.isEmpty() ? null : Integer.parseInt( startvideomuted ));
@@ -202,6 +204,12 @@
     <fmt:message key="config.page.configuration.ofmeet.title" var="boxtitleofmeet"/>
     <admin:contentBox title="${boxtitleofmeet}">
         <table cellpadding="3" cellspacing="0" border="0" width="100%">
+            <tr>
+                <td nowrap colspan="2">
+                    <input type="checkbox" name="enableRtx" ${ofmeetConfig.disableRtx ? "" : "checked"}>
+                    <fmt:message key="config.page.configuration.ofmeet.disableRtx.enabled_desc" />
+                </td>
+            </tr>
             <tr>
                 <td nowrap colspan="2">
                     <input type="checkbox" name="useipv6" ${admin:getBooleanProperty( "org.jitsi.videobridge.ofmeet.useipv6", false) ? "checked" : ""}>

diff --git a/web/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/ConfigServlet.java b/web/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/ConfigServlet.java
@@ -226,7 +226,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) th
             {
                 config.put( "globalConferenceId", globalConferenceId );
             }
-            config.put( "disableRtx", true );
+            config.put( "disableRtx", ofMeetConfig.getDisableRtx() );
             config.put( "bosh", getMostPreferredConnectionURL( request ) );
 
             config.put( "channelLastN", ofMeetConfig.getChannelLastN() );