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

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

Issue 1411253008: WebRTC should generate default private address even when adapter enumeration is disabled. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: after rebase on master Created 5 years, 1 month 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/peerconnectioninterface.h ('k') | webrtc/base/fakenetwork.h » ('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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 736
737 webrtc_session_desc_factory_->SignalCertificateReady.connect( 737 webrtc_session_desc_factory_->SignalCertificateReady.connect(
738 this, &WebRtcSession::OnCertificateReady); 738 this, &WebRtcSession::OnCertificateReady);
739 739
740 if (options.disable_encryption) { 740 if (options.disable_encryption) {
741 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED); 741 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
742 } 742 }
743 port_allocator()->set_candidate_filter( 743 port_allocator()->set_candidate_filter(
744 ConvertIceTransportTypeToCandidateFilter(rtc_configuration.type)); 744 ConvertIceTransportTypeToCandidateFilter(rtc_configuration.type));
745 745
746 if (rtc_configuration.enable_localhost_ice_candidate) {
747 port_allocator()->set_flags(
748 port_allocator()->flags() |
749 cricket::PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE);
750 }
751
752 return true; 746 return true;
753 } 747 }
754 748
755 void WebRtcSession::Close() { 749 void WebRtcSession::Close() {
756 SetState(STATE_CLOSED); 750 SetState(STATE_CLOSED);
757 RemoveUnusedChannels(nullptr); 751 RemoveUnusedChannels(nullptr);
758 ASSERT(!voice_channel_); 752 ASSERT(!voice_channel_);
759 ASSERT(!video_channel_); 753 ASSERT(!video_channel_);
760 ASSERT(!data_channel_); 754 ASSERT(!data_channel_);
761 } 755 }
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 } 2188 }
2195 } 2189 }
2196 2190
2197 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2191 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2198 const rtc::SentPacket& sent_packet) { 2192 const rtc::SentPacket& sent_packet) {
2199 RTC_DCHECK(worker_thread()->IsCurrent()); 2193 RTC_DCHECK(worker_thread()->IsCurrent());
2200 media_controller_->call_w()->OnSentPacket(sent_packet); 2194 media_controller_->call_w()->OnSentPacket(sent_packet);
2201 } 2195 }
2202 2196
2203 } // namespace webrtc 2197 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface.h ('k') | webrtc/base/fakenetwork.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698