diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index c6d7fe6..533bce2 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -184,26 +184,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
184 | return; | 184 | return; |
185 | } | 185 | } |
186 | 186 | ||
187 | // This here is a region module trying to make a global setting. | 187 | // THIS IS WRONG need to remove later |
188 | // Not really a good idea but it's Windows only, so I can't test. | 188 | |
189 | try | 189 | try |
190 | { | 190 | { |
191 | ServicePointManager.ServerCertificateValidationCallback += CustomCertificateValidation; | 191 | ServicePointManager.ServerCertificateValidationCallback += CustomCertificateValidation; |
192 | } | 192 | } |
193 | catch (NotImplementedException) | 193 | catch (NotImplementedException) |
194 | { | 194 | { |
195 | try | ||
196 | { | ||
197 | #pragma warning disable 0612, 0618 | ||
198 | // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet! Don't remove this! | ||
199 | ServicePointManager.CertificatePolicy = new MonoCert(); | ||
200 | #pragma warning restore 0612, 0618 | ||
201 | } | ||
202 | catch (Exception) | ||
203 | { | ||
204 | // COmmented multiline spam log message | ||
205 | //m_log.Error("[FreeSwitchVoice]: Certificate validation handler change not supported. You may get ssl certificate validation errors teleporting from your region to some SSL regions."); | ||
206 | } | ||
207 | } | 195 | } |
208 | } | 196 | } |
209 | 197 | ||
@@ -884,16 +872,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
884 | return response; | 872 | return response; |
885 | } | 873 | } |
886 | } | 874 | } |
887 | |||
888 | public class MonoCert : ICertificatePolicy | ||
889 | { | ||
890 | #region ICertificatePolicy Members | ||
891 | |||
892 | public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem) | ||
893 | { | ||
894 | return true; | ||
895 | } | ||
896 | |||
897 | #endregion | ||
898 | } | ||
899 | } | 875 | } |