OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2009 Google Inc. | 3 * Copyright 2009 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
475 } | 475 } |
476 | 476 |
477 /////////////////////////////////////////////////////////////////////////////// | 477 /////////////////////////////////////////////////////////////////////////////// |
478 // SrtpSession | 478 // SrtpSession |
479 | 479 |
480 #ifdef HAVE_SRTP | 480 #ifdef HAVE_SRTP |
481 | 481 |
482 bool SrtpSession::inited_ = false; | 482 bool SrtpSession::inited_ = false; |
483 | 483 |
484 // This lock protects SrtpSession::inited_ and SrtpSession::sessions_. | 484 // This lock protects SrtpSession::inited_ and SrtpSession::sessions_. |
485 rtc::GlobalLockPod SrtpSession::lock_; | 485 rtc::GlobalLockPod SrtpSession::lock_ = {{0}}; |
tommi
2015/11/06 22:53:36
why this change?
| |
486 | 486 |
487 SrtpSession::SrtpSession() | 487 SrtpSession::SrtpSession() |
488 : session_(NULL), | 488 : session_(NULL), |
489 rtp_auth_tag_len_(0), | 489 rtp_auth_tag_len_(0), |
490 rtcp_auth_tag_len_(0), | 490 rtcp_auth_tag_len_(0), |
491 srtp_stat_(new SrtpStat()), | 491 srtp_stat_(new SrtpStat()), |
492 last_send_seq_num_(-1) { | 492 last_send_seq_num_(-1) { |
493 { | 493 { |
494 rtc::GlobalLockScope ls(&lock_); | 494 rtc::GlobalLockScope ls(&lock_); |
495 sessions()->push_back(this); | 495 sessions()->push_back(this); |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
942 SrtpNotAvailable(__FUNCTION__); | 942 SrtpNotAvailable(__FUNCTION__); |
943 } | 943 } |
944 | 944 |
945 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { | 945 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { |
946 SrtpNotAvailable(__FUNCTION__); | 946 SrtpNotAvailable(__FUNCTION__); |
947 } | 947 } |
948 | 948 |
949 #endif // HAVE_SRTP | 949 #endif // HAVE_SRTP |
950 | 950 |
951 } // namespace cricket | 951 } // namespace cricket |
OLD | NEW |