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

The protocol version checking on the grid server connector seemed to have a bug. I think I fixed it.

avinationmerge
Diva Canto 2015-10-17 19:29:20 -07:00
parent a31e5e799e
commit f7d8952946
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@ -159,7 +159,24 @@ namespace OpenSim.Server.Handlers.Grid
m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region"); m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
// Check the protocol version // Check the protocol version
if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax && versionNumberMax < ProtocolVersions.ServerProtocolVersionMax)) // This is how it works:
// Example 1:
// Client: [0 0]
// Server: [1 1]
// ==> fail
// Example 2:
// Client: [1 1]
// Server: [0 0]
// ==> fail
// Example 3:
// Client: [0 1]
// Server: [1 1]
// ==> success
// Example 4:
// Client: [1 1]
// Server: [0 1]
// ==> success
if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax || versionNumberMax < ProtocolVersions.ServerProtocolVersionMin))
{ {
// Can't do, there is no overlap in the acceptable ranges // Can't do, there is no overlap in the acceptable ranges
return FailureResult(); return FailureResult();