aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
diff options
context:
space:
mode:
authorAdam Frisby2009-05-23 06:29:08 +0000
committerAdam Frisby2009-05-23 06:29:08 +0000
commit6b312d934085caf1add5e6081f55c9944ab01aa9 (patch)
treeffe59622f1e810479a79b8865355b3a0ce909997 /OpenSim/Grid/UserServer.Modules/UserLoginService.cs
parent* Pipes IPEndPoint through all Login methods, including LLSD/OSD login paths. (diff)
downloadopensim-SC_OLD-6b312d934085caf1add5e6081f55c9944ab01aa9.zip
opensim-SC_OLD-6b312d934085caf1add5e6081f55c9944ab01aa9.tar.gz
opensim-SC_OLD-6b312d934085caf1add5e6081f55c9944ab01aa9.tar.bz2
opensim-SC_OLD-6b312d934085caf1add5e6081f55c9944ab01aa9.tar.xz
* Implements automatic loopback handling for standalone regions.
* This /should/ make OpenSim behave properly when hosting behind a NAT router and utilizing port forwarding (but the router doesn't support Loopback)
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules/UserLoginService.cs')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 323dc48..bb03252 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -270,10 +270,12 @@ namespace OpenSim.Grid.UserServer.Modules
270 270
271 string capsPath = CapsUtil.GetRandomCapsObjectPath(); 271 string capsPath = CapsUtil.GetRandomCapsObjectPath();
272 272
273 // Take off trailing / so that the caps path isn't //CAPS/someUUID 273 // For NAT
274 if (regionInfo.httpServerURI.EndsWith("/")) 274 string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP);
275 regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1); 275 // TODO: This doesnt support SSL. -Adam
276 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); 276 string serverURI = "http://" + host + ":" + regionInfo.ServerPort;
277
278 response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
277 279
278 // Notify the target of an incoming user 280 // Notify the target of an incoming user
279 m_log.InfoFormat( 281 m_log.InfoFormat(