aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden/LLStandaloneLoginService.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/Client/Linden/LLStandaloneLoginService.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/Client/Linden/LLStandaloneLoginService.cs')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index 73cc7a3..ea3a74a 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -163,11 +163,17 @@ namespace OpenSim.Client.Linden
163 163
164 if (m_serversInfo.HttpUsesSSL) 164 if (m_serversInfo.HttpUsesSSL)
165 { 165 {
166 seedcap = "https://" + m_serversInfo.HttpSSLCN + ":" + m_serversInfo.httpSSLPort + capsSeedPath; 166 // For NAT
167 string host = NetworkUtil.GetHostFor(remoteClient.Address, m_serversInfo.HttpSSLCN);
168
169 seedcap = "https://" + host + ":" + m_serversInfo.httpSSLPort + capsSeedPath;
167 } 170 }
168 else 171 else
169 { 172 {
170 seedcap = "http://" + regionInfo.ExternalHostName + ":" + m_serversInfo.HttpListenerPort + capsSeedPath; 173 // For NAT
174 string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ExternalHostName);
175
176 seedcap = "http://" + host + ":" + m_serversInfo.HttpListenerPort + capsSeedPath;
171 } 177 }
172 178
173 response.SeedCapability = seedcap; 179 response.SeedCapability = seedcap;