* Added support for user/asset server keys per-region (warning: changes table layout in SQL storages)
parent
9804b0e5f3
commit
4ce4834f59
|
@ -100,6 +100,16 @@ namespace OpenGrid.Framework.Data.MySQL
|
||||||
retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
|
retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
|
||||||
retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
|
retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
|
||||||
retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
|
retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
|
||||||
|
|
||||||
|
// Assets
|
||||||
|
retval.regionAssetURI = (string)reader["regionAssetURI"];
|
||||||
|
retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
|
||||||
|
retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
|
||||||
|
|
||||||
|
// Userserver
|
||||||
|
retval.regionUserURI = (string)reader["regionUserURI"];
|
||||||
|
retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
|
||||||
|
retval.regionUserSendKey = (string)reader["regionUserSendKey"];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,14 +4,55 @@ using System.Text;
|
||||||
|
|
||||||
namespace OpenGrid.Framework.Data
|
namespace OpenGrid.Framework.Data
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// A standard grid interface
|
||||||
|
/// </summary>
|
||||||
public interface IGridData
|
public interface IGridData
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns a sim profile from a regionHandle
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="regionHandle">A 64bit Region Handle</param>
|
||||||
|
/// <returns>A simprofile</returns>
|
||||||
SimProfileData GetProfileByHandle(ulong regionHandle);
|
SimProfileData GetProfileByHandle(ulong regionHandle);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns a sim profile from a UUID
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="UUID">A 128bit UUID</param>
|
||||||
|
/// <returns>A sim profile</returns>
|
||||||
SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
|
SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Authenticates a sim by use of it's recv key.
|
||||||
|
/// WARNING: Insecure
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="UUID">The UUID sent by the sim</param>
|
||||||
|
/// <param name="regionHandle">The regionhandle sent by the sim</param>
|
||||||
|
/// <param name="simrecvkey">The recieving key sent by the sim</param>
|
||||||
|
/// <returns>Whether the sim has been authenticated</returns>
|
||||||
bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey);
|
bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initialises the interface
|
||||||
|
/// </summary>
|
||||||
void Initialise();
|
void Initialise();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Closes the interface
|
||||||
|
/// </summary>
|
||||||
void Close();
|
void Close();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The plugin being loaded
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A string containing the plugin name</returns>
|
||||||
string getName();
|
string getName();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The plugins version
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A string containing the plugin version</returns>
|
||||||
string getVersion();
|
string getVersion();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,10 +62,16 @@ namespace OpenGrid.Framework.Data
|
||||||
/// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
|
/// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
|
||||||
public string regionDataURI;
|
public string regionDataURI;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Region Asset Details
|
||||||
|
/// </summary>
|
||||||
public string regionAssetURI;
|
public string regionAssetURI;
|
||||||
public string regionAssetSendKey;
|
public string regionAssetSendKey;
|
||||||
public string regionAssetRecvKey;
|
public string regionAssetRecvKey;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Region Userserver Details
|
||||||
|
/// </summary>
|
||||||
public string regionUserURI;
|
public string regionUserURI;
|
||||||
public string regionUserSendKey;
|
public string regionUserSendKey;
|
||||||
public string regionUserRecvKey;
|
public string regionUserRecvKey;
|
||||||
|
|
Loading…
Reference in New Issue