OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 | 199 |
200 void BaseSession::SetError(Error error, const std::string& error_desc) { | 200 void BaseSession::SetError(Error error, const std::string& error_desc) { |
201 ASSERT(signaling_thread_->IsCurrent()); | 201 ASSERT(signaling_thread_->IsCurrent()); |
202 if (error != error_) { | 202 if (error != error_) { |
203 error_ = error; | 203 error_ = error; |
204 error_desc_ = error_desc; | 204 error_desc_ = error_desc; |
205 SignalError(this, error); | 205 SignalError(this, error); |
206 } | 206 } |
207 } | 207 } |
208 | 208 |
209 void BaseSession::SetIceConnectionReceivingTimeout(int timeout_ms) { | 209 void BaseSession::SetIceConfig(const IceConfig& config) { |
210 transport_controller_->SetIceConnectionReceivingTimeout(timeout_ms); | 210 transport_controller_->SetIceConfig(config); |
211 } | 211 } |
212 | 212 |
213 void BaseSession::MaybeStartGathering() { | 213 void BaseSession::MaybeStartGathering() { |
214 transport_controller_->MaybeStartGathering(); | 214 transport_controller_->MaybeStartGathering(); |
215 } | 215 } |
216 | 216 |
217 void BaseSession::LogState(State old_state, State new_state) { | 217 void BaseSession::LogState(State old_state, State new_state) { |
218 LOG(LS_INFO) << "Session:" << id() | 218 LOG(LS_INFO) << "Session:" << id() |
219 << " Old state:" << StateToString(old_state) | 219 << " Old state:" << StateToString(old_state) |
220 << " New state:" << StateToString(new_state); | 220 << " New state:" << StateToString(new_state); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 | 252 |
253 default: | 253 default: |
254 // Explicitly ignoring some states here. | 254 // Explicitly ignoring some states here. |
255 break; | 255 break; |
256 } | 256 } |
257 break; | 257 break; |
258 } | 258 } |
259 } | 259 } |
260 | 260 |
261 } // namespace cricket | 261 } // namespace cricket |
OLD | NEW |