diff options
author | Adam Frisby | 2007-05-04 07:01:37 +0000 |
---|---|---|
committer | Adam Frisby | 2007-05-04 07:01:37 +0000 |
commit | 4ce4834f5947350da0739c83f7e74015c103dc2c (patch) | |
tree | fe1a3c5ab0c0ffa045ddb40d2b34c7686a44692f | |
parent | * Deleted old sim profiles (diff) | |
download | opensim-SC-4ce4834f5947350da0739c83f7e74015c103dc2c.zip opensim-SC-4ce4834f5947350da0739c83f7e74015c103dc2c.tar.gz opensim-SC-4ce4834f5947350da0739c83f7e74015c103dc2c.tar.bz2 opensim-SC-4ce4834f5947350da0739c83f7e74015c103dc2c.tar.xz |
* Added support for user/asset server keys per-region (warning: changes table layout in SQL storages)
Diffstat (limited to '')
-rw-r--r-- | OpenGrid.Framework.Data.MySQL/MySQLManager.cs | 10 | ||||
-rw-r--r-- | OpenGrid.Framework.Data/GridData.cs | 41 | ||||
-rw-r--r-- | OpenGrid.Framework.Data/SimProfileData.cs | 6 |
3 files changed, 57 insertions, 0 deletions
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs index 0147b5b..057cd42 100644 --- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs +++ b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs | |||
@@ -100,6 +100,16 @@ namespace OpenGrid.Framework.Data.MySQL | |||
100 | retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"]; | 100 | retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"]; |
101 | retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"]; | 101 | retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"]; |
102 | retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"]; | 102 | retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"]; |
103 | |||
104 | // Assets | ||
105 | retval.regionAssetURI = (string)reader["regionAssetURI"]; | ||
106 | retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"]; | ||
107 | retval.regionAssetSendKey = (string)reader["regionAssetSendKey"]; | ||
108 | |||
109 | // Userserver | ||
110 | retval.regionUserURI = (string)reader["regionUserURI"]; | ||
111 | retval.regionUserRecvKey = (string)reader["regionUserRecvKey"]; | ||
112 | retval.regionUserSendKey = (string)reader["regionUserSendKey"]; | ||
103 | } | 113 | } |
104 | else | 114 | else |
105 | { | 115 | { |
diff --git a/OpenGrid.Framework.Data/GridData.cs b/OpenGrid.Framework.Data/GridData.cs index d6b5a2b..3b052fb 100644 --- a/OpenGrid.Framework.Data/GridData.cs +++ b/OpenGrid.Framework.Data/GridData.cs | |||
@@ -4,14 +4,55 @@ using System.Text; | |||
4 | 4 | ||
5 | namespace OpenGrid.Framework.Data | 5 | namespace OpenGrid.Framework.Data |
6 | { | 6 | { |
7 | /// <summary> | ||
8 | /// A standard grid interface | ||
9 | /// </summary> | ||
7 | public interface IGridData | 10 | public interface IGridData |
8 | { | 11 | { |
12 | /// <summary> | ||
13 | /// Returns a sim profile from a regionHandle | ||
14 | /// </summary> | ||
15 | /// <param name="regionHandle">A 64bit Region Handle</param> | ||
16 | /// <returns>A simprofile</returns> | ||
9 | SimProfileData GetProfileByHandle(ulong regionHandle); | 17 | SimProfileData GetProfileByHandle(ulong regionHandle); |
18 | |||
19 | /// <summary> | ||
20 | /// Returns a sim profile from a UUID | ||
21 | /// </summary> | ||
22 | /// <param name="UUID">A 128bit UUID</param> | ||
23 | /// <returns>A sim profile</returns> | ||
10 | SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID); | 24 | SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID); |
25 | |||
26 | /// <summary> | ||
27 | /// Authenticates a sim by use of it's recv key. | ||
28 | /// WARNING: Insecure | ||
29 | /// </summary> | ||
30 | /// <param name="UUID">The UUID sent by the sim</param> | ||
31 | /// <param name="regionHandle">The regionhandle sent by the sim</param> | ||
32 | /// <param name="simrecvkey">The recieving key sent by the sim</param> | ||
33 | /// <returns>Whether the sim has been authenticated</returns> | ||
11 | bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey); | 34 | bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey); |
35 | |||
36 | /// <summary> | ||
37 | /// Initialises the interface | ||
38 | /// </summary> | ||
12 | void Initialise(); | 39 | void Initialise(); |
40 | |||
41 | /// <summary> | ||
42 | /// Closes the interface | ||
43 | /// </summary> | ||
13 | void Close(); | 44 | void Close(); |
45 | |||
46 | /// <summary> | ||
47 | /// The plugin being loaded | ||
48 | /// </summary> | ||
49 | /// <returns>A string containing the plugin name</returns> | ||
14 | string getName(); | 50 | string getName(); |
51 | |||
52 | /// <summary> | ||
53 | /// The plugins version | ||
54 | /// </summary> | ||
55 | /// <returns>A string containing the plugin version</returns> | ||
15 | string getVersion(); | 56 | string getVersion(); |
16 | } | 57 | } |
17 | } | 58 | } |
diff --git a/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGrid.Framework.Data/SimProfileData.cs index 4cc9982..d5a5392 100644 --- a/OpenGrid.Framework.Data/SimProfileData.cs +++ b/OpenGrid.Framework.Data/SimProfileData.cs | |||
@@ -62,10 +62,16 @@ namespace OpenGrid.Framework.Data | |||
62 | /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> | 62 | /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> |
63 | public string regionDataURI; | 63 | public string regionDataURI; |
64 | 64 | ||
65 | /// <summary> | ||
66 | /// Region Asset Details | ||
67 | /// </summary> | ||
65 | public string regionAssetURI; | 68 | public string regionAssetURI; |
66 | public string regionAssetSendKey; | 69 | public string regionAssetSendKey; |
67 | public string regionAssetRecvKey; | 70 | public string regionAssetRecvKey; |
68 | 71 | ||
72 | /// <summary> | ||
73 | /// Region Userserver Details | ||
74 | /// </summary> | ||
69 | public string regionUserURI; | 75 | public string regionUserURI; |
70 | public string regionUserSendKey; | 76 | public string regionUserSendKey; |
71 | public string regionUserRecvKey; | 77 | public string regionUserRecvKey; |