aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-02 18:18:13 -0800
committerDiva Canto2010-01-02 18:18:13 -0800
commit08b507517b8dc33f66de1e0815af330bb3c54696 (patch)
treefd12909bc3ff48e02f751601181be56ed38b6e3d
parent* Converters from new AvatarData to old AvatarAppearance and vice-versa (diff)
downloadopensim-SC_OLD-08b507517b8dc33f66de1e0815af330bb3c54696.zip
opensim-SC_OLD-08b507517b8dc33f66de1e0815af330bb3c54696.tar.gz
opensim-SC_OLD-08b507517b8dc33f66de1e0815af330bb3c54696.tar.bz2
opensim-SC_OLD-08b507517b8dc33f66de1e0815af330bb3c54696.tar.xz
Test client for remote presence connector, and for the service itself. Connector seems to work well.
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs2
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs6
-rw-r--r--OpenSim/Services/PresenceService/PresenceServiceBase.cs2
-rw-r--r--OpenSim/Tests/Clients/Presence/OpenSim.Server.ini33
-rw-r--r--OpenSim/Tests/Clients/Presence/PresenceClient.cs128
-rw-r--r--prebuild.xml26
6 files changed, 193 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 11adc4a..6e47b22 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -312,7 +312,7 @@ namespace OpenSim.Server.Handlers.Presence
312 Vector3 position = new Vector3(128, 128, 70); 312 Vector3 position = new Vector3(128, 128, 70);
313 Vector3 look = Vector3.Zero; 313 Vector3 look = Vector3.Zero;
314 314
315 if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID")) 315 if (!request.ContainsKey("UserID") || !request.ContainsKey("RegionID"))
316 return FailureResult(); 316 return FailureResult();
317 317
318 string user = request["UserID"].ToString(); 318 string user = request["UserID"].ToString();
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 7da0f23..2884199 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -82,6 +82,8 @@ namespace OpenSim.Services.PresenceService
82 82
83 m_Database.Store(data); 83 m_Database.Store(data);
84 84
85 m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent {0} with session {1} and ssession {2}",
86 userID, sessionID, secureSessionID);
85 return true; 87 return true;
86 } 88 }
87 89
@@ -93,7 +95,7 @@ namespace OpenSim.Services.PresenceService
93 95
94 PresenceData[] d = m_Database.Get("UserID", data.UserID); 96 PresenceData[] d = m_Database.Get("UserID", data.UserID);
95 97
96 m_log.WarnFormat("[PRESENCE SERVICE]: LogoutAgent {0} with {1} sessions currently present", data.UserID, d.Length); 98 m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent {0} with {1} sessions currently present", data.UserID, d.Length);
97 if (d.Length > 1) 99 if (d.Length > 1)
98 { 100 {
99 m_Database.Delete("UserID", data.UserID); 101 m_Database.Delete("UserID", data.UserID);
@@ -117,7 +119,7 @@ namespace OpenSim.Services.PresenceService
117 119
118 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) 120 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
119 { 121 {
120 m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); 122 //m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
121 try 123 try
122 { 124 {
123 PresenceData pdata = m_Database.Get(sessionID); 125 PresenceData pdata = m_Database.Get(sessionID);
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
index 3ca70c1..86fd103 100644
--- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs
+++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Services.PresenceService
77 77
78 m_Database = LoadPlugin<IPresenceData>(dllName, new Object[] { connString, realm }); 78 m_Database = LoadPlugin<IPresenceData>(dllName, new Object[] { connString, realm });
79 if (m_Database == null) 79 if (m_Database == null)
80 throw new Exception("Could not find a storage interface in the given module"); 80 throw new Exception("Could not find a storage interface in the given module " + dllName);
81 81
82 } 82 }
83 } 83 }
diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
new file mode 100644
index 0000000..47e73f9
--- /dev/null
+++ b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
@@ -0,0 +1,33 @@
1; * Run a ROBUST server shell like this, from bin:
2; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
3; *
4; * Then run this client like this, from bin:
5; * $ OpenSim.Tests.Clients.PresenceClient.exe
6; *
7; *
8
9[Startup]
10ServiceConnectors = "OpenSim.Server.Handlers.dll:PresenceServiceConnector"
11
12; * This is common for all services, it's the network setup for the entire
13; * server instance
14; *
15[Network]
16port = 8003
17
18; * The following are for the remote console
19; * They have no effect for the local or basic console types
20; * Leave commented to diable logins to the console
21;ConsoleUser = Test
22;ConsolePass = secret
23
24; * As an example, the below configuration precisely mimicks the legacy
25; * asset server. It is read by the asset IN connector (defined above)
26; * and it then loads the OUT connector (a local database module). That,
27; * in turn, reads the asset loader and database connection information
28; *
29[PresenceService]
30 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
31 StorageProvider = "OpenSim.Data.MySQL.dll"
32 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
33
diff --git a/OpenSim/Tests/Clients/Presence/PresenceClient.cs b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
new file mode 100644
index 0000000..3416804
--- /dev/null
+++ b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
@@ -0,0 +1,128 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Reflection;
32
33using OpenMetaverse;
34using log4net;
35using log4net.Appender;
36using log4net.Layout;
37
38using OpenSim.Framework;
39using OpenSim.Services.Interfaces;
40using OpenSim.Services.Connectors;
41
42namespace OpenSim.Tests.Clients.PresenceClient
43{
44 public class PresenceClient
45 {
46 private static readonly ILog m_log =
47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType);
49
50 public static void Main(string[] args)
51 {
52 ConsoleAppender consoleAppender = new ConsoleAppender();
53 consoleAppender.Layout =
54 new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
55 log4net.Config.BasicConfigurator.Configure(consoleAppender);
56
57 string serverURI = "http://127.0.0.1:8003";
58 PresenceServicesConnector m_Connector = new PresenceServicesConnector(serverURI);
59
60 UUID user1 = UUID.Random();
61 UUID session1 = UUID.Random();
62 UUID region1 = UUID.Random();
63
64 bool success = m_Connector.LoginAgent(user1.ToString(), session1, UUID.Zero);
65 if (success)
66 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged in user {0} with session {1}", user1, session1);
67 else
68 m_log.InfoFormat("[PRESENCE CLIENT]: failed to login user {0}", user1);
69
70 System.Console.WriteLine("\n");
71
72 PresenceInfo pinfo = m_Connector.GetAgent(session1);
73 if (pinfo == null)
74 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0}", user1);
75 else
76 m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
77 pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
78
79 System.Console.WriteLine("\n");
80 success = m_Connector.ReportAgent(session1, region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
81 if (success)
82 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully reported session {0} in region {1}", user1, region1);
83 else
84 m_log.InfoFormat("[PRESENCE CLIENT]: failed to report session {0}", session1);
85 pinfo = m_Connector.GetAgent(session1);
86 if (pinfo == null)
87 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for second time", user1);
88 else
89 m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
90 pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
91
92 System.Console.WriteLine("\n");
93 success = m_Connector.SetHomeLocation(user1.ToString(), region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
94 if (success)
95 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully set home for user {0} in region {1}", user1, region1);
96 else
97 m_log.InfoFormat("[PRESENCE CLIENT]: failed to set home for user {0}", user1);
98 pinfo = m_Connector.GetAgent(session1);
99 if (pinfo == null)
100 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for third time", user1);
101 else
102 m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
103 pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
104
105 System.Console.WriteLine("\n");
106 success = m_Connector.LogoutAgent(session1);
107 if (success)
108 m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged out user {0}", user1);
109 else
110 m_log.InfoFormat("[PRESENCE CLIENT]: failed to logout user {0}", user1);
111 pinfo = m_Connector.GetAgent(session1);
112 if (pinfo == null)
113 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for fourth time", user1);
114 else
115 m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
116 pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
117
118 System.Console.WriteLine("\n");
119 success = m_Connector.ReportAgent(session1, UUID.Random(), Vector3.Zero, Vector3.Zero);
120 if (success)
121 m_log.InfoFormat("[PRESENCE CLIENT]: Report agent succeeded, but this is wrong");
122 else
123 m_log.InfoFormat("[PRESENCE CLIENT]: failed to report agent, as it should because user is not logged in");
124
125 }
126
127 }
128}
diff --git a/prebuild.xml b/prebuild.xml
index f5092da..48055a0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2975,6 +2975,32 @@
2975 </Files> 2975 </Files>
2976 </Project> 2976 </Project>
2977 2977
2978 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe">
2979 <Configuration name="Debug">
2980 <Options>
2981 <OutputPath>../../../../bin/</OutputPath>
2982 </Options>
2983 </Configuration>
2984 <Configuration name="Release">
2985 <Options>
2986 <OutputPath>../../../../bin/</OutputPath>
2987 </Options>
2988 </Configuration>
2989
2990 <ReferencePath>../../../../bin/</ReferencePath>
2991 <Reference name="System"/>
2992 <Reference name="OpenMetaverseTypes.dll"/>
2993 <Reference name="OpenMetaverse.dll"/>
2994 <Reference name="OpenSim.Framework"/>
2995 <Reference name="OpenSim.Services.Interfaces" />
2996 <Reference name="OpenSim.Services.Connectors" />
2997 <Reference name="Nini.dll" />
2998 <Reference name="log4net.dll"/>
2999
3000 <Files>
3001 <Match pattern="*.cs" recurse="true"/>
3002 </Files>
3003 </Project>
2978 3004
2979 <!-- Test assemblies --> 3005 <!-- Test assemblies -->
2980 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> 3006 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">