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

* Adds NAT routing support for MXP Asset Delivery. (This means MXP should be fully NAT compatible.)

0.6.6-post-fixes
Adam Frisby 2009-05-24 01:36:13 +00:00
parent fb6d314d4d
commit ac79ff8dc6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
View File

@ -454,7 +454,14 @@ namespace OpenSim.Client.MXP.PacketHandler
joinResponseMessage.BubbleId = joinRequestMessage.BubbleId; joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
joinResponseMessage.ParticipantId = userId.Guid; joinResponseMessage.ParticipantId = userId.Guid;
joinResponseMessage.AvatarId = userId.Guid; joinResponseMessage.AvatarId = userId.Guid;
joinResponseMessage.BubbleAssetCacheUrl = "http://"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.ExternalHostName+":"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.HttpPort+"/assets/"; joinResponseMessage.BubbleAssetCacheUrl = "http://" +
NetworkUtil.GetHostFor(session.RemoteEndPoint.Address,
m_scenes[
new UUID(joinRequestMessage.BubbleId)].
RegionInfo.
ExternalHostName) + ":" +
m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.
HttpPort + "/assets/";
joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName; joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;

12
OpenSim/Framework/NetworkUtil.cs
View File

@ -31,7 +31,7 @@ namespace OpenSim.Framework
{ {
if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork) if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork)
{ {
m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'"); m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'");
return host; return host;
} }
} }
@ -62,7 +62,7 @@ namespace OpenSim.Framework
if (valid) if (valid)
{ {
m_log.Info("[NATROUTING] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'"); m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'");
return subnet.Key; return subnet.Key;
} }
} }
@ -80,7 +80,7 @@ namespace OpenSim.Framework
{ {
if (host.AddressFamily == AddressFamily.InterNetworkV6) if (host.AddressFamily == AddressFamily.InterNetworkV6)
{ {
m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'"); m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'");
return host; return host;
} }
} }
@ -126,7 +126,7 @@ namespace OpenSim.Framework
if (valid) if (valid)
{ {
m_log.Info("[NATROUTING] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'"); m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'");
return subnet.Key; return subnet.Key;
} }
} }
@ -154,10 +154,6 @@ namespace OpenSim.Framework
{ {
m_subnets.Add(address.Address, address.IPv4Mask); m_subnets.Add(address.Address, address.IPv4Mask);
} }
else
{
m_log.Warn("[NetworkUtil] Found IPv4 Address without Subnet Mask!?");
}
} }
} }
} }