Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3102)

Unified Diff: webrtc/sdk/objc/Framework/Classes/RTCIceServer.mm

Issue 2664233002: Implement new PeerConnection certificate policy API in ObjC API (Closed)
Patch Set: Fix bug where username/credential was not forwarded in constructor. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..58ab6891c4b1f95454d48474ebd23c1520e967ac 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);
+ return [self initWithURLStrings:urlStrings
+ username:username
+ credential:credential
+ tlsCertPolicy:RTCTlsCertPolicySecure];
+}
+
+- (instancetype)initWithURLStrings:(NSArray<NSString*>*)urlStrings
+ 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];
}
#pragma mark - Private
@@ -57,6 +69,17 @@
BOOL *stop) {
iceServer.urls.push_back(url.stdString);
}];
+
+ if (_tlsCertPolicy == RTCTlsCertPolicySecure) {
+ iceServer.tls_cert_policy =
+ webrtc::PeerConnectionInterface::kTlsCertPolicySecure;
+ } else if (_tlsCertPolicy == RTCTlsCertPolicyInsecureNoCheck) {
+ iceServer.tls_cert_policy =
+ webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck;
+ } else {
daniela-webrtc 2017/02/01 14:26:53 I don't think this else will ever be executed.
hnsl1 2017/02/01 16:11:47 Done.
+ iceServer.tls_cert_policy =
+ webrtc::PeerConnectionInterface::kTlsCertPolicySecure;
+ }
return iceServer;
}
@@ -69,9 +92,22 @@
}
NSString *username = [NSString stringForStdString:nativeServer.username];
NSString *credential = [NSString stringForStdString:nativeServer.password];
+ RTCTlsCertPolicy tlsCertPolicy;
+
+ if (nativeServer.tls_cert_policy ==
+ webrtc::PeerConnectionInterface::kTlsCertPolicySecure) {
+ tlsCertPolicy = RTCTlsCertPolicySecure;
+ } else if (nativeServer.tls_cert_policy ==
+ webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) {
+ tlsCertPolicy = RTCTlsCertPolicyInsecureNoCheck;
+ } else {
daniela-webrtc 2017/02/01 14:26:53 Same here
hnsl1 2017/02/01 16:11:47 Done.
+ tlsCertPolicy = RTCTlsCertPolicySecure;
+ }
+
self = [self initWithURLStrings:urls
username:username
- credential:credential];
+ credential:credential
+ tlsCertPolicy:tlsCertPolicy];
return self;
}

Powered by Google App Engine
This is Rietveld 408576698