Fixed interface binding.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6806 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/spi/ConnectionManagerImpl.java

@@ -11,8 +11,8 @@
 
 package org.jivesoftware.wildfire.spi;
 
-import org.apache.mina.common.ExecutorThreadModel;
 import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.ExecutorThreadModel;
 import org.apache.mina.common.SimpleByteBufferAllocator;
 import org.apache.mina.filter.SSLFilter;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
@@ -158,7 +158,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
 
             try {
                 // Listen on a specific network interface if it has been set.
-                String interfaceName = JiveGlobals.getXMLProperty("xmpp.socket.network.interface");
+                String interfaceName = JiveGlobals.getXMLProperty("network.interface");
                 InetAddress bindInterface = null;
                 if (interfaceName != null) {
                     if (interfaceName.trim().length() > 0) {
@@ -247,7 +247,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
 
             try {
                 // Listen on a specific network interface if it has been set.
-                String interfaceName = JiveGlobals.getXMLProperty("xmpp.socket.network.interface");
+                String interfaceName = JiveGlobals.getXMLProperty("network.interface");
                 InetAddress bindInterface = null;
                 if (interfaceName != null) {
                     if (interfaceName.trim().length() > 0) {
@@ -322,7 +322,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
                 sslSocketAcceptor.getFilterChain().addFirst("tls", new SSLFilter(sslContext));
 
                 // Listen on a specific network interface if it has been set.
-                String interfaceName = JiveGlobals.getXMLProperty("xmpp.socket.network.interface");
+                String interfaceName = JiveGlobals.getXMLProperty("network.interface");
                 InetAddress bindInterface = null;
                 if (interfaceName != null) {
                     if (interfaceName.trim().length() > 0) {

src/java/org/jivesoftware/wildfire/stun/STUNService.java

@@ -74,7 +74,7 @@ public class STUNService extends BasicModule implements ServerItemsProvider, Rou
 
         if (primaryAddress == null || primaryAddress.equals(""))
             primaryAddress = JiveGlobals.getProperty("xmpp.domain",
-                    JiveGlobals.getProperty("network.interface", "localhost"));
+                    JiveGlobals.getXMLProperty("network.interface", "localhost"));
 
         if (secondaryAddress == null || secondaryAddress.equals(""))
             secondaryAddress = "127.0.0.1";

src/web/stun-settings.jsp

@@ -154,7 +154,7 @@
                         <%
                           }
                         }
-                        String sname = JiveGlobals.getProperty("xmpp.domain", JiveGlobals.getProperty("network.interface", "localhost"));
+                        String sname = JiveGlobals.getProperty("xmpp.domain", JiveGlobals.getXMLProperty("network.interface", "localhost"));
                         %>
                         <option value="<%=sname%>"><%=sname%>
                         </option>