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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-08-19 20:25:17 +01:00
parent a1074cad5c f639a9e5ae
commit 1ab631f015
1 changed files with 28 additions and 40 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 // Check for same LAN segment
if (user.ToString().StartsWith("192.168")) foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
{ {
m_log.Info("[NetworkUtil] Private network user detected, sending '" + externalIPAddress + "' instead of '" + user + "'"); byte[] subnetBytes = subnet.Value.GetAddressBytes();
return externalIPAddress; 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 if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
// a 100% algorithmic manner of dealing with all the network setups out there. This code valid = false;
// will evolve as people bump into problems.
//// Check for same LAN segment -- I don't think we want to do this in general. Leaving it here if (valid)
//// for now as a reminder {
//foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets) m_log.Info("[NetworkUtil] Local LAN 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;
// }
// }
// 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;
// }
//}
// Otherwise, return user address // Otherwise, return user address
return user; return user;