diff --git a/Janus/WebRtcJanus.csproj b/Janus/WebRtcJanus.csproj new file mode 100644 index 0000000..dfb3ecc --- /dev/null +++ b/Janus/WebRtcJanus.csproj @@ -0,0 +1,117 @@ + + + + net8.0 + false + Library + false + disable + WebRtcJanus + true + false + false + true + false + + + + True + 285212672 + + + TRACE + + True + 4096 + False + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + True + 285212672 + + + + + False + 4096 + True + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + + log4net + /home/opensim/opensim-mb/bin/log4net.dll + False + + + Mono.Addins + ../../../bin/Mono.Addins.dll + False + + + Nini + /home/opensim/opensim-mb/bin/Nini.dll + False + + + OpenMetaverse + /home/opensim/opensim-mb/bin/OpenMetaverse.dll + False + + + OpenMetaverse.StructuredData + /home/opensim/opensim-mb/bin/OpenMetaverse.StructuredData.dll + False + + + OpenMetaverseTypes + /home/opensim/opensim-mb/bin/OpenMetaverseTypes.dll + False + + + WebRtcVoice + /home/opensim/opensim-mb/bin/WebRtcVoice.dll + False + + + + + + + + + + + + + + + + + Code + + + diff --git a/WebRtcJanusService.cs b/Janus/WebRtcJanusService.cs similarity index 100% rename from WebRtcJanusService.cs rename to Janus/WebRtcJanusService.cs diff --git a/IWebRtcVoiceService.cs b/WebRtcVoice/IWebRtcVoiceService.cs similarity index 100% rename from IWebRtcVoiceService.cs rename to WebRtcVoice/IWebRtcVoiceService.cs diff --git a/WebRtcVoice/WebRtcJanusService.cs b/WebRtcVoice/WebRtcJanusService.cs new file mode 100644 index 0000000..1951b34 --- /dev/null +++ b/WebRtcVoice/WebRtcJanusService.cs @@ -0,0 +1,47 @@ +// Copyright 2024 Robert Adams (misterblue@misterblue.com) +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System.Reflection; + +using OpenSim.Framework; +using OpenSim.Services.Interfaces; +using OpenSim.Services.Base; + +using OpenMetaverse.StructuredData; +using OpenMetaverse; + +using Nini.Config; +using log4net; + +namespace WebRtcVoice + { + public class WebRtcJanusService : ServiceBase, IWebRtcVoiceService + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly string LogHeader = "[WEBRTC JANUS SERVICE]"; + + public WebRtcJanusService(IConfigSource pConfig) : base(pConfig) + { + m_log.DebugFormat("{0} WebRtcJanusService constructor", LogHeader); + } + + public OSDMap ProvisionVoiceAccountRequest(OSDMap pRequest, UUID pUserID, IScene pScene) + { + throw new System.NotImplementedException(); + } + + public OSDMap VoiceSignalingRequest(OSDMap pRequest, UUID pUserID, IScene pScene) + { + throw new System.NotImplementedException(); + } + } + } diff --git a/WebRtcVoice/WebRtcVoice.csproj b/WebRtcVoice/WebRtcVoice.csproj new file mode 100644 index 0000000..22f575c --- /dev/null +++ b/WebRtcVoice/WebRtcVoice.csproj @@ -0,0 +1,121 @@ + + + + net8.0 + false + Library + false + disable + WebRtcVoice + true + false + false + true + false + + + + True + 285212672 + + + TRACE + + True + 4096 + False + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + True + 285212672 + + + + + False + 4096 + True + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + + log4net + /home/opensim/opensim-mb/bin/log4net.dll + False + + + Mono.Addins + ../../../bin/Mono.Addins.dll + False + + + Nini + /home/opensim/opensim-mb/bin/Nini.dll + False + + + OpenMetaverse + /home/opensim/opensim-mb/bin/OpenMetaverse.dll + False + + + OpenMetaverse.StructuredData + /home/opensim/opensim-mb/bin/OpenMetaverse.StructuredData.dll + False + + + OpenMetaverseTypes + /home/opensim/opensim-mb/bin/OpenMetaverseTypes.dll + False + + + + + + + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + diff --git a/WebRtcVoiceConnector.cs b/WebRtcVoice/WebRtcVoiceConnector.cs similarity index 100% rename from WebRtcVoiceConnector.cs rename to WebRtcVoice/WebRtcVoiceConnector.cs diff --git a/WebRtcVoiceService.cs b/WebRtcVoice/WebRtcVoiceService.cs similarity index 100% rename from WebRtcVoiceService.cs rename to WebRtcVoice/WebRtcVoiceService.cs diff --git a/WebRTCVoiceModule.cs b/WebRtcVoiceModule/WebRtcVoiceModule.cs similarity index 100% rename from WebRTCVoiceModule.cs rename to WebRtcVoiceModule/WebRtcVoiceModule.cs diff --git a/WebRtcVoiceModule/WebRtcVoiceModule.csproj b/WebRtcVoiceModule/WebRtcVoiceModule.csproj new file mode 100644 index 0000000..e20b72d --- /dev/null +++ b/WebRtcVoiceModule/WebRtcVoiceModule.csproj @@ -0,0 +1,117 @@ + + + + net8.0 + false + Library + false + disable + WebRtcVoiceModule + true + false + false + true + false + + + + True + 285212672 + + + TRACE + + True + 4096 + False + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + True + 285212672 + + + + + False + 4096 + True + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + + log4net + /home/opensim/opensim-mb/bin/log4net.dll + False + + + Mono.Addins + ../../../bin/Mono.Addins.dll + False + + + Nini + /home/opensim/opensim-mb/bin/Nini.dll + False + + + OpenMetaverse + /home/opensim/opensim-mb/bin/OpenMetaverse.dll + False + + + OpenMetaverse.StructuredData + /home/opensim/opensim-mb/bin/OpenMetaverse.StructuredData.dll + False + + + OpenMetaverseTypes + /home/opensim/opensim-mb/bin/OpenMetaverseTypes.dll + False + + + WebRtcVoice + /home/opensim/opensim-mb/bin/WebRtcVoice.dll + False + + + + + + + + + + + + + + + + + Code + + + diff --git a/WebRtcVoiceServiceModule.cs b/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs similarity index 98% rename from WebRtcVoiceServiceModule.cs rename to WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs index ee05a0a..870ebbd 100644 --- a/WebRtcVoiceServiceModule.cs +++ b/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs @@ -87,7 +87,7 @@ namespace WebRtcVoice // ISharedRegionModule.Name public string Name { - get { return "WebRtcVoiceModule"; } + get { return "WebRtcVoiceServiceModule"; } } // ISharedRegionModule.AddRegion diff --git a/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.csproj b/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.csproj new file mode 100644 index 0000000..0d941b2 --- /dev/null +++ b/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.csproj @@ -0,0 +1,117 @@ + + + + net8.0 + false + Library + false + disable + WebRtcVoiceServiceModule + true + false + false + true + false + + + + True + 285212672 + + + TRACE + + True + 4096 + False + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + True + 285212672 + + + + + False + 4096 + True + false + True + False + False + ../../../bin/ + False + False + False + 4 + False + CA1416,SYSLIB0011,SYSLIB0014,SYSLIB0039 + AnyCPU + + + + log4net + /home/opensim/opensim-mb/bin/log4net.dll + False + + + Mono.Addins + ../../../bin/Mono.Addins.dll + False + + + Nini + /home/opensim/opensim-mb/bin/Nini.dll + False + + + OpenMetaverse + /home/opensim/opensim-mb/bin/OpenMetaverse.dll + False + + + OpenMetaverse.StructuredData + /home/opensim/opensim-mb/bin/OpenMetaverse.StructuredData.dll + False + + + OpenMetaverseTypes + /home/opensim/opensim-mb/bin/OpenMetaverseTypes.dll + False + + + WebRtcVoice + /home/opensim/opensim-mb/bin/WebRtcVoice.dll + False + + + + + + + + + + + + + + + + + Code + + + diff --git a/os-webrtc-janus.ini b/os-webrtc-janus.ini index f857cf4..210c475 100644 --- a/os-webrtc-janus.ini +++ b/os-webrtc-janus.ini @@ -1,11 +1,11 @@ [WebRtcVoice] Enabled=true ; Module to load for WebRtcVoice - BaseService=OpenSim.Services.WebRtcVoiceService.dll:WebRtcVoiceService + BaseService=WebRtcVoice.dll:WebRtcVoiceService ; Module to use for spacial WebRtcVoice - SpacialVoiceService=OpenSim.Services.WebRtcVoiceService.dll:WebRtcJanusService + SpacialVoiceService=WebRtcJanus.dll:WebRtcJanusService ; Module to use for non-spacial WebRtcVoice - NonSpacialVoiceService=OpenSim.Services.WebRtcVoiceService.dll:WebRtcJanusService + NonSpacialVoiceService=WebRtcJanus.dll:WebRtcJanusService ; URL for the grid service that is providing the WebRtcVoiceService WebRtcVoiceServerURI = ${Const|PrivURL}:${Const|PrivatePort} diff --git a/prebuild.xml b/prebuild-janus.xml similarity index 77% rename from prebuild.xml rename to prebuild-janus.xml index b1a387d..04df32d 100755 --- a/prebuild.xml +++ b/prebuild-janus.xml @@ -1,22 +1,22 @@ - ../../bin/ + ../../../bin/ true - ../../bin/ + ../../../bin/ true - ../../bin/ + ../../../bin/ @@ -30,7 +30,9 @@ - + + + diff --git a/prebuild-servicemodule.xml b/prebuild-servicemodule.xml new file mode 100755 index 0000000..1fcd998 --- /dev/null +++ b/prebuild-servicemodule.xml @@ -0,0 +1,45 @@ + + + + + ../../../bin/ + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/prebuild-webrtc.xml b/prebuild-webrtc.xml new file mode 100755 index 0000000..f6524c8 --- /dev/null +++ b/prebuild-webrtc.xml @@ -0,0 +1,47 @@ + + + + + ../../../bin/ + true + + + + + ../../../bin/ + true + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + + + + +