aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs55
1 files changed, 31 insertions, 24 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index a36fd74..a30a38d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
190 break; 190 break;
191 } 191 }
192 192
193 m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer); 193 m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer);
194 194
195 // Admin interface required values 195 // Admin interface required values
196 if (String.IsNullOrEmpty(m_vivoxServer) || 196 if (String.IsNullOrEmpty(m_vivoxServer) ||
@@ -469,8 +469,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
469 avatarName = avatar.Name; 469 avatarName = avatar.Name;
470 470
471 m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); 471 m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID);
472 m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", 472// m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}",
473 request, path, param); 473// request, path, param);
474 474
475 XmlElement resp; 475 XmlElement resp;
476 bool retry = false; 476 bool retry = false;
@@ -577,7 +577,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
577 577
578 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); 578 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
579 579
580 m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); 580// m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
581 581
582 return r; 582 return r;
583 } 583 }
@@ -625,8 +625,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
625 // voice channel 625 // voice channel
626 LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); 626 LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
627 627
628 m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", 628// m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
629 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); 629// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
630 // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", 630 // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}",
631 // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); 631 // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
632 632
@@ -656,8 +656,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
656 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); 656 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
657 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); 657 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
658 658
659 m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", 659// m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
660 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); 660// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
661 return r; 661 return r;
662 } 662 }
663 catch (Exception e) 663 catch (Exception e)
@@ -684,11 +684,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
684 public string ChatSessionRequest(Scene scene, string request, string path, string param, 684 public string ChatSessionRequest(Scene scene, string request, string path, string param,
685 UUID agentID, Caps caps) 685 UUID agentID, Caps caps)
686 { 686 {
687 ScenePresence avatar = scene.GetScenePresence(agentID); 687// ScenePresence avatar = scene.GetScenePresence(agentID);
688 string avatarName = avatar.Name; 688// string avatarName = avatar.Name;
689 689
690 m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", 690// m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}",
691 avatarName, request, path, param); 691// avatarName, request, path, param);
692 return "<llsd>true</llsd>"; 692 return "<llsd>true</llsd>";
693 } 693 }
694 694
@@ -738,7 +738,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
738 return channelUri; 738 return channelUri;
739 } 739 }
740 740
741 private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; 741
742 private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
742 743
743 /// <summary> 744 /// <summary>
744 /// Perform administrative login for Vivox. 745 /// Perform administrative login for Vivox.
@@ -750,7 +751,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
750 return VivoxCall(requrl, false); 751 return VivoxCall(requrl, false);
751 } 752 }
752 753
753 private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}"; 754 private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}";
754 755
755 /// <summary> 756 /// <summary>
756 /// Perform administrative logout for Vivox. 757 /// Perform administrative logout for Vivox.
@@ -761,7 +762,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
761 return VivoxCall(requrl, false); 762 return VivoxCall(requrl, false);
762 } 763 }
763 764
764 private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; 765
766 private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
765 767
766 /// <summary> 768 /// <summary>
767 /// Retrieve account information for the specified user. 769 /// Retrieve account information for the specified user.
@@ -773,7 +775,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
773 return VivoxCall(requrl, true); 775 return VivoxCall(requrl, true);
774 } 776 }
775 777
776 private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; 778
779 private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
777 780
778 /// <summary> 781 /// <summary>
779 /// Creates a new account. 782 /// Creates a new account.
@@ -787,7 +790,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
787 return VivoxCall(requrl, true); 790 return VivoxCall(requrl, true);
788 } 791 }
789 792
790 private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; 793
794 private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
791 795
792 /// <summary> 796 /// <summary>
793 /// Change the user's password. 797 /// Change the user's password.
@@ -798,7 +802,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
798 return VivoxCall(requrl, true); 802 return VivoxCall(requrl, true);
799 } 803 }
800 804
801 private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; 805
806 private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
802 807
803 /// <summary> 808 /// <summary>
804 /// Create a channel. 809 /// Create a channel.
@@ -870,7 +875,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
870 return false; 875 return false;
871 } 876 }
872 877
873 private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; 878 private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
874 879
875 /// <summary> 880 /// <summary>
876 /// Retrieve a channel. 881 /// Retrieve a channel.
@@ -1013,7 +1018,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1013 return false; 1018 return false;
1014 } 1019 }
1015 1020
1016 // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1021 // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1017 1022
1018 // private XmlElement VivoxGetChannelById(string parent, string channelid) 1023 // private XmlElement VivoxGetChannelById(string parent, string channelid)
1019 // { 1024 // {
@@ -1025,7 +1030,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1025 // return VivoxCall(requrl, true); 1030 // return VivoxCall(requrl, true);
1026 // } 1031 // }
1027 1032
1028 private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1033 private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1029 1034
1030 /// <summary> 1035 /// <summary>
1031 /// Delete a channel. 1036 /// Delete a channel.
@@ -1038,6 +1043,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1038 /// are required in a later phase. 1043 /// are required in a later phase.
1039 /// In this case the call handles parent and description as optional values. 1044 /// In this case the call handles parent and description as optional values.
1040 /// </summary> 1045 /// </summary>
1046
1041 private XmlElement VivoxDeleteChannel(string parent, string channelid) 1047 private XmlElement VivoxDeleteChannel(string parent, string channelid)
1042 { 1048 {
1043 string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); 1049 string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken);
@@ -1048,11 +1054,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1048 return VivoxCall(requrl, true); 1054 return VivoxCall(requrl, true);
1049 } 1055 }
1050 1056
1051 private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; 1057 private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
1052 1058
1053 /// <summary> 1059 /// <summary>
1054 /// Return information on channels in the given directory 1060 /// Return information on channels in the given directory
1055 /// </summary> 1061 /// </summary>
1062
1056 private XmlElement VivoxListChildren(string channelid) 1063 private XmlElement VivoxListChildren(string channelid)
1057 { 1064 {
1058 string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken); 1065 string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken);
@@ -1112,7 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1112 try 1119 try
1113 { 1120 {
1114 // Otherwise prepare the request 1121 // Otherwise prepare the request
1115 m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); 1122// m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
1116 1123
1117 HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); 1124 HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl);
1118 HttpWebResponse rsp = null; 1125 HttpWebResponse rsp = null;
@@ -1314,4 +1321,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1314 return false; 1321 return false;
1315 } 1322 }
1316 } 1323 }
1317} \ No newline at end of file 1324}