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

Side by Side Diff: talk/app/webrtc/peerconnectioninterface.h

Issue 1548733002: Change DTLS default from 1.0 to 1.2 for webrtc. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: disable tests which fail under msan build. See webrtc bug 5381 Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/base/opensslstreamadapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 // socket and network manager factory classes for networking. 495 // socket and network manager factory classes for networking.
496 // If an application decides to provide its own threads and network 496 // If an application decides to provide its own threads and network
497 // implementation of these classes it should use the alternate 497 // implementation of these classes it should use the alternate
498 // CreatePeerConnectionFactory method which accepts threads as input and use the 498 // CreatePeerConnectionFactory method which accepts threads as input and use the
499 // CreatePeerConnection version that takes a PortAllocator as an 499 // CreatePeerConnection version that takes a PortAllocator as an
500 // argument. 500 // argument.
501 class PeerConnectionFactoryInterface : public rtc::RefCountInterface { 501 class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
502 public: 502 public:
503 class Options { 503 class Options {
504 public: 504 public:
505 Options() : 505 Options()
506 disable_encryption(false), 506 : disable_encryption(false),
507 disable_sctp_data_channels(false), 507 disable_sctp_data_channels(false),
508 disable_network_monitor(false), 508 disable_network_monitor(false),
509 network_ignore_mask(rtc::kDefaultNetworkIgnoreMask), 509 network_ignore_mask(rtc::kDefaultNetworkIgnoreMask),
510 ssl_max_version(rtc::SSL_PROTOCOL_DTLS_10) { 510 ssl_max_version(rtc::SSL_PROTOCOL_DTLS_12) {}
511 }
512 bool disable_encryption; 511 bool disable_encryption;
513 bool disable_sctp_data_channels; 512 bool disable_sctp_data_channels;
514 bool disable_network_monitor; 513 bool disable_network_monitor;
515 514
516 // Sets the network types to ignore. For instance, calling this with 515 // Sets the network types to ignore. For instance, calling this with
517 // ADAPTER_TYPE_ETHERNET | ADAPTER_TYPE_LOOPBACK will ignore Ethernet and 516 // ADAPTER_TYPE_ETHERNET | ADAPTER_TYPE_LOOPBACK will ignore Ethernet and
518 // loopback interfaces. 517 // loopback interfaces.
519 int network_ignore_mask; 518 int network_ignore_mask;
520 519
521 // Sets the maximum supported protocol version. The highest version 520 // Sets the maximum supported protocol version. The highest version
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 CreatePeerConnectionFactory( 602 CreatePeerConnectionFactory(
604 rtc::Thread* worker_thread, 603 rtc::Thread* worker_thread,
605 rtc::Thread* signaling_thread, 604 rtc::Thread* signaling_thread,
606 AudioDeviceModule* default_adm, 605 AudioDeviceModule* default_adm,
607 cricket::WebRtcVideoEncoderFactory* encoder_factory, 606 cricket::WebRtcVideoEncoderFactory* encoder_factory,
608 cricket::WebRtcVideoDecoderFactory* decoder_factory); 607 cricket::WebRtcVideoDecoderFactory* decoder_factory);
609 608
610 } // namespace webrtc 609 } // namespace webrtc
611 610
612 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 611 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/opensslstreamadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698