diff options
author | Melanie Thielker | 2016-12-13 19:47:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-13 19:47:26 +0000 |
commit | 69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3 (patch) | |
tree | 1db4aedc7bda9ce15f5be133c3514517ca0f312b /OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |
parent | Make sure sims on Linux can be restarted without waiting on a 2 mintue socket... (diff) | |
download | opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.zip opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.gz opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.bz2 opensim-SC_OLD-69776aa70ce662ccd0ad3d9f2ecefb86671bbcb3.tar.xz |
Remove the AllowAlternatePorts option. It wasn't implemented anyway.
Instead, handle the port being 0 as "any port" and assign a random
port for regions in that case.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index fffd02c..831381e 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |||
@@ -107,6 +107,11 @@ namespace OpenMetaverse | |||
107 | /// </summary> | 107 | /// </summary> |
108 | public float AverageReceiveTicksForLastSamplePeriod { get; private set; } | 108 | public float AverageReceiveTicksForLastSamplePeriod { get; private set; } |
109 | 109 | ||
110 | public int Port | ||
111 | { | ||
112 | get { return m_udpPort; } | ||
113 | } | ||
114 | |||
110 | #region PacketDropDebugging | 115 | #region PacketDropDebugging |
111 | /// <summary> | 116 | /// <summary> |
112 | /// For debugging purposes only... random number generator for dropping | 117 | /// For debugging purposes only... random number generator for dropping |
@@ -257,6 +262,9 @@ namespace OpenMetaverse | |||
257 | 262 | ||
258 | m_udpSocket.Bind(ipep); | 263 | m_udpSocket.Bind(ipep); |
259 | 264 | ||
265 | if (m_udpPort == 0) | ||
266 | m_udpPort = ((IPEndPoint)m_udpSocket.LocalEndPoint).Port; | ||
267 | |||
260 | IsRunningInbound = true; | 268 | IsRunningInbound = true; |
261 | 269 | ||
262 | // kick off an async receive. The Start() method will return, the | 270 | // kick off an async receive. The Start() method will return, the |