mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00

This reverts commit 181ea6e414
.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
196 lines
7.7 KiB
Text
196 lines
7.7 KiB
Text
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "RTCIceServer+Private.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCIceServer)
|
|
|
|
@synthesize urlStrings = _urlStrings;
|
|
@synthesize username = _username;
|
|
@synthesize credential = _credential;
|
|
@synthesize tlsCertPolicy = _tlsCertPolicy;
|
|
@synthesize hostname = _hostname;
|
|
@synthesize tlsAlpnProtocols = _tlsAlpnProtocols;
|
|
@synthesize tlsEllipticCurves = _tlsEllipticCurves;
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:nil
|
|
credential:nil];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:RTCTlsCertPolicySecure];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:nil];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:[NSArray array]];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname
|
|
tlsAlpnProtocols:(NSArray<NSString *> *)tlsAlpnProtocols {
|
|
return [self initWithURLStrings:urlStrings
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:tlsAlpnProtocols
|
|
tlsEllipticCurves:[NSArray array]];
|
|
}
|
|
|
|
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
|
username:(NSString *)username
|
|
credential:(NSString *)credential
|
|
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
|
hostname:(NSString *)hostname
|
|
tlsAlpnProtocols:(NSArray<NSString *> *)tlsAlpnProtocols
|
|
tlsEllipticCurves:(NSArray<NSString *> *)tlsEllipticCurves {
|
|
NSParameterAssert(urlStrings.count);
|
|
if (self = [super init]) {
|
|
_urlStrings = [[NSArray alloc] initWithArray:urlStrings copyItems:YES];
|
|
_username = [username copy];
|
|
_credential = [credential copy];
|
|
_tlsCertPolicy = tlsCertPolicy;
|
|
_hostname = [hostname copy];
|
|
_tlsAlpnProtocols = [[NSArray alloc] initWithArray:tlsAlpnProtocols copyItems:YES];
|
|
_tlsEllipticCurves = [[NSArray alloc] initWithArray:tlsEllipticCurves copyItems:YES];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString stringWithFormat:@"RTC_OBJC_TYPE(RTCIceServer):\n%@\n%@\n%@\n%@\n%@\n%@\n%@",
|
|
_urlStrings,
|
|
_username,
|
|
_credential,
|
|
[self stringForTlsCertPolicy:_tlsCertPolicy],
|
|
_hostname,
|
|
_tlsAlpnProtocols,
|
|
_tlsEllipticCurves];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (NSString *)stringForTlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy {
|
|
switch (tlsCertPolicy) {
|
|
case RTCTlsCertPolicySecure:
|
|
return @"RTCTlsCertPolicySecure";
|
|
case RTCTlsCertPolicyInsecureNoCheck:
|
|
return @"RTCTlsCertPolicyInsecureNoCheck";
|
|
}
|
|
}
|
|
|
|
- (webrtc::PeerConnectionInterface::IceServer)nativeServer {
|
|
__block webrtc::PeerConnectionInterface::IceServer iceServer;
|
|
|
|
iceServer.username = [NSString stdStringForString:_username];
|
|
iceServer.password = [NSString stdStringForString:_credential];
|
|
iceServer.hostname = [NSString stdStringForString:_hostname];
|
|
|
|
[_tlsAlpnProtocols enumerateObjectsUsingBlock:^(NSString *proto, NSUInteger idx, BOOL *stop) {
|
|
iceServer.tls_alpn_protocols.push_back(proto.stdString);
|
|
}];
|
|
|
|
[_tlsEllipticCurves enumerateObjectsUsingBlock:^(NSString *curve, NSUInteger idx, BOOL *stop) {
|
|
iceServer.tls_elliptic_curves.push_back(curve.stdString);
|
|
}];
|
|
|
|
[_urlStrings enumerateObjectsUsingBlock:^(NSString *url,
|
|
NSUInteger idx,
|
|
BOOL *stop) {
|
|
iceServer.urls.push_back(url.stdString);
|
|
}];
|
|
|
|
switch (_tlsCertPolicy) {
|
|
case RTCTlsCertPolicySecure:
|
|
iceServer.tls_cert_policy =
|
|
webrtc::PeerConnectionInterface::kTlsCertPolicySecure;
|
|
break;
|
|
case RTCTlsCertPolicyInsecureNoCheck:
|
|
iceServer.tls_cert_policy =
|
|
webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck;
|
|
break;
|
|
}
|
|
return iceServer;
|
|
}
|
|
|
|
- (instancetype)initWithNativeServer:
|
|
(webrtc::PeerConnectionInterface::IceServer)nativeServer {
|
|
NSMutableArray *urls =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.urls.size()];
|
|
for (auto const &url : nativeServer.urls) {
|
|
[urls addObject:[NSString stringForStdString:url]];
|
|
}
|
|
NSString *username = [NSString stringForStdString:nativeServer.username];
|
|
NSString *credential = [NSString stringForStdString:nativeServer.password];
|
|
NSString *hostname = [NSString stringForStdString:nativeServer.hostname];
|
|
NSMutableArray *tlsAlpnProtocols =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.tls_alpn_protocols.size()];
|
|
for (auto const &proto : nativeServer.tls_alpn_protocols) {
|
|
[tlsAlpnProtocols addObject:[NSString stringForStdString:proto]];
|
|
}
|
|
NSMutableArray *tlsEllipticCurves =
|
|
[NSMutableArray arrayWithCapacity:nativeServer.tls_elliptic_curves.size()];
|
|
for (auto const &curve : nativeServer.tls_elliptic_curves) {
|
|
[tlsEllipticCurves addObject:[NSString stringForStdString:curve]];
|
|
}
|
|
RTCTlsCertPolicy tlsCertPolicy;
|
|
|
|
switch (nativeServer.tls_cert_policy) {
|
|
case webrtc::PeerConnectionInterface::kTlsCertPolicySecure:
|
|
tlsCertPolicy = RTCTlsCertPolicySecure;
|
|
break;
|
|
case webrtc::PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck:
|
|
tlsCertPolicy = RTCTlsCertPolicyInsecureNoCheck;
|
|
break;
|
|
}
|
|
|
|
self = [self initWithURLStrings:urls
|
|
username:username
|
|
credential:credential
|
|
tlsCertPolicy:tlsCertPolicy
|
|
hostname:hostname
|
|
tlsAlpnProtocols:tlsAlpnProtocols
|
|
tlsEllipticCurves:tlsEllipticCurves];
|
|
return self;
|
|
}
|
|
|
|
@end
|