aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2017-05-22 20:15:02 +0100
committerUbitUmarov2017-05-22 20:18:01 +0100
commitea88927a65c54cf06c347c5f107deb4fcf45929d (patch)
treeeb9daccb1fb0f6063a7c2f7d80403c43612726d3 /OpenSim/Region/CoreModules
parent fix IClientIPEndpoint broken by justin long ago.. but stop using it (diff)
downloadopensim-SC_OLD-ea88927a65c54cf06c347c5f107deb4fcf45929d.zip
opensim-SC_OLD-ea88927a65c54cf06c347c5f107deb4fcf45929d.tar.gz
opensim-SC_OLD-ea88927a65c54cf06c347c5f107deb4fcf45929d.tar.bz2
opensim-SC_OLD-ea88927a65c54cf06c347c5f107deb4fcf45929d.tar.xz
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
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs19
1 files changed, 1 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3564f7f..4b846f5 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -831,12 +831,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
831 finalDestination.RegionName, newRegionX, newRegionY,newSizeX, newSizeY, sp.Name, Scene.Name); 831 finalDestination.RegionName, newRegionX, newRegionY,newSizeX, newSizeY, sp.Name, Scene.Name);
832 832
833 //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); 833 //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
834 #region IP Translation for NAT
835 IPEndPoint clientEP = sp.ControllingClient.RemoteEndPoint;
836 if (clientEP != null && clientEP.Address != null)
837 endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
838
839 #endregion
840 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); 834 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
841 } 835 }
842 else 836 else
@@ -949,7 +943,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
949 agent.Position = agentCircuit.startpos; 943 agent.Position = agentCircuit.startpos;
950 SetCallbackURL(agent, sp.Scene.RegionInfo); 944 SetCallbackURL(agent, sp.Scene.RegionInfo);
951 945
952
953 // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to 946 // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to
954 // establish th econnection to the destination which makes it return true. 947 // establish th econnection to the destination which makes it return true.
955 if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) 948 if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
@@ -1742,11 +1735,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1742 1735
1743 if (m_eqModule != null) 1736 if (m_eqModule != null)
1744 { 1737 {
1745 #region IP Translation for NAT
1746 IPEndPoint clientEP = agent.ControllingClient.RemoteEndPoint;
1747 if (clientEP != null && clientEP.Address != null)
1748 endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
1749
1750 m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " + 1738 m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
1751 "and EstablishAgentCommunication with seed cap {8}", LogHeader, 1739 "and EstablishAgentCommunication with seed cap {8}", LogHeader,
1752 source.RegionName, agent.Name, 1740 source.RegionName, agent.Name,
@@ -2278,6 +2266,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2278 } 2266 }
2279 2267
2280 #endregion // NotFoundLocationCache class 2268 #endregion // NotFoundLocationCache class
2269 #region getregions
2281 private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache(); 2270 private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
2282 2271
2283 protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py) 2272 protected GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
@@ -2395,15 +2384,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2395 2384
2396 if (m_eqModule != null) 2385 if (m_eqModule != null)
2397 { 2386 {
2398 #region IP Translation for NAT
2399 if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened 2387 if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
2400 return; 2388 return;
2401 2389
2402 IPEndPoint clientEP = sp.ControllingClient.RemoteEndPoint;
2403 if (clientEP != null && clientEP.Address != null)
2404 endPoint.Address = NetworkUtil.GetIPFor(clientEP.Address, endPoint.Address);
2405 #endregion
2406
2407 m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " + 2390 m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
2408 "and EstablishAgentCommunication with seed cap {8}", LogHeader, 2391 "and EstablishAgentCommunication with seed cap {8}", LogHeader,
2409 scene.RegionInfo.RegionName, sp.Name, 2392 scene.RegionInfo.RegionName, sp.Name,