ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* more url / hg cleanup

Browse Source
This commit is contained in:
Jonathan Freedman
2010-10-11 16:53:00 -04:00
parent 2654ab6300
commit a2167b0f0d
8 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -198,20 +198,7 @@ namespace OpenSim.Services.GridService
return null;
}
public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, string serverURI, out GridRegion regInfo, out string reason)
{
return TryCreateLink(scopeID, xloc, yloc, externalRegionName, 0, null, serverURI, out regInfo, out reason);
}
public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason)
{
return TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, out regInfo, out reason);
}
// From the command line and the 2 above
public bool TryCreateLink(UUID scopeID, int xloc, int yloc,
string externalRegionName, uint externalPort, string externalHostName, string serverURI, out GridRegion regInfo, out string reason)
{
m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc);
@@ -226,8 +213,11 @@ namespace OpenSim.Services.GridService
// Big HACK for Simian Grid !!!
// We need to clean up all URLs used in OpenSim !!!
if (externalHostName.Contains("/"))
if (externalHostName.Contains("/")) {
regInfo.ServerURI = externalHostName;
} else {
regInfo.ServerURI = "http://" + externalHostName + ":" + externalPort.ToString();
}
try
{

1
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@@ -136,6 +136,7 @@ namespace OpenSim.Services.HypergridService
m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}",
agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()),
gatekeeper.ExternalHostName +":"+ gatekeeper.HttpPort);
m_log.Debug("gatekeeper serveruri -> " + gatekeeper.ServerURI );
// Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
GridRegion region = new GridRegion(gatekeeper);

9
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -115,7 +115,13 @@ namespace OpenSim.Services.Interfaces
/// </summary>
public string ServerURI
{
get { return m_serverURI; }
get {
if ( m_serverURI != string.Empty ) {
return m_serverURI;
} else {
return "http://" + m_externalHostName + ":" + m_httpPort + "/";
}
}
set {
if ( value.EndsWith("/") ) {
m_serverURI = value;
@@ -170,6 +176,7 @@ namespace OpenSim.Services.Interfaces
public GridRegion()
{
m_serverURI = string.Empty;
}
public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)