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

* Disabled NAT translation support for a little while.

0.6.6-post-fixes
Adam Frisby 2009-05-25 01:12:28 +00:00
parent 4e64bf9360
commit 9023b93e2f
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Framework/NetworkUtil.cs
View File

@ -21,11 +21,22 @@ namespace OpenSim.Framework
// Logger // Logger
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool m_disabled = true;
public static bool Enabled
{
set { m_disabled = value; }
get { return m_disabled; }
}
// IPv4Address, Subnet // IPv4Address, Subnet
static readonly Dictionary<IPAddress,IPAddress> m_subnets = new Dictionary<IPAddress, IPAddress>(); static readonly Dictionary<IPAddress,IPAddress> m_subnets = new Dictionary<IPAddress, IPAddress>();
public static IPAddress GetIPFor(IPAddress user, IPAddress simulator) public static IPAddress GetIPFor(IPAddress user, IPAddress simulator)
{ {
if(m_disabled)
return simulator;
// Check if we're accessing localhost. // Check if we're accessing localhost.
foreach (IPAddress host in Dns.GetHostAddresses(Dns.GetHostName())) foreach (IPAddress host in Dns.GetHostAddresses(Dns.GetHostName()))
{ {
@ -168,10 +179,13 @@ namespace OpenSim.Framework
public static IPAddress GetIPFor(IPEndPoint user, string defaultHostname) public static IPAddress GetIPFor(IPEndPoint user, string defaultHostname)
{ {
// Try subnet matching if (!m_disabled)
IPAddress rtn = GetExternalIPFor(user.Address, defaultHostname); {
if (rtn != null) // Try subnet matching
return rtn; IPAddress rtn = GetExternalIPFor(user.Address, defaultHostname);
if (rtn != null)
return rtn;
}
// Otherwise use the old algorithm // Otherwise use the old algorithm
IPAddress ia; IPAddress ia;
@ -195,10 +209,12 @@ namespace OpenSim.Framework
public static string GetHostFor(IPAddress user, string defaultHostname) public static string GetHostFor(IPAddress user, string defaultHostname)
{ {
IPAddress rtn = GetExternalIPFor(user, defaultHostname); if (!m_disabled)
if(rtn != null) {
return rtn.ToString(); IPAddress rtn = GetExternalIPFor(user, defaultHostname);
if (rtn != null)
return rtn.ToString();
}
return defaultHostname; return defaultHostname;
} }
} }