| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 rtc::Thread* worker_thread() const { return worker_thread_; } | 233 rtc::Thread* worker_thread() const { return worker_thread_; } |
| 234 PortAllocator* port_allocator() const { return port_allocator_; } | 234 PortAllocator* port_allocator() const { return port_allocator_; } |
| 235 | 235 |
| 236 // The ID of this session. | 236 // The ID of this session. |
| 237 const std::string& id() const { return sid_; } | 237 const std::string& id() const { return sid_; } |
| 238 | 238 |
| 239 // TODO(juberti): This data is largely redundant, as it can now be obtained | 239 // TODO(juberti): This data is largely redundant, as it can now be obtained |
| 240 // from local/remote_description(). Remove these functions and members. | 240 // from local/remote_description(). Remove these functions and members. |
| 241 // Returns the XML namespace identifying the type of this session. | 241 // Returns the XML namespace identifying the type of this session. |
| 242 const std::string& content_type() const { return content_type_; } | 242 const std::string& content_type() const { return content_type_; } |
| 243 // Returns the XML namespace identifying the transport used for this session. | |
| 244 const std::string& transport_type() const { return transport_type_; } | |
| 245 | 243 |
| 246 // Indicates whether we initiated this session. | 244 // Indicates whether we initiated this session. |
| 247 bool initiator() const { return initiator_; } | 245 bool initiator() const { return initiator_; } |
| 248 | 246 |
| 249 // Returns the application-level description given by our client. | 247 // Returns the application-level description given by our client. |
| 250 // If we are the recipient, this will be NULL until we send an accept. | 248 // If we are the recipient, this will be NULL until we send an accept. |
| 251 const SessionDescription* local_description() const; | 249 const SessionDescription* local_description() const; |
| 252 | 250 |
| 253 // Returns the application-level description given by the other client. | 251 // Returns the application-level description given by the other client. |
| 254 // If we are the initiator, this will be NULL until we receive an accept. | 252 // If we are the initiator, this will be NULL until we receive an accept. |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 // from |description|. Returns false if it's not available. | 443 // from |description|. Returns false if it's not available. |
| 446 static bool GetTransportDescription(const SessionDescription* description, | 444 static bool GetTransportDescription(const SessionDescription* description, |
| 447 const std::string& content_name, | 445 const std::string& content_name, |
| 448 TransportDescription* info); | 446 TransportDescription* info); |
| 449 | 447 |
| 450 rtc::Thread* const signaling_thread_; | 448 rtc::Thread* const signaling_thread_; |
| 451 rtc::Thread* const worker_thread_; | 449 rtc::Thread* const worker_thread_; |
| 452 PortAllocator* const port_allocator_; | 450 PortAllocator* const port_allocator_; |
| 453 const std::string sid_; | 451 const std::string sid_; |
| 454 const std::string content_type_; | 452 const std::string content_type_; |
| 455 const std::string transport_type_; | |
| 456 bool initiator_; | 453 bool initiator_; |
| 457 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; | 454 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; |
| 458 rtc::SSLProtocolVersion ssl_max_version_; | 455 rtc::SSLProtocolVersion ssl_max_version_; |
| 459 rtc::scoped_ptr<const SessionDescription> local_description_; | 456 rtc::scoped_ptr<const SessionDescription> local_description_; |
| 460 rtc::scoped_ptr<SessionDescription> remote_description_; | 457 rtc::scoped_ptr<SessionDescription> remote_description_; |
| 461 uint64 ice_tiebreaker_; | 458 uint64 ice_tiebreaker_; |
| 462 // This flag will be set to true after the first role switch. This flag | 459 // This flag will be set to true after the first role switch. This flag |
| 463 // will enable us to stop any role switch during the call. | 460 // will enable us to stop any role switch during the call. |
| 464 bool role_switch_; | 461 bool role_switch_; |
| 465 TransportMap transports_; | 462 TransportMap transports_; |
| 466 | 463 |
| 467 // Timeout value in milliseconds for which no ICE connection receives | 464 // Timeout value in milliseconds for which no ICE connection receives |
| 468 // any packets. | 465 // any packets. |
| 469 int ice_receiving_timeout_; | 466 int ice_receiving_timeout_; |
| 470 }; | 467 }; |
| 471 | 468 |
| 472 } // namespace cricket | 469 } // namespace cricket |
| 473 | 470 |
| 474 #endif // WEBRTC_P2P_BASE_SESSION_H_ | 471 #endif // WEBRTC_P2P_BASE_SESSION_H_ |
| OLD | NEW |