fix proxyConnection issue

igniterealtime · Dec 20, 2021 · d1b964f · d1b964f
1 parent d424859
commit d1b964f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/build.cmd b/build.cmd
@@ -2,10 +2,10 @@ call mvn clean package -Dmaven.test.skip=true
 
 cd target
 rename pade-openfire-plugin-assembly.jar pade.jar
-rd "C:\openfire_4_6_3\plugins\pade" /q /s
-del "C:\openfire_4_6_3\plugins\pade.jar" 
-del /q "C:\openfire_4_6_3\logs\*.*"
-copy pade.jar C:\openfire_4_6_3\plugins\pade.jar
+rd "C:\openfire_4_7_0\plugins\pade" /q /s
+del "C:\openfire_4_7_0\plugins\pade.jar" 
+del /q "C:\openfire_4_7_0\logs\*.*"
+copy pade.jar C:\openfire_4_7_0\plugins\pade.jar
 
 rd "D:\Projects\openfire-cluster\node1\plugins\pade" /q /s
 del "D:\Projects\openfire-cluster\node1\plugins\pade.jar" 

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJvbWrapper.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJvbWrapper.java
@@ -92,11 +92,11 @@ public synchronized void initialize(final PluginManager manager, final File plug
             "    http-servers {",
             "        private {",
             "            port = " + rest_port,
-            "            host = " + local_ip,			
+            "            host = " + JiveGlobals.getProperty( "ofmeet.videobridge.rest.host", ipAddress),			
             "        }",
             "        public {",
             "            port = " + plain_port,
-            "            host = " + public_ip,			
+            "            host = " + JiveGlobals.getProperty( "ofmeet.videobridge.rest.host", ipAddress),	
             "        }",
             "    }",
             "",

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
@@ -428,7 +428,7 @@ public static class JvbSocketCreator implements WebSocketCreator
     {
         @Override public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
         {
-            String ipaddr = getIpAddress();
+			String ipaddr = JiveGlobals.getProperty( "ofmeet.videobridge.rest.host", OfMeetPlugin.self.getIpAddress());	
             String jvbPort = JiveGlobals.getProperty( "ofmeet.websockets.plainport", "8180");
 
             HttpServletRequest request = req.getHttpServletRequest();
@@ -447,7 +447,7 @@ public static class JvbSocketCreator implements WebSocketCreator
 
             Log.info("JvbSocketCreator " + path + " " + query);
 
-            String url = "ws://localhost:" + jvbPort + path;
+            String url = "ws://" + ipaddr + ":" + jvbPort + path;
 
             ProxyWebSocket socket = null;
             ProxyConnection proxyConnection = new ProxyConnection(URI.create(url), protocols, 10000);
@@ -561,16 +561,20 @@ private void checkDownloadFolder(File pluginDirectory)
         }
     }
 
-    public static String getIpAddress()
+    public String getIpAddress()
     {
         String ourHostname = XMPPServer.getInstance().getServerInfo().getHostname();
-        String ourIpAddress = "127.0.0.1";
-
-        try {
-            ourIpAddress = InetAddress.getByName(ourHostname).getHostAddress();
-        } catch (Exception e) {
+        String ourIpAddress = JiveGlobals.getXMLProperty("network.interface");
+
+		if (ourIpAddress == null) {
+			ourIpAddress = "127.0.0.1";
+
+			try {
+				ourIpAddress = InetAddress.getByName(ourHostname).getHostAddress();
+			} catch (Exception e) {
 
-        }
+			}
+		}
 
         return ourIpAddress;
     }