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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
305 } | 305 } |
306 case MSG_CREATE_SESSIONDESCRIPTION_FAILED: { | 306 case MSG_CREATE_SESSIONDESCRIPTION_FAILED: { |
307 CreateSessionDescriptionMsg* param = | 307 CreateSessionDescriptionMsg* param = |
308 static_cast<CreateSessionDescriptionMsg*>(msg->pdata); | 308 static_cast<CreateSessionDescriptionMsg*>(msg->pdata); |
309 param->observer->OnFailure(param->error); | 309 param->observer->OnFailure(param->error); |
310 delete param; | 310 delete param; |
311 break; | 311 break; |
312 } | 312 } |
313 case MSG_GENERATE_IDENTITY: { | 313 case MSG_GENERATE_IDENTITY: { |
314 LOG(LS_INFO) << "Generating identity."; | 314 LOG(LS_INFO) << "Generating identity."; |
315 SetIdentity(rtc::SSLIdentity::Generate(DtlsIdentityStore::kIdentityName)); | 315 SetIdentity(rtc::SSLIdentity::Generate(DtlsIdentityStore::kIdentityName, |
| 316 rtc::KT_RSA)); |
316 break; | 317 break; |
317 } | 318 } |
318 default: | 319 default: |
319 ASSERT(false); | 320 ASSERT(false); |
320 break; | 321 break; |
321 } | 322 } |
322 } | 323 } |
323 | 324 |
324 void WebRtcSessionDescriptionFactory::InternalCreateOffer( | 325 void WebRtcSessionDescriptionFactory::InternalCreateOffer( |
325 CreateSessionDescriptionRequest request) { | 326 CreateSessionDescriptionRequest request) { |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 if (create_session_description_requests_.front().type == | 449 if (create_session_description_requests_.front().type == |
449 CreateSessionDescriptionRequest::kOffer) { | 450 CreateSessionDescriptionRequest::kOffer) { |
450 InternalCreateOffer(create_session_description_requests_.front()); | 451 InternalCreateOffer(create_session_description_requests_.front()); |
451 } else { | 452 } else { |
452 InternalCreateAnswer(create_session_description_requests_.front()); | 453 InternalCreateAnswer(create_session_description_requests_.front()); |
453 } | 454 } |
454 create_session_description_requests_.pop(); | 455 create_session_description_requests_.pop(); |
455 } | 456 } |
456 } | 457 } |
457 } // namespace webrtc | 458 } // namespace webrtc |
OLD | NEW |