diff options
author | mores | 2010-11-02 21:46:45 -0400 |
---|---|---|
committer | Melanie | 2010-11-03 01:12:48 +0000 |
commit | 1f77f05f023f9ab45e9f8fd0109766a1fe151dba (patch) | |
tree | ea6821a2885d1f0ccbe28477230355cd4d14316d /OpenSim | |
parent | Actually calculate the height before setting it, this isn't done automatically (diff) | |
download | opensim-SC-1f77f05f023f9ab45e9f8fd0109766a1fe151dba.zip opensim-SC-1f77f05f023f9ab45e9f8fd0109766a1fe151dba.tar.gz opensim-SC-1f77f05f023f9ab45e9f8fd0109766a1fe151dba.tar.bz2 opensim-SC-1f77f05f023f9ab45e9f8fd0109766a1fe151dba.tar.xz |
Admin Server can now bind to a private ip address
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/MainServer.cs | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 72ac303..cbaa38b 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", "127.0.0.1"); |
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 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Net; | ||
30 | using log4net; | 31 | using log4net; |
31 | using OpenSim.Framework.Servers.HttpServer; | 32 | using 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 | ||