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

This reverts commit 4f085434b9
.
Reason for revert: breaks downstream projects.
Original change's description:
> Add SSLConfig object to IceServer.
>
> This is a rollforward of https://webrtc-review.googlesource.com/c/src/+/96020,
> with the addition of setting the old tlsCertPolicy, tlsAlpnProtocols and
> tlsEllipticCurves in the RTCIceServer initializer, for backwards compatibility.
>
> Bug: webrtc:9662
> Change-Id: I28706ed4ff5abe3f7f913f105779f0e5412aeac5
> Reviewed-on: https://webrtc-review.googlesource.com/98762
> Commit-Queue: Diogo Real <diogor@google.com>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24696}
TBR=steveanton@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,kthelgason@webrtc.org,qingsi@webrtc.org,benwright@webrtc.org,diogor@google.com
Change-Id: I1cb64b63fec688b4ac90c2fa368eaf0bc11046af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9662
Reviewed-on: https://webrtc-review.googlesource.com/99880
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24701}
171 lines
6.7 KiB
Text
171 lines
6.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 <Foundation/Foundation.h>
|
|
|
|
#include <vector>
|
|
|
|
#include "rtc_base/gunit.h"
|
|
|
|
#import "api/peerconnection/RTCIceServer+Private.h"
|
|
#import "api/peerconnection/RTCIceServer.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@interface RTCIceServerTest : NSObject
|
|
- (void)testOneURLServer;
|
|
- (void)testTwoURLServer;
|
|
- (void)testPasswordCredential;
|
|
- (void)testInitFromNativeServer;
|
|
@end
|
|
|
|
@implementation RTCIceServerTest
|
|
|
|
- (void)testOneURLServer {
|
|
RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[
|
|
@"stun:stun1.example.net" ]];
|
|
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("stun:stun1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("", iceStruct.username);
|
|
EXPECT_EQ("", iceStruct.password);
|
|
}
|
|
|
|
- (void)testTwoURLServer {
|
|
RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[
|
|
@"turn1:turn1.example.net", @"turn2:turn2.example.net" ]];
|
|
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(2u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("turn2:turn2.example.net", iceStruct.urls.back());
|
|
EXPECT_EQ("", iceStruct.username);
|
|
EXPECT_EQ("", iceStruct.password);
|
|
}
|
|
|
|
- (void)testPasswordCredential {
|
|
RTCIceServer *server = [[RTCIceServer alloc]
|
|
initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
}
|
|
|
|
- (void)testHostname {
|
|
RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
}
|
|
|
|
- (void)testTlsAlpnProtocols {
|
|
RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"
|
|
tlsAlpnProtocols:@[ @"proto1", @"proto2" ]];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
|
|
}
|
|
|
|
- (void)testTlsEllipticCurves {
|
|
RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"
|
|
tlsAlpnProtocols:@[ @"proto1", @"proto2" ]
|
|
tlsEllipticCurves:@[ @"curve1", @"curve2" ]];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
|
|
EXPECT_EQ(2u, iceStruct.tls_elliptic_curves.size());
|
|
}
|
|
|
|
- (void)testInitFromNativeServer {
|
|
webrtc::PeerConnectionInterface::IceServer nativeServer;
|
|
nativeServer.username = "username";
|
|
nativeServer.password = "password";
|
|
nativeServer.urls.push_back("stun:stun.example.net");
|
|
nativeServer.hostname = "hostname";
|
|
nativeServer.tls_alpn_protocols.push_back("proto1");
|
|
nativeServer.tls_alpn_protocols.push_back("proto2");
|
|
nativeServer.tls_elliptic_curves.push_back("curve1");
|
|
nativeServer.tls_elliptic_curves.push_back("curve2");
|
|
|
|
RTCIceServer *iceServer =
|
|
[[RTCIceServer alloc] initWithNativeServer:nativeServer];
|
|
EXPECT_EQ(1u, iceServer.urlStrings.count);
|
|
EXPECT_EQ("stun:stun.example.net",
|
|
[NSString stdStringForString:iceServer.urlStrings.firstObject]);
|
|
EXPECT_EQ("username", [NSString stdStringForString:iceServer.username]);
|
|
EXPECT_EQ("password", [NSString stdStringForString:iceServer.credential]);
|
|
EXPECT_EQ("hostname", [NSString stdStringForString:iceServer.hostname]);
|
|
EXPECT_EQ(2u, iceServer.tlsAlpnProtocols.count);
|
|
EXPECT_EQ(2u, iceServer.tlsEllipticCurves.count);
|
|
}
|
|
|
|
@end
|
|
|
|
TEST(RTCIceServerTest, OneURLTest) {
|
|
@autoreleasepool {
|
|
RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
|
|
[test testOneURLServer];
|
|
}
|
|
}
|
|
|
|
TEST(RTCIceServerTest, TwoURLTest) {
|
|
@autoreleasepool {
|
|
RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
|
|
[test testTwoURLServer];
|
|
}
|
|
}
|
|
|
|
TEST(RTCIceServerTest, PasswordCredentialTest) {
|
|
@autoreleasepool {
|
|
RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
|
|
[test testPasswordCredential];
|
|
}
|
|
}
|
|
|
|
TEST(RTCIceServerTest, HostnameTest) {
|
|
@autoreleasepool {
|
|
RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
|
|
[test testHostname];
|
|
}
|
|
}
|
|
|
|
TEST(RTCIceServerTest, InitFromNativeServerTest) {
|
|
@autoreleasepool {
|
|
RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
|
|
[test testInitFromNativeServer];
|
|
}
|
|
}
|