diff options
author | Diva Canto | 2010-07-30 14:04:13 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-30 14:40:45 -0700 |
commit | 4a7588b0f0a7a03c94c69c45dec6b115dc86f19d (patch) | |
tree | 35060a790bceef8a1e0f7450042e7d8471c1edb0 /OpenSim/Region | |
parent | Add some options (diff) | |
download | opensim-SC_OLD-4a7588b0f0a7a03c94c69c45dec6b115dc86f19d.zip opensim-SC_OLD-4a7588b0f0a7a03c94c69c45dec6b115dc86f19d.tar.gz opensim-SC_OLD-4a7588b0f0a7a03c94c69c45dec6b115dc86f19d.tar.bz2 opensim-SC_OLD-4a7588b0f0a7a03c94c69c45dec6b115dc86f19d.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 091fdeb..f1828da 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2728,7 +2728,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2728 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); | 2728 | IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>(); |
2729 | if (userVerification != null && ep != null) | 2729 | if (userVerification != null && ep != null) |
2730 | { | 2730 | { |
2731 | if (!userVerification.VerifyClient(aCircuit, ep.Address.ToString())) | 2731 | System.Net.IPAddress addr = NetworkUtil.GetExternalIPOf(ep.Address); |
2732 | |||
2733 | if (!userVerification.VerifyClient(aCircuit, /*ep.Address.ToString() */ addr.ToString())) | ||
2732 | { | 2734 | { |
2733 | // uh-oh, this is fishy | 2735 | // uh-oh, this is fishy |
2734 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); | 2736 | m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); |