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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1315503003: Set the IceConnectionReceivingTimeout as a RTCConfiguration parameter. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 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 | « talk/app/webrtc/peerconnectionproxy.h ('k') | no next file » | 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 577
578 // Obtain a certificate from RTCConfiguration if any were provided (optional). 578 // Obtain a certificate from RTCConfiguration if any were provided (optional).
579 rtc::scoped_refptr<rtc::RTCCertificate> certificate; 579 rtc::scoped_refptr<rtc::RTCCertificate> certificate;
580 if (!rtc_configuration.certificates.empty()) { 580 if (!rtc_configuration.certificates.empty()) {
581 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of 581 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of
582 // just picking the first one. The decision should be made based on the DTLS 582 // just picking the first one. The decision should be made based on the DTLS
583 // handshake. The DTLS negotiations need to know about all certificates. 583 // handshake. The DTLS negotiations need to know about all certificates.
584 certificate = rtc_configuration.certificates[0]; 584 certificate = rtc_configuration.certificates[0];
585 } 585 }
586 586
587 SetIceConnectionReceivingTimeout(
588 rtc_configuration.ice_connection_receiving_timeout);
589
587 // TODO(perkj): Take |constraints| into consideration. Return false if not all 590 // TODO(perkj): Take |constraints| into consideration. Return false if not all
588 // mandatory constraints can be fulfilled. Note that |constraints| 591 // mandatory constraints can be fulfilled. Note that |constraints|
589 // can be null. 592 // can be null.
590 bool value; 593 bool value;
591 594
592 if (options.disable_encryption) { 595 if (options.disable_encryption) {
593 dtls_enabled_ = false; 596 dtls_enabled_ = false;
594 } else { 597 } else {
595 // Enable DTLS by default if we have an identity store or a certificate. 598 // Enable DTLS by default if we have an identity store or a certificate.
596 dtls_enabled_ = (dtls_identity_store || certificate); 599 dtls_enabled_ = (dtls_identity_store || certificate);
(...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after
2085 2088
2086 if (!srtp_cipher.empty()) { 2089 if (!srtp_cipher.empty()) {
2087 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher); 2090 metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher);
2088 } 2091 }
2089 if (!ssl_cipher.empty()) { 2092 if (!ssl_cipher.empty()) {
2090 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher); 2093 metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher);
2091 } 2094 }
2092 } 2095 }
2093 2096
2094 } // namespace webrtc 2097 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectionproxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698