Admin Server can now bind to a private ip address
Signed-off-by: Melanie <melanie@t-data.com>avinationmerge
parent
e9ec187746
commit
d5d0e81df2
|
@ -116,7 +116,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
|||
int port = m_config.GetInt("port", 0);
|
||||
|
||||
m_application = openSim;
|
||||
m_httpServer = MainServer.GetHttpServer((uint)port);
|
||||
string bind_ip_address = m_config.GetString("bind_ip_address", "127.0.0.1");
|
||||
IPAddress ipaddr = IPAddress.Parse( bind_ip_address );
|
||||
m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr);
|
||||
|
||||
Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
|
||||
availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod;
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Net;
|
||||
using log4net;
|
||||
using OpenSim.Framework.Servers.HttpServer;
|
||||
|
||||
|
@ -47,6 +48,11 @@ namespace OpenSim.Framework
|
|||
}
|
||||
|
||||
public static IHttpServer GetHttpServer(uint port)
|
||||
{
|
||||
return GetHttpServer(port,null);
|
||||
}
|
||||
|
||||
public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr)
|
||||
{
|
||||
if (port == 0)
|
||||
return Instance;
|
||||
|
@ -58,6 +64,9 @@ namespace OpenSim.Framework
|
|||
|
||||
m_Servers[port] = new BaseHttpServer(port);
|
||||
|
||||
if (ipaddr != null )
|
||||
m_Servers[port].ListenIPAddress = ipaddr;
|
||||
|
||||
m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
|
||||
m_Servers[port].Start();
|
||||
|
||||
|
|
|
@ -326,6 +326,9 @@
|
|||
;; Set this to a nonzero value to have remote admin use a different port
|
||||
; port = 0
|
||||
|
||||
;; Set this to the ip address that you want the admin server to bind to
|
||||
; bind_ip_address = 127.0.0.1
|
||||
|
||||
;# {access_password} {enabled:true} {Password for the remote admin interface} {}
|
||||
;; This password is required to make any XMLRPC call (should be set as
|
||||
;; the "password" parameter)
|
||||
|
|
Loading…
Reference in New Issue