diff options
| author | Adam Frisby | 2009-05-24 01:36:13 +0000 |
|---|---|---|
| committer | Adam Frisby | 2009-05-24 01:36:13 +0000 |
| commit | ac79ff8dc605c6b1cee4316e5648902d123206e7 (patch) | |
| tree | 2744287a26d94ab1d7e19c9bc8ed9fe158983e57 /OpenSim/Framework | |
| parent | This should make HG asset transfers work much better. It now uses HGUuidGathe... (diff) | |
| download | opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.zip opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.gz opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.bz2 opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.xz | |
* Adds NAT routing support for MXP Asset Delivery. (This means MXP should be fully NAT compatible.)
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/NetworkUtil.cs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs index 328d3bc..3ea5ac5 100644 --- a/OpenSim/Framework/NetworkUtil.cs +++ b/OpenSim/Framework/NetworkUtil.cs | |||
| @@ -31,7 +31,7 @@ namespace OpenSim.Framework | |||
| 31 | { | 31 | { |
| 32 | if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork) | 32 | if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork) |
| 33 | { | 33 | { |
| 34 | m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'"); | 34 | m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'"); |
| 35 | return host; | 35 | return host; |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| @@ -62,7 +62,7 @@ namespace OpenSim.Framework | |||
| 62 | 62 | ||
| 63 | if (valid) | 63 | if (valid) |
| 64 | { | 64 | { |
| 65 | m_log.Info("[NATROUTING] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'"); | 65 | m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'"); |
| 66 | return subnet.Key; | 66 | return subnet.Key; |
| 67 | } | 67 | } |
| 68 | } | 68 | } |
| @@ -80,7 +80,7 @@ namespace OpenSim.Framework | |||
| 80 | { | 80 | { |
| 81 | if (host.AddressFamily == AddressFamily.InterNetworkV6) | 81 | if (host.AddressFamily == AddressFamily.InterNetworkV6) |
| 82 | { | 82 | { |
| 83 | m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'"); | 83 | m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'"); |
| 84 | return host; | 84 | return host; |
| 85 | } | 85 | } |
| 86 | } | 86 | } |
| @@ -126,7 +126,7 @@ namespace OpenSim.Framework | |||
| 126 | 126 | ||
| 127 | if (valid) | 127 | if (valid) |
| 128 | { | 128 | { |
| 129 | m_log.Info("[NATROUTING] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'"); | 129 | m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'"); |
| 130 | return subnet.Key; | 130 | return subnet.Key; |
| 131 | } | 131 | } |
| 132 | } | 132 | } |
| @@ -154,10 +154,6 @@ namespace OpenSim.Framework | |||
| 154 | { | 154 | { |
| 155 | m_subnets.Add(address.Address, address.IPv4Mask); | 155 | m_subnets.Add(address.Address, address.IPv4Mask); |
| 156 | } | 156 | } |
| 157 | else | ||
| 158 | { | ||
| 159 | m_log.Warn("[NetworkUtil] Found IPv4 Address without Subnet Mask!?"); | ||
| 160 | } | ||
| 161 | } | 157 | } |
| 162 | } | 158 | } |
| 163 | } | 159 | } |