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

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
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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 578
579 // Obtain a certificate from RTCConfiguration if any were provided (optional). 579 // Obtain a certificate from RTCConfiguration if any were provided (optional).
580 rtc::scoped_refptr<rtc::RTCCertificate> certificate; 580 rtc::scoped_refptr<rtc::RTCCertificate> certificate;
581 if (!rtc_configuration.certificates.empty()) { 581 if (!rtc_configuration.certificates.empty()) {
582 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of 582 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of
583 // just picking the first one. The decision should be made based on the DTLS 583 // just picking the first one. The decision should be made based on the DTLS
584 // handshake. The DTLS negotiations need to know about all certificates. 584 // handshake. The DTLS negotiations need to know about all certificates.
585 certificate = rtc_configuration.certificates[0]; 585 certificate = rtc_configuration.certificates[0];
586 } 586 }
587 587
588 SetIceConnectionReceivingTimeout(
589 rtc_configuration.ice_connection_receiving_timeout);
590
588 // TODO(perkj): Take |constraints| into consideration. Return false if not all 591 // TODO(perkj): Take |constraints| into consideration. Return false if not all
589 // mandatory constraints can be fulfilled. Note that |constraints| 592 // mandatory constraints can be fulfilled. Note that |constraints|
590 // can be null. 593 // can be null.
591 bool value; 594 bool value;
592 595
593 if (options.disable_encryption) { 596 if (options.disable_encryption) {
594 dtls_enabled_ = false; 597 dtls_enabled_ = false;
595 } else { 598 } else {
596 // Enable DTLS by default if we have an identity store or a certificate. 599 // Enable DTLS by default if we have an identity store or a certificate.
597 dtls_enabled_ = (dtls_identity_store || certificate); 600 dtls_enabled_ = (dtls_identity_store || certificate);
(...skipping 1487 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
« talk/app/webrtc/peerconnectioninterface.h ('K') | « talk/app/webrtc/peerconnectionproxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698