From ea88927a65c54cf06c347c5f107deb4fcf45929d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 22 May 2017 20:15:02 +0100
Subject: 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

---
 .../Framework/EntityTransfer/EntityTransferModule.cs  | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

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
                     finalDestination.RegionName, newRegionX, newRegionY,newSizeX, newSizeY, sp.Name, Scene.Name);
 
                 //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();
             }
             else
@@ -949,7 +943,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             agent.Position = agentCircuit.startpos;
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
-
             // 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.
             if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
@@ -1742,11 +1735,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 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}>) " +
                         "and EstablishAgentCommunication with seed cap {8}", LogHeader,
                         source.RegionName, agent.Name,
@@ -2278,6 +2266,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         }
 
         #endregion // NotFoundLocationCache class
+        #region getregions
         private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
 
         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)
                     {
-                        #region IP Translation for NAT
                         if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened
                             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}>) " +
                             "and EstablishAgentCommunication with seed cap {8}", LogHeader,
                             scene.RegionInfo.RegionName, sp.Name,
-- 
cgit v1.1