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

Slight improvement on previous commit.

0.7.0.1-release
Diva Canto 2010-07-30 14:27:53 -07:00
parent 4a7588b0f0
commit 44332d145a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/NetworkUtil.cs
View File

@ -188,7 +188,11 @@ namespace OpenSim.Framework
try try
{ {
externalIPAddress = GetExternalIP(); externalIPAddress = GetExternalIP();
}
catch { /* ignore */ }
try
{
foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces()) foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces())
{ {
foreach (UnicastIPAddressInformation address in ni.GetIPProperties().UnicastAddresses) foreach (UnicastIPAddressInformation address in ni.GetIPProperties().UnicastAddresses)
@ -252,6 +256,14 @@ namespace OpenSim.Framework
public static IPAddress GetExternalIPOf(IPAddress user) public static IPAddress GetExternalIPOf(IPAddress user)
{ {
if (externalIPAddress == null)
return user;
if (user.ToString() == "127.0.0.1")
{
m_log.Info("[NetworkUtil] 127.0.0.1 user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
return externalIPAddress;
}
// 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()))
{ {
@ -309,8 +321,8 @@ namespace OpenSim.Framework
} }
catch (WebException we) catch (WebException we)
{ {
// do something with exception
m_log.Info("[NetworkUtil]: Exception in GetExternalIP: " + we.ToString()); m_log.Info("[NetworkUtil]: Exception in GetExternalIP: " + we.ToString());
return null;
} }
IPAddress externalIp = IPAddress.Parse(requestHtml); IPAddress externalIp = IPAddress.Parse(requestHtml);