mirror of
https://github.com/Misterblue/os-webrtc-janus.git
synced 2026-07-31 00:32:17 +00:00
Change IWebRtcVoiceService API to pass region UUID rather than IScene class.
Add local VoiceViewerSession instance for remote connections. Add UpdateViewerSessionId to sync local and remote viewer session IDs. Properly select sections of JsonRPC messages for in and out messages. Code for both VoiceServiceConnector and VoiceServerConnector. Add more and completer MessageDetail debug statements. Bump minor version number = 1.1.1.
This commit is contained in:
@@ -223,13 +223,10 @@ namespace WebRtcVoice
|
||||
{
|
||||
OSD tmp = OSDParser.DeserializeLLSDXml(inputStream);
|
||||
if (_MessageDetails) m_log.DebugFormat("{0}[ProvisionVoice]: Request: {1}", logHeader, tmp.ToString());
|
||||
|
||||
if (tmp is OSDMap)
|
||||
{
|
||||
map = (OSDMap)tmp;
|
||||
}
|
||||
map = tmp as OSDMap;
|
||||
}
|
||||
}
|
||||
|
||||
if (map is null)
|
||||
{
|
||||
m_log.ErrorFormat("{0}[ProvisionVoice]: No request data found. Agent={1}", logHeader, agentID.ToString());
|
||||
@@ -258,7 +255,7 @@ namespace WebRtcVoice
|
||||
}
|
||||
|
||||
// The checks passed. Send the request to the voice service.
|
||||
OSDMap resp = voiceService.ProvisionVoiceAccountRequest(map, agentID, scene).Result;
|
||||
OSDMap resp = voiceService.ProvisionVoiceAccountRequest(map, agentID, scene.RegionInfo.RegionID).Result;
|
||||
|
||||
if (_MessageDetails) m_log.DebugFormat("{0}[ProvisionVoice]: response: {1}", logHeader, resp.ToString());
|
||||
|
||||
@@ -288,7 +285,7 @@ namespace WebRtcVoice
|
||||
if (inputStream.Length > 0)
|
||||
{
|
||||
OSD tmp = OSDParser.DeserializeLLSDXml(inputStream);
|
||||
if (_MessageDetails) m_log.DebugFormat("{0}[VoiceSignaling]: Request: {1}", logHeader, tmp.ToString());
|
||||
if (_MessageDetails) m_log.DebugFormat("{0}[VoiceSignalingRequest]: Request: {1}", logHeader, tmp.ToString());
|
||||
|
||||
if (tmp is OSDMap)
|
||||
{
|
||||
@@ -298,7 +295,7 @@ namespace WebRtcVoice
|
||||
}
|
||||
if (map is null)
|
||||
{
|
||||
m_log.ErrorFormat("{0}[VoiceSignaling]: No request data found. Agent={1}", logHeader, agentID.ToString());
|
||||
m_log.ErrorFormat("{0}[VoiceSignalingRequest]: No request data found. Agent={1}", logHeader, agentID.ToString());
|
||||
response.StatusCode = (int)HttpStatusCode.NoContent;
|
||||
return;
|
||||
}
|
||||
@@ -321,9 +318,10 @@ namespace WebRtcVoice
|
||||
return;
|
||||
}
|
||||
|
||||
OSDMap resp = voiceService.VoiceSignalingRequest(map, agentID, scene).Result;
|
||||
OSDMap resp = voiceService.VoiceSignalingRequest(map, agentID, scene.RegionInfo.RegionID).Result;
|
||||
if (_MessageDetails) m_log.DebugFormat("{0}[VoiceSignalingRequest]: Response: {1}", logHeader, resp);
|
||||
|
||||
// TODO: check for erros and package the response
|
||||
// TODO: check for errors and package the response
|
||||
|
||||
response.StatusCode = (int)HttpStatusCode.OK;
|
||||
response.RawBuffer = Util.UTF8.GetBytes("<llsd><undef /></llsd>");
|
||||
|
||||
Reference in New Issue
Block a user