diff options
author | Jonathan Freedman | 2010-10-23 00:18:19 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-23 00:18:19 -0400 |
commit | 5ddb8b535e33ea6fbe668bad76c25f501f154bae (patch) | |
tree | 8830636140fe92eccd599cbae73c4dcf75a397a5 /OpenSim | |
parent | Merge branch 'hg16' into mantis5110 (diff) | |
download | opensim-SC-5ddb8b535e33ea6fbe668bad76c25f501f154bae.zip opensim-SC-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.gz opensim-SC-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.bz2 opensim-SC-5ddb8b535e33ea6fbe668bad76c25f501f154bae.tar.xz |
* a bit of additional debugging:
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 7 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index eb19fe2..32b4249 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -135,8 +135,6 @@ namespace OpenSim.Services.HypergridService | |||
135 | { | 135 | { |
136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI); | 137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI); |
138 | |||
139 | m_log.Debug("LATG final server uri -> " + finalDestination.ServerURI ); | ||
140 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination | 138 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination |
141 | GridRegion region = new GridRegion(gatekeeper); | 139 | GridRegion region = new GridRegion(gatekeeper); |
142 | region.ServerURI = gatekeeper.ServerURI; | 140 | region.ServerURI = gatekeeper.ServerURI; |
@@ -150,12 +148,13 @@ namespace OpenSim.Services.HypergridService | |||
150 | // Generate a new service session | 148 | // Generate a new service session |
151 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); | 149 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); |
152 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); | 150 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); |
153 | |||
154 | m_log.Debug("region ServerURI -> " + region.ServerURI); | ||
155 | 151 | ||
156 | bool success = false; | 152 | bool success = false; |
157 | string myExternalIP = string.Empty; | 153 | string myExternalIP = string.Empty; |
158 | string gridName = gatekeeper.ServerURI; | 154 | string gridName = gatekeeper.ServerURI; |
155 | |||
156 | m_log.Debug("m_grid - " + m_GridName + ", gn - " + gridName); | ||
157 | |||
159 | if (m_GridName == gridName) | 158 | if (m_GridName == gridName) |
160 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 159 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |
161 | else | 160 | else |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 127c4b2..b0b51c4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -566,6 +566,7 @@ namespace OpenSim.Services.LLLoginService | |||
566 | 566 | ||
567 | private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) | 567 | private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) |
568 | { | 568 | { |
569 | m_log.Debug("attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName); | ||
569 | gatekeeper = new GridRegion(); | 570 | gatekeeper = new GridRegion(); |
570 | gatekeeper.ExternalHostName = domainName; | 571 | gatekeeper.ExternalHostName = domainName; |
571 | gatekeeper.HttpPort = port; | 572 | gatekeeper.HttpPort = port; |
@@ -631,11 +632,9 @@ namespace OpenSim.Services.LLLoginService | |||
631 | gatekeeper = new GridRegion(destination); | 632 | gatekeeper = new GridRegion(destination); |
632 | gatekeeper.ExternalHostName = hostName; | 633 | gatekeeper.ExternalHostName = hostName; |
633 | gatekeeper.HttpPort = (uint)port; | 634 | gatekeeper.HttpPort = (uint)port; |
634 | 635 | gatekeeper.ServerURI = m_GatekeeperURL; | |
635 | } | ||
636 | else // login to foreign grid | ||
637 | { | ||
638 | } | 636 | } |
637 | m_log.Debug("no gatekeeper detected..... using " + m_GatekeeperURL); | ||
639 | } | 638 | } |
640 | 639 | ||
641 | bool success = false; | 640 | bool success = false; |