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

Side by Side Diff: webrtc/p2p/base/transportchannelproxy.h

Issue 1345913004: Replace readable with receiving where receiving means receiving anything (stun ping, response or da… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Address comments Created 5 years, 3 months 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 | « webrtc/p2p/base/transportchannel.cc ('k') | webrtc/p2p/base/transportchannelproxy.cc » ('j') | 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 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool ExportKeyingMaterial(const std::string& label, 65 bool ExportKeyingMaterial(const std::string& label,
66 const uint8* context, 66 const uint8* context,
67 size_t context_len, 67 size_t context_len,
68 bool use_context, 68 bool use_context,
69 uint8* result, 69 uint8* result,
70 size_t result_len) override; 70 size_t result_len) override;
71 71
72 private: 72 private:
73 // Catch signals from the implementation channel. These just forward to the 73 // Catch signals from the implementation channel. These just forward to the
74 // client (after updating our state to match). 74 // client (after updating our state to match).
75 void OnReadableState(TransportChannel* channel); 75 void OnReceivingState(TransportChannel* channel);
76 void OnWritableState(TransportChannel* channel); 76 void OnWritableState(TransportChannel* channel);
77 void OnReadPacket(TransportChannel* channel, const char* data, size_t size, 77 void OnReadPacket(TransportChannel* channel, const char* data, size_t size,
78 const rtc::PacketTime& packet_time, int flags); 78 const rtc::PacketTime& packet_time, int flags);
79 void OnReadyToSend(TransportChannel* channel); 79 void OnReadyToSend(TransportChannel* channel);
80 void OnRouteChange(TransportChannel* channel, const Candidate& candidate); 80 void OnRouteChange(TransportChannel* channel, const Candidate& candidate);
81 81
82 void OnMessage(rtc::Message* message) override; 82 void OnMessage(rtc::Message* message) override;
83 83
84 typedef std::pair<rtc::Socket::Option, int> OptionPair; 84 typedef std::pair<rtc::Socket::Option, int> OptionPair;
85 typedef std::vector<OptionPair> OptionList; 85 typedef std::vector<OptionPair> OptionList;
86 rtc::Thread* worker_thread_; 86 rtc::Thread* worker_thread_;
87 TransportChannelImpl* impl_; 87 TransportChannelImpl* impl_;
88 OptionList options_; 88 OptionList options_;
89 std::vector<std::string> pending_srtp_ciphers_; 89 std::vector<std::string> pending_srtp_ciphers_;
90 90
91 RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannelProxy); 91 RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannelProxy);
92 }; 92 };
93 93
94 } // namespace cricket 94 } // namespace cricket
95 95
96 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNELPROXY_H_ 96 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNELPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportchannel.cc ('k') | webrtc/p2p/base/transportchannelproxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698