| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // RFC 4566 suggested a Network Time Protocol (NTP) format timestamp | 141 // RFC 4566 suggested a Network Time Protocol (NTP) format timestamp |
| 142 // as the session id and session version. To simplify, it should be fine | 142 // as the session id and session version. To simplify, it should be fine |
| 143 // to just use a random number as session id and start version from | 143 // to just use a random number as session id and start version from |
| 144 // |kInitSessionVersion|. | 144 // |kInitSessionVersion|. |
| 145 session_version_(kInitSessionVersion), | 145 session_version_(kInitSessionVersion), |
| 146 identity_service_(dtls_identity_service), | 146 identity_service_(dtls_identity_service), |
| 147 session_(session), | 147 session_(session), |
| 148 session_id_(session_id), | 148 session_id_(session_id), |
| 149 data_channel_type_(dct), | 149 data_channel_type_(dct), |
| 150 identity_request_state_(IDENTITY_NOT_NEEDED) { | 150 identity_request_state_(IDENTITY_NOT_NEEDED) { |
| 151 transport_desc_factory_.set_protocol(cricket::ICEPROTO_RFC5245); | |
| 152 session_desc_factory_.set_add_legacy_streams(false); | 151 session_desc_factory_.set_add_legacy_streams(false); |
| 153 // SRTP-SDES is disabled if DTLS is on. | 152 // SRTP-SDES is disabled if DTLS is on. |
| 154 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED); | 153 SetSdesPolicy(dtls_enabled ? cricket::SEC_DISABLED : cricket::SEC_REQUIRED); |
| 155 | 154 |
| 156 if (!dtls_enabled) { | 155 if (!dtls_enabled) { |
| 157 return; | 156 return; |
| 158 } | 157 } |
| 159 | 158 |
| 160 if (identity_service_.get()) { | 159 if (identity_service_.get()) { |
| 161 identity_request_observer_ = | 160 identity_request_observer_ = |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 if (create_session_description_requests_.front().type == | 465 if (create_session_description_requests_.front().type == |
| 467 CreateSessionDescriptionRequest::kOffer) { | 466 CreateSessionDescriptionRequest::kOffer) { |
| 468 InternalCreateOffer(create_session_description_requests_.front()); | 467 InternalCreateOffer(create_session_description_requests_.front()); |
| 469 } else { | 468 } else { |
| 470 InternalCreateAnswer(create_session_description_requests_.front()); | 469 InternalCreateAnswer(create_session_description_requests_.front()); |
| 471 } | 470 } |
| 472 create_session_description_requests_.pop(); | 471 create_session_description_requests_.pop(); |
| 473 } | 472 } |
| 474 } | 473 } |
| 475 } // namespace webrtc | 474 } // namespace webrtc |
| OLD | NEW |