aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-02 19:10:04 -0700
committeropensim mirror account2010-11-02 19:10:04 -0700
commitc830f85fede35f1cfe191953cd68e841e40a7a73 (patch)
treeea75923a0d4ab077064a48cc9a5b184b04178188
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentChange the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 (diff)
downloadopensim-SC_OLD-c830f85fede35f1cfe191953cd68e841e40a7a73.zip
opensim-SC_OLD-c830f85fede35f1cfe191953cd68e841e40a7a73.tar.gz
opensim-SC_OLD-c830f85fede35f1cfe191953cd68e841e40a7a73.tar.bz2
opensim-SC_OLD-c830f85fede35f1cfe191953cd68e841e40a7a73.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/Framework/MainServer.cs9
-rw-r--r--bin/OpenSimDefaults.ini3
3 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 72ac303..854307c 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -116,7 +116,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
116 int port = m_config.GetInt("port", 0); 116 int port = m_config.GetInt("port", 0);
117 117
118 m_application = openSim; 118 m_application = openSim;
119 m_httpServer = MainServer.GetHttpServer((uint)port); 119 string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0");
120 IPAddress ipaddr = IPAddress.Parse( bind_ip_address );
121 m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr);
120 122
121 Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); 123 Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
122 availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod; 124 availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod;
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 1f5f208..8ccabec 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -27,6 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30using System.Net;
30using log4net; 31using log4net;
31using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
32 33
@@ -48,6 +49,11 @@ namespace OpenSim.Framework
48 49
49 public static IHttpServer GetHttpServer(uint port) 50 public static IHttpServer GetHttpServer(uint port)
50 { 51 {
52 return GetHttpServer(port,null);
53 }
54
55 public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr)
56 {
51 if (port == 0) 57 if (port == 0)
52 return Instance; 58 return Instance;
53 if (instance != null && port == Instance.Port) 59 if (instance != null && port == Instance.Port)
@@ -58,6 +64,9 @@ namespace OpenSim.Framework
58 64
59 m_Servers[port] = new BaseHttpServer(port); 65 m_Servers[port] = new BaseHttpServer(port);
60 66
67 if (ipaddr != null )
68 m_Servers[port].ListenIPAddress = ipaddr;
69
61 m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); 70 m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
62 m_Servers[port].Start(); 71 m_Servers[port].Start();
63 72
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index de7c44c..f98689b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -624,6 +624,9 @@
624 ; Set this to a nonzero value to have remote admin use a different port 624 ; Set this to a nonzero value to have remote admin use a different port
625 port = 0 625 port = 0
626 626
627 ; Set this to the ip address that you want the admin server to bind to
628 bind_ip_address = "0.0.0.0"
629
627 ; This password is required to make any XMLRPC call (should be set as the "password" parameter) 630 ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
628 access_password = unknown 631 access_password = unknown
629 632