OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 // as the session id and session version. To simplify, it should be fine | 146 // as the session id and session version. To simplify, it should be fine |
147 // to just use a random number as session id and start version from | 147 // to just use a random number as session id and start version from |
148 // |kInitSessionVersion|. | 148 // |kInitSessionVersion|. |
149 session_version_(kInitSessionVersion), | 149 session_version_(kInitSessionVersion), |
150 dtls_identity_store_(dtls_identity_store.Pass()), | 150 dtls_identity_store_(dtls_identity_store.Pass()), |
151 identity_request_observer_(identity_request_observer), | 151 identity_request_observer_(identity_request_observer), |
152 session_(session), | 152 session_(session), |
153 session_id_(session_id), | 153 session_id_(session_id), |
154 data_channel_type_(dct), | 154 data_channel_type_(dct), |
155 certificate_request_state_(CERTIFICATE_NOT_NEEDED) { | 155 certificate_request_state_(CERTIFICATE_NOT_NEEDED) { |
| 156 transport_desc_factory_.set_protocol(cricket::ICEPROTO_RFC5245); |
156 session_desc_factory_.set_add_legacy_streams(false); | 157 session_desc_factory_.set_add_legacy_streams(false); |
157 // SRTP-SDES is disabled if DTLS is on. | 158 // SRTP-SDES is disabled if DTLS is on. |
158 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED); | 159 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED); |
159 } | 160 } |
160 | 161 |
161 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( | 162 WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( |
162 rtc::Thread* signaling_thread, | 163 rtc::Thread* signaling_thread, |
163 cricket::ChannelManager* channel_manager, | 164 cricket::ChannelManager* channel_manager, |
164 MediaStreamSignaling* mediastream_signaling, | 165 MediaStreamSignaling* mediastream_signaling, |
165 WebRtcSession* session, | 166 WebRtcSession* session, |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 if (create_session_description_requests_.front().type == | 530 if (create_session_description_requests_.front().type == |
530 CreateSessionDescriptionRequest::kOffer) { | 531 CreateSessionDescriptionRequest::kOffer) { |
531 InternalCreateOffer(create_session_description_requests_.front()); | 532 InternalCreateOffer(create_session_description_requests_.front()); |
532 } else { | 533 } else { |
533 InternalCreateAnswer(create_session_description_requests_.front()); | 534 InternalCreateAnswer(create_session_description_requests_.front()); |
534 } | 535 } |
535 create_session_description_requests_.pop(); | 536 create_session_description_requests_.pop(); |
536 } | 537 } |
537 } | 538 } |
538 } // namespace webrtc | 539 } // namespace webrtc |
OLD | NEW |