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

remove some code for NAT that was disabled by its author Adam Frisby since 2009, and i don't see how to mk work with current viewers at that point at least

0.9.0-post-fixes
UbitUmarov 2017-05-22 20:15:02 +01:00
parent 73222e4dd4
commit ea88927a65
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -831,12 +831,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
finalDestination.RegionName, newRegionX, newRegionY,newSizeX, newSizeY, sp.Name, Scene.Name); finalDestination.RegionName, newRegionX, newRegionY,newSizeX, newSizeY, sp.Name, Scene.Name);
//sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
#region IP Translation for NAT
IPEndPoint clientEP = sp.ControllingClient.RemoteEndPoint;
if (clientEP != null && clientEP.Address != null)
endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
#endregion
agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
} }
else else
@ -949,7 +943,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.Position = agentCircuit.startpos; agent.Position = agentCircuit.startpos;
SetCallbackURL(agent, sp.Scene.RegionInfo); SetCallbackURL(agent, sp.Scene.RegionInfo);
// We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to
// establish th econnection to the destination which makes it return true. // establish th econnection to the destination which makes it return true.
if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
@ -1742,11 +1735,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (m_eqModule != null) if (m_eqModule != null)
{ {
#region IP Translation for NAT
IPEndPoint clientEP = agent.ControllingClient.RemoteEndPoint;
if (clientEP != null && clientEP.Address != null)
endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " + m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
"and EstablishAgentCommunication with seed cap {8}", LogHeader, "and EstablishAgentCommunication with seed cap {8}", LogHeader,
source.RegionName, agent.Name, source.RegionName, agent.Name,
@ -2278,6 +2266,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
#endregion // NotFoundLocationCache class #endregion // NotFoundLocationCache class
#region getregions
private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache(); private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
@ -2395,15 +2384,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (m_eqModule != null) if (m_eqModule != null)
{ {
#region IP Translation for NAT
if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
return; return;
IPEndPoint clientEP = sp.ControllingClient.RemoteEndPoint;
if (clientEP != null && clientEP.Address != null)
endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
#endregion
m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " + m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
"and EstablishAgentCommunication with seed cap {8}", LogHeader, "and EstablishAgentCommunication with seed cap {8}", LogHeader,
scene.RegionInfo.RegionName, sp.Name, scene.RegionInfo.RegionName, sp.Name,