aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs4
-rw-r--r--OpenSim/Framework/Console/LogBase.cs6
-rw-r--r--OpenSim/Framework/InventoryConfig.cs4
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs10
-rw-r--r--OpenSim/Framework/RegionInfo.cs7
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs8
-rw-r--r--OpenSim/Framework/UserConfig.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs3
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
19 files changed, 43 insertions, 47 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 51a4598..4603280 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Capabilities
50 public class Caps 50 public class Caps
51 { 51 {
52 private string m_httpListenerHostName; 52 private string m_httpListenerHostName;
53 private int m_httpListenPort; 53 private uint m_httpListenPort;
54 private string m_capsObjectPath = "00001-"; 54 private string m_capsObjectPath = "00001-";
55 private string m_requestPath = "0000/"; 55 private string m_requestPath = "0000/";
56 private string m_mapLayerPath = "0001/"; 56 private string m_mapLayerPath = "0001/";
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Capabilities
68 public NewInventoryItem AddNewInventoryItem = null; 68 public NewInventoryItem AddNewInventoryItem = null;
69 public ItemUpdatedCallback ItemUpdatedCall = null; 69 public ItemUpdatedCallback ItemUpdatedCall = null;
70 70
71 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, 71 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
72 LLUUID agent, bool dumpAssetsToFile) 72 LLUUID agent, bool dumpAssetsToFile)
73 { 73 {
74 m_assetCache = assetCache; 74 m_assetCache = assetCache;
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index dccba1c..bce518b 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.UserManagement
70 private string gendered; 70 private string gendered;
71 private string everLoggedIn; 71 private string everLoggedIn;
72 private string login; 72 private string login;
73 private int simPort; 73 private uint simPort;
74 private string simAddress; 74 private string simAddress;
75 private string agentAccess; 75 private string agentAccess;
76 private Int32 circuitCode; 76 private Int32 circuitCode;
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.UserManagement
369 set { everLoggedIn = value; } 369 set { everLoggedIn = value; }
370 } // EverLoggedIn 370 } // EverLoggedIn
371 371
372 public int SimPort 372 public uint SimPort
373 { 373 {
374 get { return simPort; } 374 get { return simPort; }
375 set { simPort = value; } 375 set { simPort = value; }
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 99c0128..c226fcb 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -345,15 +345,15 @@ namespace OpenSim.Framework.Console
345 return address; 345 return address;
346 } 346 }
347 347
348 public int CmdPromptIPPort(string prompt, string defaultvalue) 348 public uint CmdPromptIPPort(string prompt, string defaultvalue)
349 { 349 {
350 int port; 350 uint port;
351 string portStr; 351 string portStr;
352 352
353 while (true) 353 while (true)
354 { 354 {
355 portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue); 355 portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
356 if (int.TryParse(portStr, out port)) 356 if (uint.TryParse(portStr, out port))
357 { 357 {
358 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort) 358 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)
359 { 359 {
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 554cd30..87731a5 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -13,7 +13,7 @@ namespace OpenSim.Framework
13 public string DatabaseProvider = ""; 13 public string DatabaseProvider = "";
14 public static uint DefaultHttpPort = 8004; 14 public static uint DefaultHttpPort = 8004;
15 15
16 public int HttpPort = 8004; 16 public uint HttpPort = DefaultHttpPort;
17 17
18 private ConfigurationMember configMember; 18 private ConfigurationMember configMember;
19 19
@@ -63,7 +63,7 @@ namespace OpenSim.Framework
63 DatabaseProvider = (string) configuration_result; 63 DatabaseProvider = (string) configuration_result;
64 break; 64 break;
65 case "http_port": 65 case "http_port":
66 HttpPort = (int) configuration_result; 66 HttpPort = (uint) configuration_result;
67 break; 67 break;
68 } 68 }
69 69
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 1c76320..b3e79b7 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Framework
45 45
46 public string InventoryURL = ""; 46 public string InventoryURL = "";
47 47
48 public static int DefaultHttpListenerPort = 9000; 48 public static uint DefaultHttpListenerPort = 9000;
49 public int HttpListenerPort = DefaultHttpListenerPort; 49 public uint HttpListenerPort = DefaultHttpListenerPort;
50 50
51 public static int RemotingListenerPort = 8895; 51 public static uint RemotingListenerPort = 8895;
52 52
53 53
54 public NetworkServersInfo() 54 public NetworkServersInfo()
@@ -80,8 +80,8 @@ namespace OpenSim.Framework
80 m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000); 80 m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
81 m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); 81 m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
82 82
83 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort); 83 HttpListenerPort = (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort);
84 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort); 84 RemotingListenerPort = (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
85 GridURL = 85 GridURL =
86 config.Configs["Network"].GetString("grid_server_url", 86 config.Configs["Network"].GetString("grid_server_url",
87 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); 87 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index dd4078b..d94a890 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -56,15 +56,14 @@ namespace OpenSim.Framework
56 m_externalHostName = externalUri; 56 m_externalHostName = externalUri;
57 } 57 }
58 58
59 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port) 59 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
60 { 60 {
61
62 m_regionLocX = regionLocX; 61 m_regionLocX = regionLocX;
63 m_regionLocY = regionLocY; 62 m_regionLocY = regionLocY;
64 63
65 m_externalHostName = externalUri; 64 m_externalHostName = externalUri;
66 65
67 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); 66 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
68 } 67 }
69 68
70 public LLUUID RegionID = LLUUID.Zero; 69 public LLUUID RegionID = LLUUID.Zero;
@@ -270,7 +269,7 @@ namespace OpenSim.Framework
270 { 269 {
271 errorMessage = "needs an IP Address (IPAddress)"; 270 errorMessage = "needs an IP Address (IPAddress)";
272 } 271 }
273 this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", NetworkServersInfo.DefaultHttpListenerPort); 272 this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", (int) NetworkServersInfo.DefaultHttpListenerPort);
274 273
275 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1"); 274 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
276 if (externalHost != "SYSTEMIP") 275 if (externalHost != "SYSTEMIP")
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index dc440b6..c7e7d27 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -51,7 +51,6 @@ namespace OpenSim.Framework
51 m_externalHostName = ConvertFrom.ExternalHostName; 51 m_externalHostName = ConvertFrom.ExternalHostName;
52 m_remotingPort = ConvertFrom.RemotingPort; 52 m_remotingPort = ConvertFrom.RemotingPort;
53 RemotingAddress = ConvertFrom.RemotingAddress; 53 RemotingAddress = ConvertFrom.RemotingAddress;
54
55 } 54 }
56 public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 55 public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
57 { 56 {
@@ -63,15 +62,14 @@ namespace OpenSim.Framework
63 m_externalHostName = externalUri; 62 m_externalHostName = externalUri;
64 } 63 }
65 64
66 public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port) 65 public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
67 { 66 {
68
69 m_regionLocX = regionLocX; 67 m_regionLocX = regionLocX;
70 m_regionLocY = regionLocY; 68 m_regionLocY = regionLocY;
71 69
72 m_externalHostName = externalUri; 70 m_externalHostName = externalUri;
73 71
74 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); 72 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
75 } 73 }
76 74
77 public LLUUID RegionID = LLUUID.Zero; 75 public LLUUID RegionID = LLUUID.Zero;
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 889eaef..1baf073 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -44,21 +44,21 @@ namespace OpenSim.Framework.Servers
44 protected HttpListener m_httpListener; 44 protected HttpListener m_httpListener;
45 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); 45 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
46 protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>(); 46 protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>();
47 protected int m_port; 47 protected uint m_port;
48 protected bool m_ssl = false; 48 protected bool m_ssl = false;
49 protected bool m_firstcaps = true; 49 protected bool m_firstcaps = true;
50 50
51 public int Port 51 public uint Port
52 { 52 {
53 get { return m_port; } 53 get { return m_port; }
54 } 54 }
55 55
56 public BaseHttpServer(int port) 56 public BaseHttpServer(uint port)
57 { 57 {
58 m_port = port; 58 m_port = port;
59 } 59 }
60 60
61 public BaseHttpServer(int port, bool ssl) 61 public BaseHttpServer(uint port, bool ssl)
62 { 62 {
63 m_ssl = ssl; 63 m_ssl = ssl;
64 m_port = port; 64 m_port = port;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 1cc00c7..39b1599 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
76 configMember.addConfigurationOption("default_inventory_server", 76 configMember.addConfigurationOption("default_inventory_server",
77 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 77 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
78 "Default Inventory Server URI", 78 "Default Inventory Server URI",
79 "http://127.0.0.1:8004/", false); 79 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", false);
80 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 80 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
81 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 81 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
82 82
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 61427fa..c973f99 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.AssetServer
92 LoadDefaultAssets(); 92 LoadDefaultAssets();
93 93
94 m_console.Verbose("ASSET", "Starting HTTP process"); 94 m_console.Verbose("ASSET", "Starting HTTP process");
95 BaseHttpServer httpServer = new BaseHttpServer((int) m_config.HttpPort); 95 BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
96 96
97 httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); 97 httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
98 httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); 98 httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b793cf9..d6b30ce 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Grid.GridServer
112 m_gridManager.config = Cfg; 112 m_gridManager.config = Cfg;
113 113
114 m_console.Verbose("GRID", "Starting HTTP process"); 114 m_console.Verbose("GRID", "Starting HTTP process");
115 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); 115 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
116 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 116 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
117 117
118 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 118 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index d2ad6ae..74352ac 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
92 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 92 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
93 93
94 MainLog.Instance.Verbose("REGION", "Starting HTTP process"); 94 MainLog.Instance.Verbose("REGION", "Starting HTTP process");
95 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); 95 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
96 96
97 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); 97 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
98 98
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index ccd3548..f404cce 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Grid.UserServer
81 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + 81 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
82 SimInfo.regionLocY); 82 SimInfo.regionLocY);
83 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 83 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
84 response.SimPort = (Int32)SimInfo.serverPort; 84 response.SimPort = (uint) SimInfo.serverPort;
85 response.RegionX = SimInfo.regionLocX; 85 response.RegionX = SimInfo.regionLocX;
86 response.RegionY = SimInfo.regionLocY; 86 response.RegionY = SimInfo.regionLocY;
87 87
@@ -149,7 +149,7 @@ namespace OpenSim.Grid.UserServer
149 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + 149 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
150 SimInfo.regionLocY); 150 SimInfo.regionLocY);
151 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 151 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
152 response.SimPort = (Int32)SimInfo.serverPort; 152 response.SimPort = (uint) SimInfo.serverPort;
153 response.RegionX = SimInfo.regionLocX; 153 response.RegionX = SimInfo.regionLocX;
154 response.RegionY = SimInfo.regionLocY; 154 response.RegionY = SimInfo.regionLocY;
155 155
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 5b43fec..53ed2ab 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack
49 protected NetworkServersInfo m_networkServersInfo; 49 protected NetworkServersInfo m_networkServersInfo;
50 50
51 protected BaseHttpServer m_httpServer; 51 protected BaseHttpServer m_httpServer;
52 protected int m_httpServerPort; 52 protected uint m_httpServerPort;
53 53
54 protected LogBase m_log; 54 protected LogBase m_log;
55 protected CommunicationsManager m_commsManager; 55 protected CommunicationsManager m_commsManager;
@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack
106 protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) 106 protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions)
107 { 107 {
108 AgentCircuitManager circuitManager = new AgentCircuitManager(); 108 AgentCircuitManager circuitManager = new AgentCircuitManager();
109 udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager); 109 udpServer = new UDPServer((uint) regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager);
110 110
111 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); 111 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager);
112 112
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index b0586a3..aaf7224 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack
49 protected PacketServer m_packetServer; 49 protected PacketServer m_packetServer;
50 protected ulong m_regionHandle; 50 protected ulong m_regionHandle;
51 51
52 protected int listenPort; 52 protected uint listenPort;
53 protected IScene m_localScene; 53 protected IScene m_localScene;
54 protected AssetCache m_assetCache; 54 protected AssetCache m_assetCache;
55 protected LogBase m_log; 55 protected LogBase m_log;
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ClientStack
83 { 83 {
84 } 84 }
85 85
86 public UDPServer(int port, AssetCache assetCache, LogBase console, AgentCircuitManager authenticateClass) 86 public UDPServer(uint port, AssetCache assetCache, LogBase console, AgentCircuitManager authenticateClass)
87 { 87 {
88 listenPort = port; 88 listenPort = port;
89 m_assetCache = assetCache; 89 m_assetCache = assetCache;
@@ -180,9 +180,9 @@ namespace OpenSim.Region.ClientStack
180 180
181 public void ServerListener() 181 public void ServerListener()
182 { 182 {
183 m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort); 183 m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort.ToString());
184 184
185 ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); 185 ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) listenPort);
186 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 186 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
187 Server.Bind(ServerIncoming); 187 Server.Bind(ServerIncoming);
188 188
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index eef6ed4..103c76f 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -121,11 +121,10 @@ namespace OpenSim.Region.Communications.Local
121 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 121 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
122 string capsPath = Util.GetRandomCapsPath(); 122 string capsPath = Util.GetRandomCapsPath();
123 response.SimAddress = reg.ExternalEndPoint.Address.ToString(); 123 response.SimAddress = reg.ExternalEndPoint.Address.ToString();
124 response.SimPort = (Int32) reg.ExternalEndPoint.Port; 124 response.SimPort = (uint) reg.ExternalEndPoint.Port;
125 response.RegionX = reg.RegionLocX; 125 response.RegionX = reg.RegionLocX;
126 response.RegionY = reg.RegionLocY; 126 response.RegionY = reg.RegionLocY;
127 127
128
129 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + 128 response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
130 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; 129 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
131 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; 130 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index b11a91f..353dc28 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
166 { 166 {
167 string simIp = (string) neighbourData["sim_ip"]; 167 string simIp = (string) neighbourData["sim_ip"];
168 168
169 int port = Convert.ToInt32(neighbourData["sim_port"]); 169 uint port = Convert.ToUInt32(neighbourData["sim_port"]);
170 string externalUri = (string) neighbourData["sim_uri"]; 170 string externalUri = (string) neighbourData["sim_uri"];
171 171
172 string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); 172 string externalIpStr = Util.GetHostFromDNS(simIp).ToString();
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Communications.OGS1
450 /// </summary> 450 /// </summary>
451 private void StartRemoting() 451 private void StartRemoting()
452 { 452 {
453 TcpChannel ch = new TcpChannel(NetworkServersInfo.RemotingListenerPort); 453 TcpChannel ch = new TcpChannel((int) NetworkServersInfo.RemotingListenerPort);
454 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. 454 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this.
455 455
456 WellKnownServiceTypeEntry wellType = 456 WellKnownServiceTypeEntry wellType =
@@ -559,7 +559,7 @@ namespace OpenSim.Region.Communications.OGS1
559 // it's own remoting port! How special. 559 // it's own remoting port! How special.
560 region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); 560 region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
561 region.RemotingAddress = region.ExternalHostName; 561 region.RemotingAddress = region.ExternalHostName;
562 region.RemotingPort = (uint) NetworkServersInfo.RemotingListenerPort; 562 region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
563 if (m_localBackend.RegionUp(region,regionhandle)) 563 if (m_localBackend.RegionUp(region,regionhandle))
564 { 564 {
565 return true; 565 return true;
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index be38baf..c93804f 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -265,7 +265,7 @@ namespace OpenSim.Region.Environment.Modules
265 internal class IRCChatModule 265 internal class IRCChatModule
266 { 266 {
267 private string m_server = null; 267 private string m_server = null;
268 private int m_port = 6668; 268 private uint m_port = 6668;
269 private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; 269 private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot";
270 private string m_nick = null; 270 private string m_nick = null;
271 private string m_channel = null; 271 private string m_channel = null;
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Modules
296 m_server = config.Configs["IRC"].GetString("server"); 296 m_server = config.Configs["IRC"].GetString("server");
297 m_nick = config.Configs["IRC"].GetString("nick"); 297 m_nick = config.Configs["IRC"].GetString("nick");
298 m_channel = config.Configs["IRC"].GetString("channel"); 298 m_channel = config.Configs["IRC"].GetString("channel");
299 m_port = config.Configs["IRC"].GetInt("port", m_port); 299 m_port = (uint) config.Configs["IRC"].GetInt("port", (int) m_port);
300 m_user = config.Configs["IRC"].GetString("username", m_user); 300 m_user = config.Configs["IRC"].GetString("username", m_user);
301 if (m_server != null && m_nick != null && m_channel != null) 301 if (m_server != null && m_nick != null && m_channel != null)
302 { 302 {
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Environment.Modules
316 { 316 {
317 m_scenes = scenes; 317 m_scenes = scenes;
318 318
319 m_tcp = new TcpClient(m_server, m_port); 319 m_tcp = new TcpClient(m_server, (int) m_port);
320 m_log.Verbose("IRC", "Connecting..."); 320 m_log.Verbose("IRC", "Connecting...");
321 m_stream = m_tcp.GetStream(); 321 m_stream = m_tcp.GetStream();
322 m_log.Verbose("IRC", "Connected to " + m_server); 322 m_log.Verbose("IRC", "Connected to " + m_server);
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 9e5ca9b..16dcd7b 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -90,7 +90,7 @@ namespace SimpleApp
90 m_log.Notice(m_log.LineInfo); 90 m_log.Notice(m_log.LineInfo);
91 91
92 IPEndPoint internalEndPoint = 92 IPEndPoint internalEndPoint =
93 new IPEndPoint(IPAddress.Parse("127.0.0.1"), m_networkServersInfo.HttpListenerPort); 93 new IPEndPoint(IPAddress.Parse("127.0.0.1"), (int) m_networkServersInfo.HttpListenerPort);
94 94
95 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost"); 95 RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "localhost");
96 regionInfo.DataStore = "simpleapp_datastore.yap"; 96 regionInfo.DataStore = "simpleapp_datastore.yap";