aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/General/Configuration/GridConfig.cs8
-rw-r--r--OpenSim/Framework/General/Configuration/UserConfig.cs10
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
4 files changed, 19 insertions, 3 deletions
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs
index a81cac2..240303f 100644
--- a/OpenSim/Framework/General/Configuration/GridConfig.cs
+++ b/OpenSim/Framework/General/Configuration/GridConfig.cs
@@ -19,6 +19,8 @@ namespace OpenSim.Framework.Configuration
19 public string SimRecvKey = ""; 19 public string SimRecvKey = "";
20 20
21 public string DatabaseProvider = ""; 21 public string DatabaseProvider = "";
22
23 public uint HttpPort = 8001;
22 24
23 private ConfigurationMember configMember; 25 private ConfigurationMember configMember;
24 public GridConfig(string description, string filename) 26 public GridConfig(string description, string filename)
@@ -41,6 +43,8 @@ namespace OpenSim.Framework.Configuration
41 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); 43 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false);
42 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); 44 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);
43 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 45 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
46
47 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8001" , false);
44 } 48 }
45 49
46 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 50 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -77,6 +81,10 @@ namespace OpenSim.Framework.Configuration
77 case "database_provider": 81 case "database_provider":
78 this.DatabaseProvider = (string)configuration_result; 82 this.DatabaseProvider = (string)configuration_result;
79 break; 83 break;
84
85 case "http_port":
86 HttpPort = (uint)configuration_result;
87 break;
80 } 88 }
81 89
82 return true; 90 return true;
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index 177506f..776b911 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -16,6 +16,8 @@ namespace OpenSim.Framework.Configuration
16 16
17 public string DatabaseProvider = ""; 17 public string DatabaseProvider = "";
18 18
19 public uint HttpPort = 8002;
20
19 private ConfigurationMember configMember; 21 private ConfigurationMember configMember;
20 22
21 public UserConfig(string description, string filename) 23 public UserConfig(string description, string filename)
@@ -26,13 +28,15 @@ namespace OpenSim.Framework.Configuration
26 28
27 public void loadConfigurationOptions() 29 public void loadConfigurationOptions()
28 { 30 {
29 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false); 31 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
30 32
31 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); 33 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false);
32 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); 34 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
33 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); 35 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
34 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 36 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
35 37
38 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false);
39
36 } 40 }
37 41
38 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 42 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -54,6 +58,10 @@ namespace OpenSim.Framework.Configuration
54 case "database_provider": 58 case "database_provider":
55 this.DatabaseProvider = (string)configuration_result; 59 this.DatabaseProvider = (string)configuration_result;
56 break; 60 break;
61
62 case "http_port":
63 HttpPort = (uint)configuration_result;
64 break;
57 } 65 }
58 66
59 return true; 67 return true;
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index fed5330..89497d8 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.GridServer
119 m_gridManager.config = Cfg; 119 m_gridManager.config = Cfg;
120 120
121 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 121 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
122 BaseHttpServer httpServer = new BaseHttpServer(8001); 122 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
123 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 123 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
124 124
125 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 125 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 81a8a9d..c2822b6 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Grid.UserServer
93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 93 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
94 94
95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 95 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
96 BaseHttpServer httpServer = new BaseHttpServer(8002); 96 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
97 97
98 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); 98 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
99 99