mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 06:10:40 +01:00
a72d583271
packet_size() includes the size of padding, this means that the size check might incorrectly not trigger even if the payload is empty. In turn this means that the ReadBigEndian call might read out of bounds memory. Refactored the code to reuse the App parsing code more, eliminating the risk of this particular kind of error. Bug: chromium:987507 Change-Id: Id8f3e292c3d30460d3cdb551f0a45070fdf8f022 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146716 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28680}
59 lines
2 KiB
C++
59 lines
2 KiB
C++
/*
|
|
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMOTE_ESTIMATE_H_
|
|
#define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMOTE_ESTIMATE_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/transport/network_types.h"
|
|
#include "modules/rtp_rtcp/source/rtcp_packet/app.h"
|
|
|
|
namespace webrtc {
|
|
namespace rtcp {
|
|
|
|
class CommonHeader;
|
|
class RemoteEstimateSerializer {
|
|
public:
|
|
virtual bool Parse(rtc::ArrayView<const uint8_t> src,
|
|
NetworkStateEstimate* target) const = 0;
|
|
virtual rtc::Buffer Serialize(const NetworkStateEstimate& src) const = 0;
|
|
virtual ~RemoteEstimateSerializer() = default;
|
|
};
|
|
|
|
// Using a static global implementation to avoid incurring initialization
|
|
// overhead of the serializer every time RemoteEstimate is created.
|
|
const RemoteEstimateSerializer* GetRemoteEstimateSerializer();
|
|
|
|
// The RemoteEstimate packet provides network estimation results from the
|
|
// receive side. This functionality is experimental and subject to change
|
|
// without notice.
|
|
class RemoteEstimate : public App {
|
|
public:
|
|
RemoteEstimate();
|
|
explicit RemoteEstimate(App&& app);
|
|
// Note, sub type must be unique among all app messages with "goog" name.
|
|
static constexpr uint8_t kSubType = 13;
|
|
static constexpr uint32_t kName = NameToInt("goog");
|
|
static TimeDelta GetTimestampPeriod();
|
|
|
|
bool ParseData();
|
|
void SetEstimate(NetworkStateEstimate estimate);
|
|
NetworkStateEstimate estimate() const { return estimate_; }
|
|
|
|
private:
|
|
NetworkStateEstimate estimate_;
|
|
const RemoteEstimateSerializer* const serializer_;
|
|
};
|
|
|
|
} // namespace rtcp
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REMOTE_ESTIMATE_H_
|