mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
8e545eee1e
This reverts commit 6780c51b23.
Reason for revert:
More details in crbug.com/810292
Original change's description:
> Use SRTP_AES128_CM_SHA1_80 by default instead of SRTP_AES128_CM_SHA1_32.
>
> A field has been added to "CryptoOptions" to enable SRTP_AES128_CM_SHA1_32
> from native apps if really necessary.
>
> R=deadbeef@webrtc.org
>
> Bug: webrtc:7670
> Change-Id: I36b6ab3e302fbf3cda2611ff196757e43a56e704
> Reviewed-on: https://webrtc-review.googlesource.com/41420
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Commit-Queue: Joachim Bauch <jbauch@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21952}
TBR=deadbeef@webrtc.org,magjed@webrtc.org,jbauch@webrtc.org
Change-Id: I643dbe023eca526f2cda4d97df045f2533741dd4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7670
Reviewed-on: https://webrtc-review.googlesource.com/49880
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21961}
56 lines
2 KiB
Text
56 lines
2 KiB
Text
/*
|
|
* Copyright 2017 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 "RTCPeerConnectionFactoryOptions+Private.h"
|
|
|
|
#include "rtc_base/network_constants.h"
|
|
|
|
namespace {
|
|
|
|
void setNetworkBit(webrtc::PeerConnectionFactoryInterface::Options* options,
|
|
rtc::AdapterType type,
|
|
bool ignore) {
|
|
if (ignore) {
|
|
options->network_ignore_mask |= type;
|
|
} else {
|
|
options->network_ignore_mask &= ~type;
|
|
}
|
|
}
|
|
} // namespace
|
|
|
|
@implementation RTCPeerConnectionFactoryOptions
|
|
|
|
@synthesize disableEncryption = _disableEncryption;
|
|
@synthesize disableNetworkMonitor = _disableNetworkMonitor;
|
|
@synthesize ignoreLoopbackNetworkAdapter = _ignoreLoopbackNetworkAdapter;
|
|
@synthesize ignoreVPNNetworkAdapter = _ignoreVPNNetworkAdapter;
|
|
@synthesize ignoreCellularNetworkAdapter = _ignoreCellularNetworkAdapter;
|
|
@synthesize ignoreWiFiNetworkAdapter = _ignoreWiFiNetworkAdapter;
|
|
@synthesize ignoreEthernetNetworkAdapter = _ignoreEthernetNetworkAdapter;
|
|
|
|
- (instancetype)init {
|
|
return [super init];
|
|
}
|
|
|
|
- (webrtc::PeerConnectionFactoryInterface::Options)nativeOptions {
|
|
webrtc::PeerConnectionFactoryInterface::Options options;
|
|
options.disable_encryption = self.disableEncryption;
|
|
options.disable_network_monitor = self.disableNetworkMonitor;
|
|
|
|
setNetworkBit(&options, rtc::ADAPTER_TYPE_LOOPBACK, self.ignoreLoopbackNetworkAdapter);
|
|
setNetworkBit(&options, rtc::ADAPTER_TYPE_VPN, self.ignoreVPNNetworkAdapter);
|
|
setNetworkBit(&options, rtc::ADAPTER_TYPE_CELLULAR, self.ignoreCellularNetworkAdapter);
|
|
setNetworkBit(&options, rtc::ADAPTER_TYPE_WIFI, self.ignoreWiFiNetworkAdapter);
|
|
setNetworkBit(&options, rtc::ADAPTER_TYPE_ETHERNET, self.ignoreEthernetNetworkAdapter);
|
|
|
|
return options;
|
|
}
|
|
|
|
@end
|