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

Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle

0.6.9-post-fixes
Justin Clark-Casey (justincc) 2010-11-20 02:02:22 +00:00
parent aa8e7ae68b
commit 21bb27193a
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -52,6 +52,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// The maximum major version of OAR that we can read. Minor versions shouldn't need a number since version
/// bumps here should be compatible.
/// </summary>
public static int MAX_MAJOR_VERSION = 0;
private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
private static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); private static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
@ -556,6 +562,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{ {
if (xtr.NodeType == XmlNodeType.Element) if (xtr.NodeType == XmlNodeType.Element)
{ {
if (xtr.Name.ToString() == "archive")
{
int majorVersion = int.Parse(xtr["major_version"]);
int minorVersion = int.Parse(xtr["minor_version"]);
string version = string.Format("{0}.{1}", majorVersion, minorVersion);
if (majorVersion > MAX_MAJOR_VERSION)
{
throw new Exception(
string.Format(
"The OAR you are trying to load has major version number of {0} but this version of OpenSim can only load OARs with major version number {1} and below",
majorVersion, MAX_MAJOR_VERSION));
}
m_log.InfoFormat("[ARCHIVER]: Loading OAR with version {0}", version);
}
if (xtr.Name.ToString() == "datetime") if (xtr.Name.ToString() == "datetime")
{ {
int value; int value;