Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: talk/session/media/srtpfilter.cc

Issue 1537683003: Fix build break in google3 import (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 applied_recv_params_ = recv_params; 443 applied_recv_params_ = recv_params;
444 } else { 444 } else {
445 LOG(LS_WARNING) << "Failed to apply negotiated SRTP parameters"; 445 LOG(LS_WARNING) << "Failed to apply negotiated SRTP parameters";
446 } 446 }
447 return ret; 447 return ret;
448 } 448 }
449 449
450 bool SrtpFilter::ResetParams() { 450 bool SrtpFilter::ResetParams() {
451 offer_params_.clear(); 451 offer_params_.clear();
452 state_ = ST_INIT; 452 state_ = ST_INIT;
453 (void)send_session_.release(); 453 send_session_ = nullptr;
454 (void)recv_session_.release(); 454 recv_session_ = nullptr;
455 (void)send_rtcp_session_.release(); 455 send_rtcp_session_ = nullptr;
456 (void)recv_rtcp_session_.release(); 456 recv_rtcp_session_ = nullptr;
457 LOG(LS_INFO) << "SRTP reset to init state"; 457 LOG(LS_INFO) << "SRTP reset to init state";
458 return true; 458 return true;
459 } 459 }
460 460
461 bool SrtpFilter::ParseKeyParams(const std::string& key_params, 461 bool SrtpFilter::ParseKeyParams(const std::string& key_params,
462 uint8_t* key, 462 uint8_t* key,
463 int len) { 463 int len) {
464 // example key_params: "inline:YUJDZGVmZ2hpSktMbW9QUXJzVHVWd3l6MTIzNDU2" 464 // example key_params: "inline:YUJDZGVmZ2hpSktMbW9QUXJzVHVWd3l6MTIzNDU2"
465 465
466 // Fail if key-method is wrong. 466 // Fail if key-method is wrong.
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 SrtpNotAvailable(__FUNCTION__); 945 SrtpNotAvailable(__FUNCTION__);
946 } 946 }
947 947
948 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { 948 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) {
949 SrtpNotAvailable(__FUNCTION__); 949 SrtpNotAvailable(__FUNCTION__);
950 } 950 }
951 951
952 #endif // HAVE_SRTP 952 #endif // HAVE_SRTP
953 953
954 } // namespace cricket 954 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698