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

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: rename set_default_private_address to set_default_local_address 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
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 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 737
738 webrtc_session_desc_factory_->SignalCertificateReady.connect( 738 webrtc_session_desc_factory_->SignalCertificateReady.connect(
739 this, &WebRtcSession::OnCertificateReady); 739 this, &WebRtcSession::OnCertificateReady);
740 740
741 if (options.disable_encryption) { 741 if (options.disable_encryption) {
742 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED); 742 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
743 } 743 }
744 port_allocator()->set_candidate_filter( 744 port_allocator()->set_candidate_filter(
745 ConvertIceTransportTypeToCandidateFilter(rtc_configuration.type)); 745 ConvertIceTransportTypeToCandidateFilter(rtc_configuration.type));
746 746
747 if (rtc_configuration.enable_localhost_ice_candidate) {
748 port_allocator()->set_flags(
749 port_allocator()->flags() |
750 cricket::PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE);
751 }
752
753 return true; 747 return true;
754 } 748 }
755 749
756 void WebRtcSession::Close() { 750 void WebRtcSession::Close() {
757 SetState(STATE_CLOSED); 751 SetState(STATE_CLOSED);
758 RemoveUnusedChannels(nullptr); 752 RemoveUnusedChannels(nullptr);
759 ASSERT(!voice_channel_); 753 ASSERT(!voice_channel_);
760 ASSERT(!video_channel_); 754 ASSERT(!video_channel_);
761 ASSERT(!data_channel_); 755 ASSERT(!data_channel_);
762 } 756 }
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2195 } 2189 }
2196 } 2190 }
2197 2191
2198 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2192 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2199 const rtc::SentPacket& sent_packet) { 2193 const rtc::SentPacket& sent_packet) {
2200 RTC_DCHECK(worker_thread()->IsCurrent()); 2194 RTC_DCHECK(worker_thread()->IsCurrent());
2201 media_controller_->call_w()->OnSentPacket(sent_packet); 2195 media_controller_->call_w()->OnSentPacket(sent_packet);
2202 } 2196 }
2203 2197
2204 } // namespace webrtc 2198 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698