diff options
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 3ead180..12dda48 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -155,7 +155,7 @@ namespace OpenSim.Services.HypergridService | |||
155 | string myExternalIP = string.Empty; | 155 | string myExternalIP = string.Empty; |
156 | string gridName = gatekeeper.ServerURI; | 156 | string gridName = gatekeeper.ServerURI; |
157 | 157 | ||
158 | m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}", m_GridName, gridName); | 158 | m_log.DebugFormat("[USER AGENT SERVICE]: m_grid - {0}, gn - {1}", m_GridName, gridName); |
159 | 159 | ||
160 | if (m_GridName == gridName) | 160 | if (m_GridName == gridName) |
161 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 161 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |
@@ -266,13 +266,11 @@ namespace OpenSim.Services.HypergridService | |||
266 | 266 | ||
267 | if (m_TravelingAgents.ContainsKey(sessionID)) | 267 | if (m_TravelingAgents.ContainsKey(sessionID)) |
268 | { | 268 | { |
269 | bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || | 269 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing with login IP {0} and MyIP {1}", |
270 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | 270 | m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress); |
271 | |||
272 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}", | ||
273 | reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result); | ||
274 | 271 | ||
275 | return result; | 272 | return m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || |
273 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | ||
276 | } | 274 | } |
277 | 275 | ||
278 | return false; | 276 | return false; |