| Index: webrtc/p2p/base/p2ptransportchannel.h
|
| diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
|
| index a8f16666c9625897de4cff8e9f0e11a86c76d13e..4057c545e2bdc582e90e42e75e01855aa0569f0f 100644
|
| --- a/webrtc/p2p/base/p2ptransportchannel.h
|
| +++ b/webrtc/p2p/base/p2ptransportchannel.h
|
| @@ -62,7 +62,7 @@ class P2PTransportChannel : public TransportChannelImpl,
|
| TransportChannelState GetState() const override;
|
| void SetIceRole(IceRole role) override;
|
| IceRole GetIceRole() const override { return ice_role_; }
|
| - void SetIceTiebreaker(uint64 tiebreaker) override;
|
| + void SetIceTiebreaker(uint64_t tiebreaker) override;
|
| void SetIceCredentials(const std::string& ice_ufrag,
|
| const std::string& ice_pwd) override;
|
| void SetRemoteIceCredentials(const std::string& ice_ufrag,
|
| @@ -130,10 +130,10 @@ class P2PTransportChannel : public TransportChannelImpl,
|
|
|
| // Allows key material to be extracted for external encryption.
|
| bool ExportKeyingMaterial(const std::string& label,
|
| - const uint8* context,
|
| + const uint8_t* context,
|
| size_t context_len,
|
| bool use_context,
|
| - uint8* result,
|
| + uint8_t* result,
|
| size_t result_len) override {
|
| return false;
|
| }
|
| @@ -145,7 +145,7 @@ class P2PTransportChannel : public TransportChannelImpl,
|
|
|
| // Set DTLS Remote fingerprint. Must be after local identity set.
|
| bool SetRemoteFingerprint(const std::string& digest_alg,
|
| - const uint8* digest,
|
| + const uint8_t* digest,
|
| size_t digest_len) override {
|
| return false;
|
| }
|
| @@ -183,7 +183,7 @@ class P2PTransportChannel : public TransportChannelImpl,
|
| PortInterface* origin_port);
|
| bool FindConnection(cricket::Connection* connection) const;
|
|
|
| - uint32 GetRemoteCandidateGeneration(const Candidate& candidate);
|
| + uint32_t GetRemoteCandidateGeneration(const Candidate& candidate);
|
| bool IsDuplicateRemoteCandidate(const Candidate& candidate);
|
| void RememberRemoteCandidate(const Candidate& remote_candidate,
|
| PortInterface* origin_port);
|
| @@ -246,8 +246,8 @@ class P2PTransportChannel : public TransportChannelImpl,
|
| std::string remote_ice_pwd_;
|
| IceMode remote_ice_mode_;
|
| IceRole ice_role_;
|
| - uint64 tiebreaker_;
|
| - uint32 remote_candidate_generation_;
|
| + uint64_t tiebreaker_;
|
| + uint32_t remote_candidate_generation_;
|
|
|
| int check_receiving_delay_;
|
| int receiving_timeout_;
|
|
|