OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Catching weirdnesses on resolving External EndPoint in agent transfers. Will probably need to do more aggressively.

0.6.6-post-fixes
diva 2009-05-26 22:39:01 +00:00
parent f5efb0061a
commit 7ab1986bf0
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/Communications/Clients/RegionClient.cs
View File

@ -45,8 +45,21 @@ namespace OpenSim.Framework.Communications.Clients
public bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit, string authKey, out string reason) public bool DoCreateChildAgentCall(RegionInfo region, AgentCircuitData aCircuit, string authKey, out string reason)
{ {
reason = String.Empty;
// Eventually, we want to use a caps url instead of the agentID // Eventually, we want to use a caps url instead of the agentID
string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/"; string uri = string.Empty;
try
{
uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/";
}
catch (Exception e)
{
m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
reason = e.Message;
return false;
}
//Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri);
HttpWebRequest AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); HttpWebRequest AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri);
@ -56,8 +69,6 @@ namespace OpenSim.Framework.Communications.Clients
//AgentCreateRequest.KeepAlive = false; //AgentCreateRequest.KeepAlive = false;
AgentCreateRequest.Headers.Add("Authorization", authKey); AgentCreateRequest.Headers.Add("Authorization", authKey);
reason = String.Empty;
// Fill it in // Fill it in
OSDMap args = null; OSDMap args = null;
try try
@ -158,7 +169,16 @@ namespace OpenSim.Framework.Communications.Clients
public bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData) public bool DoChildAgentUpdateCall(RegionInfo region, IAgentData cAgentData)
{ {
// Eventually, we want to use a caps url instead of the agentID // Eventually, we want to use a caps url instead of the agentID
string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/"; string uri = string.Empty;
try
{
uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/";
}
catch (Exception e)
{
m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
return false;
}
//Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri); //Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri);
HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
@ -330,7 +350,16 @@ namespace OpenSim.Framework.Communications.Clients
public bool DoCloseAgentCall(RegionInfo region, UUID id) public bool DoCloseAgentCall(RegionInfo region, UUID id)
{ {
string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() + "/"; string uri = string.Empty;
try
{
uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() + "/";
}
catch (Exception e)
{
m_log.Debug("[REST COMMS]: Unable to resolve external endpoint on agent close. Reason: " + e.Message);
return false;
}
//Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri);