diff options
author | Jeff Ames | 2009-06-22 10:07:27 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-22 10:07:27 +0000 |
commit | 142b481e032f7b8206a19e78af82847370b8bf9c (patch) | |
tree | 56fdf67bdc78d29214e2ea4742ffb7abcd36d212 /OpenSim/Framework/Capabilities/LLSDStreamHandler.cs | |
parent | * Panda no like LongRunningAttribute, no? Me now reverting minuscule fix, yes... (diff) | |
download | opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.zip opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.gz opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.bz2 opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.xz |
Update svn properties.
Diffstat (limited to 'OpenSim/Framework/Capabilities/LLSDStreamHandler.cs')
-rw-r--r-- | OpenSim/Framework/Capabilities/LLSDStreamHandler.cs | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs index 0ced4d7..df48b35 100644 --- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs | |||
@@ -1,70 +1,70 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections; | 28 | using System.Collections; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
32 | using OpenSim.Framework.Servers.HttpServer; | 32 | using OpenSim.Framework.Servers.HttpServer; |
33 | 33 | ||
34 | namespace OpenSim.Framework.Capabilities | 34 | namespace OpenSim.Framework.Capabilities |
35 | { | 35 | { |
36 | public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler | 36 | public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler |
37 | where TRequest : new() | 37 | where TRequest : new() |
38 | { | 38 | { |
39 | private LLSDMethod<TRequest, TResponse> m_method; | 39 | private LLSDMethod<TRequest, TResponse> m_method; |
40 | 40 | ||
41 | public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method) | 41 | public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method) |
42 | : base(httpMethod, path) | 42 | : base(httpMethod, path) |
43 | { | 43 | { |
44 | m_method = method; | 44 | m_method = method; |
45 | } | 45 | } |
46 | 46 | ||
47 | public override byte[] Handle(string path, Stream request, | 47 | public override byte[] Handle(string path, Stream request, |
48 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 48 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
49 | { | 49 | { |
50 | //Encoding encoding = Encoding.UTF8; | 50 | //Encoding encoding = Encoding.UTF8; |
51 | //StreamReader streamReader = new StreamReader(request, false); | 51 | //StreamReader streamReader = new StreamReader(request, false); |
52 | 52 | ||
53 | //string requestBody = streamReader.ReadToEnd(); | 53 | //string requestBody = streamReader.ReadToEnd(); |
54 | //streamReader.Close(); | 54 | //streamReader.Close(); |
55 | 55 | ||
56 | // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap) | 56 | // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap) |
57 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); | 57 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); |
58 | 58 | ||
59 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); | 59 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); |
60 | TRequest llsdRequest = new TRequest(); | 60 | TRequest llsdRequest = new TRequest(); |
61 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); | 61 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); |
62 | 62 | ||
63 | TResponse response = m_method(llsdRequest); | 63 | TResponse response = m_method(llsdRequest); |
64 | 64 | ||
65 | Encoding encoding = new UTF8Encoding(false); | 65 | Encoding encoding = new UTF8Encoding(false); |
66 | 66 | ||
67 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); | 67 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | } | 70 | } |