diff options
author | Diva Canto | 2010-07-30 14:04:13 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-30 14:04:13 -0700 |
commit | 8ab7d80b093de2e2ed71737e0138b7a7c2c92f99 (patch) | |
tree | 7036b62efbbf2d0cf7d98f37f4a18d53d95263d4 /OpenSim/Region/Framework/Scenes | |
parent | * Added debug logging to SimianGrid inventory service response parsing (diff) | |
download | opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.zip opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.gz opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.bz2 opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.xz |
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9141d44..28720ad 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2725,7 +2725,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2725 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); | 2725 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); |
2726 | if (userVerification != null && ep != null) | 2726 | if (userVerification != null && ep != null) |
2727 | { | 2727 | { |
2728 | if (!userVerification.VerifyClient(aCircuit, ep.Address.ToString())) | 2728 | System.Net.IPAddress addr = NetworkUtil.GetExternalIPOf(ep.Address); |
2729 | |||
2730 | if (!userVerification.VerifyClient(aCircuit, /*ep.Address.ToString() */ addr.ToString())) | ||
2729 | { | 2731 | { |
2730 | // uh-oh, this is fishy | 2732 | // uh-oh, this is fishy |
2731 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | 2733 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); |