diff options
author | Melanie | 2009-08-04 04:11:04 +0100 |
---|---|---|
committer | Melanie | 2009-08-04 04:11:04 +0100 |
commit | 0f400dc83d2921f796c2908043a19ea2e4632c83 (patch) | |
tree | 71a52c59292dac98a1a752eb373ec0ff49e7a8fd | |
parent | Add plumbing for the SceneObjectDeleter to wait for the script engine to (diff) | |
download | opensim-SC-0f400dc83d2921f796c2908043a19ea2e4632c83.zip opensim-SC-0f400dc83d2921f796c2908043a19ea2e4632c83.tar.gz opensim-SC-0f400dc83d2921f796c2908043a19ea2e4632c83.tar.bz2 opensim-SC-0f400dc83d2921f796c2908043a19ea2e4632c83.tar.xz |
Adding the plumbing for a ROBUST freeswitch service
-rw-r--r-- | OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs | 61 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs | 72 | ||||
-rw-r--r-- | OpenSim/Services/FreeswitchService/FreeswitchService.cs | 53 | ||||
-rw-r--r-- | OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs | 51 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IFreeswitchService.cs | 37 | ||||
-rw-r--r-- | prebuild.xml | 31 |
6 files changed, 305 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs new file mode 100644 index 0000000..a4ab0d3 --- /dev/null +++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs | |||
@@ -0,0 +1,61 @@ | |||
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 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using OpenSim.Server.Base; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Server.Handlers.Base; | ||
34 | |||
35 | namespace OpenSim.Server.Handlers.Freeswitch | ||
36 | { | ||
37 | public class FreeswitchServerConnector : ServiceConnector | ||
38 | { | ||
39 | private IFreeswitchService m_FreeswitchService; | ||
40 | |||
41 | public FreeswitchServerConnector(IConfigSource config, IHttpServer server) : | ||
42 | base(config, server) | ||
43 | { | ||
44 | IConfig serverConfig = config.Configs["FreeswitchService"]; | ||
45 | if (serverConfig == null) | ||
46 | throw new Exception("No section 'Server' in config file"); | ||
47 | |||
48 | string freeswitchService = serverConfig.GetString("LocalServiceModule", | ||
49 | String.Empty); | ||
50 | |||
51 | if (freeswitchService == String.Empty) | ||
52 | throw new Exception("No FreeswitchService in config file"); | ||
53 | |||
54 | Object[] args = new Object[] { config }; | ||
55 | m_FreeswitchService = | ||
56 | ServerUtils.LoadPlugin<IFreeswitchService>(freeswitchService, args); | ||
57 | |||
58 | server.AddStreamHandler(new FreeswitchServerGetHandler(m_FreeswitchService)); | ||
59 | } | ||
60 | } | ||
61 | } | ||
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs new file mode 100644 index 0000000..c2a64b8 --- /dev/null +++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs | |||
@@ -0,0 +1,72 @@ | |||
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 | |||
28 | using Nini.Config; | ||
29 | using log4net; | ||
30 | using System; | ||
31 | using System.IO; | ||
32 | using System.Reflection; | ||
33 | using System.Net; | ||
34 | using System.Text; | ||
35 | using System.Text.RegularExpressions; | ||
36 | using System.Xml; | ||
37 | using System.Xml.Serialization; | ||
38 | using OpenSim.Server.Base; | ||
39 | using OpenSim.Services.Interfaces; | ||
40 | using OpenSim.Framework; | ||
41 | using OpenSim.Framework.Servers.HttpServer; | ||
42 | |||
43 | namespace OpenSim.Server.Handlers.Freeswitch | ||
44 | { | ||
45 | public class FreeswitchServerGetHandler : BaseStreamHandler | ||
46 | { | ||
47 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
49 | private IFreeswitchService m_FreeswitchService; | ||
50 | |||
51 | public FreeswitchServerGetHandler(IFreeswitchService service) : | ||
52 | base("GET", "/api") | ||
53 | { | ||
54 | m_FreeswitchService = service; | ||
55 | } | ||
56 | |||
57 | public override byte[] Handle(string path, Stream request, | ||
58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
59 | { | ||
60 | byte[] result = new byte[0]; | ||
61 | |||
62 | string[] p = SplitParams(path); | ||
63 | |||
64 | if (p.Length == 0) | ||
65 | return result; | ||
66 | |||
67 | // Process web request | ||
68 | |||
69 | return result; | ||
70 | } | ||
71 | } | ||
72 | } | ||
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs new file mode 100644 index 0000000..84674ec --- /dev/null +++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs | |||
@@ -0,0 +1,53 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using Nini.Config; | ||
31 | using log4net; | ||
32 | using OpenSim.Framework; | ||
33 | using OpenSim.Data; | ||
34 | using OpenSim.Services.Interfaces; | ||
35 | using OpenMetaverse; | ||
36 | |||
37 | namespace OpenSim.Services.FreeswitchService | ||
38 | { | ||
39 | public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService | ||
40 | { | ||
41 | private static readonly ILog m_log = | ||
42 | LogManager.GetLogger( | ||
43 | MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
45 | public FreeswitchService(IConfigSource config) : base(config) | ||
46 | { | ||
47 | // Perform initilialization here | ||
48 | } | ||
49 | |||
50 | |||
51 | // Implement IFreeswitchService here | ||
52 | } | ||
53 | } | ||
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs new file mode 100644 index 0000000..83fecef --- /dev/null +++ b/OpenSim/Services/FreeswitchService/FreeswitchServiceBase.cs | |||
@@ -0,0 +1,51 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using Nini.Config; | ||
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Services.Interfaces; | ||
33 | using OpenSim.Services.Base; | ||
34 | |||
35 | namespace OpenSim.Services.FreeswitchService | ||
36 | { | ||
37 | public class FreeswitchServiceBase : ServiceBase | ||
38 | { | ||
39 | public FreeswitchServiceBase(IConfigSource config) : base(config) | ||
40 | { | ||
41 | // | ||
42 | // Try reading the [FreeswitchService] section first, if it exists | ||
43 | // | ||
44 | IConfig freeswitchConfig = config.Configs["FreeswitchService"]; | ||
45 | if (freeswitchConfig != null) | ||
46 | { | ||
47 | // Read config here !! | ||
48 | } | ||
49 | } | ||
50 | } | ||
51 | } | ||
diff --git a/OpenSim/Services/Interfaces/IFreeswitchService.cs b/OpenSim/Services/Interfaces/IFreeswitchService.cs new file mode 100644 index 0000000..d1f635b --- /dev/null +++ b/OpenSim/Services/Interfaces/IFreeswitchService.cs | |||
@@ -0,0 +1,37 @@ | |||
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 | |||
28 | using System; | ||
29 | using OpenSim.Framework; | ||
30 | |||
31 | namespace OpenSim.Services.Interfaces | ||
32 | { | ||
33 | public interface IFreeswitchService | ||
34 | { | ||
35 | // Place anything the connector eeds to access here! | ||
36 | } | ||
37 | } | ||
diff --git a/prebuild.xml b/prebuild.xml index 77b6e1a..b614d65 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1402,6 +1402,37 @@ | |||
1402 | </Files> | 1402 | </Files> |
1403 | </Project> | 1403 | </Project> |
1404 | 1404 | ||
1405 | <Project name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library"> | ||
1406 | <Configuration name="Debug"> | ||
1407 | <Options> | ||
1408 | <OutputPath>../../../bin/</OutputPath> | ||
1409 | </Options> | ||
1410 | </Configuration> | ||
1411 | <Configuration name="Release"> | ||
1412 | <Options> | ||
1413 | <OutputPath>../../../bin/</OutputPath> | ||
1414 | </Options> | ||
1415 | </Configuration> | ||
1416 | |||
1417 | <ReferencePath>../../../bin/</ReferencePath> | ||
1418 | <Reference name="System"/> | ||
1419 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1420 | <Reference name="OpenMetaverse.dll"/> | ||
1421 | <Reference name="OpenSim.Framework"/> | ||
1422 | <Reference name="OpenSim.Framework.Console"/> | ||
1423 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1424 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1425 | <Reference name="OpenSim.Services.Base"/> | ||
1426 | <Reference name="OpenSim.Services.Connectors"/> | ||
1427 | <Reference name="OpenSim.Data"/> | ||
1428 | <Reference name="Nini.dll" /> | ||
1429 | <Reference name="log4net.dll"/> | ||
1430 | |||
1431 | <Files> | ||
1432 | <Match pattern="*.cs" recurse="true"/> | ||
1433 | </Files> | ||
1434 | </Project> | ||
1435 | |||
1405 | <Project name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library"> | 1436 | <Project name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library"> |
1406 | <Configuration name="Debug"> | 1437 | <Configuration name="Debug"> |
1407 | <Options> | 1438 | <Options> |