| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 nics_.clear(); | 108 nics_.clear(); |
| 109 main_->Clear(this, MSG_SIGNAL_RESULTS); | 109 main_->Clear(this, MSG_SIGNAL_RESULTS); |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 | 112 |
| 113 bool ConnectivityChecker::Initialize() { | 113 bool ConnectivityChecker::Initialize() { |
| 114 network_manager_.reset(CreateNetworkManager()); | 114 network_manager_.reset(CreateNetworkManager()); |
| 115 socket_factory_.reset(CreateSocketFactory(worker_)); | 115 socket_factory_.reset(CreateSocketFactory(worker_)); |
| 116 port_allocator_.reset(CreatePortAllocator(network_manager_.get(), | 116 port_allocator_.reset(CreatePortAllocator(network_manager_.get(), |
| 117 user_agent_, relay_token_)); | 117 user_agent_, relay_token_)); |
| 118 uint32 new_allocator_flags = port_allocator_->flags(); | |
| 119 new_allocator_flags |= cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG; | |
| 120 port_allocator_->set_flags(new_allocator_flags); | |
| 121 return true; | 118 return true; |
| 122 } | 119 } |
| 123 | 120 |
| 124 void ConnectivityChecker::Start() { | 121 void ConnectivityChecker::Start() { |
| 125 main_ = rtc::Thread::Current(); | 122 main_ = rtc::Thread::Current(); |
| 126 worker_->Post(this, MSG_START); | 123 worker_->Post(this, MSG_START); |
| 127 started_ = true; | 124 started_ = true; |
| 128 } | 125 } |
| 129 | 126 |
| 130 void ConnectivityChecker::CleanUp() { | 127 void ConnectivityChecker::CleanUp() { |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 nic_info->https.start_time_ms = now; | 520 nic_info->https.start_time_ms = now; |
| 524 } else { | 521 } else { |
| 525 LOG(LS_ERROR) << "Registering start time for unknown port: " << port; | 522 LOG(LS_ERROR) << "Registering start time for unknown port: " << port; |
| 526 } | 523 } |
| 527 } else { | 524 } else { |
| 528 LOG(LS_ERROR) << "Error, no nic info found while registering http start."; | 525 LOG(LS_ERROR) << "Error, no nic info found while registering http start."; |
| 529 } | 526 } |
| 530 } | 527 } |
| 531 | 528 |
| 532 } // namespace rtc | 529 } // namespace rtc |
| OLD | NEW |