cosmetics
UbitUmarov
parent
b292950b1c
commit
5f76a62d29
|
|
@ -1,51 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System.Collections;
|
|
||||||
|
|
||||||
namespace OpenSim.Framework.Capabilities
|
|
||||||
{
|
|
||||||
[OSDMap]
|
|
||||||
public class LLSDParcelVoiceInfoResponse
|
|
||||||
{
|
|
||||||
public int parcel_local_id;
|
|
||||||
public string region_name;
|
|
||||||
public Hashtable voice_credentials;
|
|
||||||
|
|
||||||
public LLSDParcelVoiceInfoResponse()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds)
|
|
||||||
{
|
|
||||||
region_name = region;
|
|
||||||
parcel_local_id = localID;
|
|
||||||
voice_credentials = creds;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OpenSim.Framework.Capabilities
|
|
||||||
{
|
|
||||||
[OSDMap]
|
|
||||||
public class LLSDVoiceAccountResponse
|
|
||||||
{
|
|
||||||
public string username;
|
|
||||||
public string password;
|
|
||||||
public string voice_sip_uri_hostname;
|
|
||||||
public string voice_account_server_name;
|
|
||||||
|
|
||||||
public LLSDVoiceAccountResponse()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public LLSDVoiceAccountResponse(string user, string pass)
|
|
||||||
{
|
|
||||||
username = user;
|
|
||||||
password = pass;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LLSDVoiceAccountResponse(string user, string pass, string sipUriHost, string accountServer)
|
|
||||||
{
|
|
||||||
username = user;
|
|
||||||
password = pass;
|
|
||||||
voice_sip_uri_hostname = sipUriHost;
|
|
||||||
voice_account_server_name = accountServer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -365,18 +365,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// LLSDVoiceAccountResponse voiceAccountResponse =
|
string accounturl = String.Format("http://{0}:{1}{2}/", m_openSimWellKnownHTTPAddress,
|
||||||
// new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm, "http://etsvc02.hursley.ibm.com/api");
|
m_freeSwitchServicePort, m_freeSwitchAPIPrefix);
|
||||||
LLSDVoiceAccountResponse voiceAccountResponse =
|
// fast foward encode
|
||||||
new LLSDVoiceAccountResponse(agentname, password, m_freeSwitchRealm,
|
StringBuilder lsl = LLSDxmlEncode.Start(512);
|
||||||
String.Format("http://{0}:{1}{2}/", m_openSimWellKnownHTTPAddress,
|
LLSDxmlEncode.AddMap(lsl);
|
||||||
m_freeSwitchServicePort, m_freeSwitchAPIPrefix));
|
LLSDxmlEncode.AddElem("username", agentname, lsl);
|
||||||
|
LLSDxmlEncode.AddElem("password", password, lsl);
|
||||||
string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
|
LLSDxmlEncode.AddElem("voice_sip_uri_hostname", m_freeSwitchRealm, lsl);
|
||||||
|
LLSDxmlEncode.AddElem("voice_account_server_name", accounturl, lsl);
|
||||||
// m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
|
LLSDxmlEncode.AddEndMap(lsl);
|
||||||
|
return LLSDxmlEncode.End(lsl);
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
@ -414,7 +413,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
// - send channel_uri: as "sip:regionID@m_sipDomain"
|
// - send channel_uri: as "sip:regionID@m_sipDomain"
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
LLSDParcelVoiceInfoResponse parcelVoiceInfo;
|
|
||||||
string channelUri;
|
string channelUri;
|
||||||
|
|
||||||
if (null == scene.LandChannel)
|
if (null == scene.LandChannel)
|
||||||
|
|
@ -431,15 +429,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
|
// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
|
||||||
|
|
||||||
// TODO: EstateSettings don't seem to get propagated...
|
// TODO: EstateSettings don't seem to get propagated...
|
||||||
// if (!scene.RegionInfo.EstateSettings.AllowVoice)
|
if (!scene.RegionInfo.EstateSettings.AllowVoice)
|
||||||
// {
|
{
|
||||||
// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": voice not enabled in estate settings",
|
m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": voice not enabled in estate settings",
|
||||||
// scene.RegionInfo.RegionName);
|
scene.RegionInfo.RegionName);
|
||||||
// channel_uri = String.Empty;
|
channelUri = String.Empty;
|
||||||
// }
|
}
|
||||||
// else
|
else
|
||||||
|
|
||||||
if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
|
if (!scene.RegionInfo.EstateSettings.TaxFree && (land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
|
// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
|
||||||
// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
|
// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
|
||||||
|
|
@ -450,16 +448,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
channelUri = ChannelUri(scene, land);
|
channelUri = ChannelUri(scene, land);
|
||||||
}
|
}
|
||||||
|
|
||||||
// fill in our response to the client
|
// fast foward encode
|
||||||
Hashtable creds = new Hashtable();
|
StringBuilder lsl = LLSDxmlEncode.Start(512);
|
||||||
creds["channel_uri"] = channelUri;
|
LLSDxmlEncode.AddMap(lsl);
|
||||||
|
LLSDxmlEncode.AddElem("parcel_local_id", land.LocalID, lsl);
|
||||||
|
LLSDxmlEncode.AddElem("region_name", scene.Name, lsl);
|
||||||
|
LLSDxmlEncode.AddMap("voice_credentials", lsl);
|
||||||
|
LLSDxmlEncode.AddElem("channel_uri", channelUri, lsl);
|
||||||
|
//LLSDxmlEncode.AddElem("channel_credentials", channel_credentials, lsl);
|
||||||
|
LLSDxmlEncode.AddEndMap(lsl);
|
||||||
|
LLSDxmlEncode.AddEndMap(lsl);
|
||||||
|
|
||||||
parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
|
return LLSDxmlEncode.End(lsl);
|
||||||
string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
|
|
||||||
|
|
||||||
// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
|
|
||||||
// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
|
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue