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

Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." 

Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.

This reverts commit e47608fc62.
prebuild-update
Diva Canto 2010-08-19 09:14:20 -07:00
parent ee7c799699
commit 2b172bef72
3 changed files with 355 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
OpenSim/Framework/NetworkUtil.cs
View File

@ -274,48 +274,36 @@ namespace OpenSim.Framework
}
}
// Check for private networks
if (user.ToString().StartsWith("192.168"))
// Check for same LAN segment
foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
{
m_log.Info("[NetworkUtil] Private network user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
return externalIPAddress;
byte[] subnetBytes = subnet.Value.GetAddressBytes();
byte[] localBytes = subnet.Key.GetAddressBytes();
byte[] destBytes = user.GetAddressBytes();
if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
return user;
bool valid = true;
for (int i = 0; i < subnetBytes.Length; i++)
{
if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
{
valid = false;
break;
}
}
// We may need to do more fancy configuration-based checks... I'm not entirely sure there is
// a 100% algorithmic manner of dealing with all the network setups out there. This code
// will evolve as people bump into problems.
if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
valid = false;
//// Check for same LAN segment -- I don't think we want to do this in general. Leaving it here
//// for now as a reminder
//foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
//{
// byte[] subnetBytes = subnet.Value.GetAddressBytes();
// byte[] localBytes = subnet.Key.GetAddressBytes();
// byte[] destBytes = user.GetAddressBytes();
// if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
// return user;
// bool valid = true;
// for (int i = 0; i < subnetBytes.Length; i++)
// {
// if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
// {
// valid = false;
// break;
// }
// }
// if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
// valid = false;
// if (valid)
// {
// m_log.Info("[NetworkUtil] Local LAN user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
// return externalIPAddress;
// }
//}
if (valid)
{
m_log.Info("[NetworkUtil] Local LAN user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
return externalIPAddress;
}
}
// Otherwise, return user address
return user;