Index: webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm |
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm b/webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm |
index 41084b9357129f126f6683047f4ea748124b8216..435fe4b67cbf55ad8042f2bdf304a2d131da997c 100644 |
--- a/webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm |
+++ b/webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm |
@@ -17,6 +17,7 @@ |
@synthesize urlStrings = _urlStrings; |
@synthesize username = _username; |
@synthesize credential = _credential; |
+@synthesize tlsCertPolicy = _tlsCertPolicy; |
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings { |
NSParameterAssert(urlStrings.count); |
@@ -29,19 +30,30 @@ |
username:(NSString *)username |
credential:(NSString *)credential { |
NSParameterAssert(urlStrings.count); |
tkchin_webrtc
2017/02/01 17:57:40
you can remove this assert since it is checked in
hnsl1
2017/02/02 19:50:08
Done.
|
+ return [self initWithURLStrings:urlStrings |
+ username:username |
+ credential:credential |
+ tlsCertPolicy:RTCTlsCertPolicySecure]; |
+} |
+ |
+- (instancetype)initWithURLStrings:(NSArray<NSString*>*)urlStrings |
tkchin_webrtc
2017/02/01 17:57:40
ditto fix *
hnsl1
2017/02/02 19:50:08
Done.
|
+ username:(NSString*)username |
+ credential:(NSString*)credential |
+ tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy { |
+ NSParameterAssert(urlStrings.count); |
if (self = [super init]) { |
_urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES]; |
_username = [username copy]; |
_credential = [credential copy]; |
+ _tlsCertPolicy = tlsCertPolicy; |
} |
return self; |
} |
- (NSString *)description { |
- return [NSString stringWithFormat:@"RTCIceServer:\n%@\n%@\n%@", |
- _urlStrings, |
- _username, |
- _credential]; |
+ return [NSString stringWithFormat:@"RTCIceServer:\n%@\n%@\n%@\n%lu", |
+ _urlStrings, _username, _credential, |
+ (unsigned long)_tlsCertPolicy]; |
tkchin_webrtc
2017/02/01 17:57:40
would be nice to have this as a string so we don't
|
} |
#pragma mark - Private |
@@ -57,6 +69,13 @@ |
BOOL *stop) { |
iceServer.urls.push_back(url.stdString); |
}]; |
+ |
+ iceServer.tls_cert_policy = |
tkchin_webrtc
2017/02/01 17:57:40
recommend using a switch on _tlsCertPolicy and ass
|
+ webrtc::PeerConnectionInterface::kTlsCertPolicySecure; |
+ if (_tlsCertPolicy == RTCTlsCertPolicyInsecureNoCheck) { |
+ iceServer.tls_cert_policy = |
+ webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck; |
+ } |
return iceServer; |
} |
@@ -69,9 +88,16 @@ |
} |
NSString *username = [NSString stringForStdString:nativeServer.username]; |
NSString *credential = [NSString stringForStdString:nativeServer.password]; |
+ RTCTlsCertPolicy tlsCertPolicy = RTCTlsCertPolicySecure; |
+ if (nativeServer.tls_cert_policy == |
tkchin_webrtc
2017/02/01 17:57:40
ditto switch
|
+ webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) { |
+ tlsCertPolicy = RTCTlsCertPolicyInsecureNoCheck; |
+ } |
+ |
self = [self initWithURLStrings:urls |
username:username |
- credential:credential]; |
+ credential:credential |
+ tlsCertPolicy:tlsCertPolicy]; |
return self; |
} |