fix #259 - Voximplant integration

igniterealtime · Feb 28, 2021 · 8140592 · 8140592
1 parent 82589a1
commit 8140592
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 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
@@ -768,6 +768,9 @@ public Language getLanguage()
 
     public final StringProperty jigasiXmppRoomName = new StringProperty( "ofmeet.jigasi.xmpp.room-name", "siptest" );
     public StringProperty getJigasiXmppRoomName() { return jigasiXmppRoomName; }
+
+    public final StringProperty jigasiSipHeaderRoomName = new StringProperty( "ofmeet.jigasi.room.header.name", "Jitsi-Conference-Room" );
+    public StringProperty getJigasiSipHeaderRoomName() { return jigasiSipHeaderRoomName; }	
 
     public final StringProperty jigasiXmppPassword = new StringProperty( "ofmeet.jigasi.xmpp.password", null );
     public StringProperty getJigasiXmppPassword() { return jigasiXmppPassword; }

diff --git a/ofmeet/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJigasiWrapper.java b/ofmeet/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJigasiWrapper.java
@@ -31,6 +31,7 @@
 import java.util.*;
 import org.jitsi.util.OSUtils;
 import java.util.Properties;
+import org.jitsi.videobridge.openfire.PluginImpl;
 
 /**
  * A wrapper object for the Jitsi Gateway to SIP (jigasi) component.
@@ -47,7 +48,7 @@ public synchronized void initialize( File pluginDirectory) throws Exception
         System.setProperty("ofmeet.jigasi.started", "false");
 
         final OFMeetConfig config = new OFMeetConfig();
-        final String IPADDR = getIpAddress();
+        final String IPADDR = JiveGlobals.getProperty( PluginImpl.MANUAL_HARVESTER_LOCAL_PROPERTY_NAME, getIpAddress() );
         final String DOMAIN = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
         final String MAIN_MUC = JiveGlobals.getProperty( "ofmeet.main.muc", "conference." + DOMAIN);
 
@@ -77,6 +78,7 @@ public synchronized void initialize( File pluginDirectory) throws Exception
         props.setProperty("net.java.sip.communicator.packetlogging.PACKET_LOGGING_ENABLED", "false");
 
         props.setProperty("net.java.sip.communicator.impl.protocol.sip.acc1403273890647", "acc1403273890647");
+        props.setProperty("net.java.sip.communicator.impl.protocol.sip.acc1403273890647.JITSI_MEET_ROOM_HEADER_NAME", config.jigasiSipHeaderRoomName.get());				
         props.setProperty("net.java.sip.communicator.impl.protocol.sip.acc1403273890647.ACCOUNT_UID", "SIP:" + config.jigasiSipUserId.get());
         props.setProperty("net.java.sip.communicator.impl.protocol.sip.acc1403273890647.PASSWORD", Base64.getEncoder().encodeToString( config.jigasiSipPassword.get().getBytes() ) );
         props.setProperty("net.java.sip.communicator.impl.protocol.sip.acc1403273890647.PROTOCOL_NAME", "SIP");

diff --git a/pade/changelog.html b/pade/changelog.html
@@ -56,6 +56,7 @@ <h1>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/252">Issue #252 - Add custom confetti settings to Admin console</a></li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/253">Issue #253 - Add support for the Badging API</a></li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/256">Issue #256 - Some date-time languages are missing</a></li>
+    <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/259">Issue #259 - Voximplant integration</a></li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/260">Issue #260 - Some cameras seem to appear black on the left and right</a></li>
  </ul>
 

diff --git a/pade/src/i18n/pade_i18n.properties b/pade/src/i18n/pade_i18n.properties
@@ -405,6 +405,7 @@ plugin.sidebar.sipsettings.description=Gateway to SIP Settings
 sipsettings.title=Gateway to SIP
 sipsettings.introduction=OFMeet can be configured to interact with a SIP gateway. This allows regular SIP clients to join a meeting.
 sipsettings.sip.enabled=Enable Gateway to SIP
+sipsettings.sip.header.room.name=SIP header name that identifies the JVB room name
 sipsettings.sip.account.title=SIP account
 sipsettings.sip.account.description=OFMeet will register itself as a SIP client, using the settings below. This account will be used to make and receive calls, which are merged into meetings.
 sipsettings.sip.account.user-id=User ID

diff --git a/pade/src/web/ofmeet-sipsettings.jsp b/pade/src/web/ofmeet-sipsettings.jsp
@@ -54,7 +54,8 @@
         final String jigasiSipUserId = request.getParameter( "jigasiSipUserId" );
         final String jigasiXmppPassword = request.getParameter( "jigasiXmppPassword" );
         final String jigasiXmppUserId = request.getParameter( "jigasiXmppUserId" );      
-        final String jigasiXmppRoomName = request.getParameter( "jigasiXmppRoomName" );  
+        final String jigasiXmppRoomName = request.getParameter( "jigasiXmppRoomName" ); 
+		final String jigasiSipHeaderRoomName = request.getParameter( "jigasiSipHeaderRoomName" ); 
         final String jigasiFreeSwitchHost = request.getParameter( "jigasiFreeSwitchHost" );          
         final String jigasiFreeSwitchPassword = request.getParameter( "jigasiFreeSwitchPassword" );    
         
@@ -71,6 +72,7 @@
             ofmeetConfig.jigasiSipUserId.set( jigasiSipUserId );
             ofmeetConfig.jigasiXmppPassword.set( jigasiXmppPassword );
             ofmeetConfig.jigasiXmppRoomName.set( jigasiXmppRoomName );
+            ofmeetConfig.jigasiSipHeaderRoomName.set( jigasiSipHeaderRoomName );			
             ofmeetConfig.jigasiXmppUserId.set( jigasiXmppUserId );  
             ofmeetConfig.jigasiFreeSwitchPassword.set( jigasiFreeSwitchPassword );
             ofmeetConfig.jigasiFreeSwitchHost.set( jigasiFreeSwitchHost );
@@ -211,7 +213,11 @@
             <tr>
                 <td width="200"><label for="jigasiXmppRoomName"><fmt:message key="sipsettings.xmpp.room.name"/>:</label></td>
                 <td><input type="text" size="60" maxlength="100" name="jigasiXmppRoomName" id="jigasiXmppRoomName" value="${ofmeetConfig.jigasiXmppRoomName.get() == null ? 'siptest' : ofmeetConfig.jigasiXmppRoomName.get()}"></td>
-            </tr>            
+            </tr>   
+            <tr>
+                <td width="200"><label for="jigasiSipHeaderRoomName"><fmt:message key="sipsettings.sip.header.room.name"/>:</label></td>
+                <td><input type="text" size="60" maxlength="100" name="jigasiSipHeaderRoomName" id="jigasiSipHeaderRoomName" value="${ofmeetConfig.jigasiSipHeaderRoomName.get() == null ? 'Jitsi-Conference-Room' : ofmeetConfig.jigasiSipHeaderRoomName.get()}"></td>
+            </tr> 			
         </table>
     </admin:contentBox>