Skip to content

Fix nullability completeness warnings and compilation errors in QUIC #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
barroca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix nullability completeness warnings and compilation errors in QUIC #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions quiche/quic/core/crypto/quic_crypto_server_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class QUICHE_EXPORT RejectionObserver {
RejectionObserver& operator=(const RejectionObserver&) = delete;
// Called after a rejection is built.
virtual void OnRejectionBuilt(const std::vector<uint32_t>& reasons,
CryptoHandshakeMessage* out) const = 0;
CryptoHandshakeMessage* _Nonnull out) const = 0;
};

// Factory for creating KeyExchange objects.
Expand Down Expand Up @@ -443,7 +443,7 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
ProofSource* proof_source() const;
ProofVerifier* absl_nullable proof_verifier() const;

SSL_CTX* ssl_ctx() const;
SSL_CTX* _Nullable ssl_ctx() const;

// The groups to use for key exchange in the TLS handshake;
const std::vector<uint16_t>& preferred_groups() const {
Expand Down Expand Up @@ -528,7 +528,7 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
// source-address tokens that are given to clients.
// Points to either source_address_token_boxer_storage or the
// default boxer provided by QuicCryptoServerConfig.
const CryptoSecretBoxer* source_address_token_boxer;
const CryptoSecretBoxer* _Nonnull source_address_token_boxer;

// Holds the override source_address_token_boxer instance if the
// Config is not using the default source address token boxer
Expand Down Expand Up @@ -563,7 +563,7 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
bool GetCurrentConfigs(
const QuicWallTime& now, absl::string_view requested_scid,
quiche::QuicheReferenceCountedPointer<Config> old_primary_config,
Configs* configs) const;
Configs* _Nonnull configs) const;

// ConfigPrimaryTimeLessThan returns true if a->primary_time <
// b->primary_time.
Expand Down Expand Up @@ -600,8 +600,8 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
const QuicSocketAddress& server_address,
const QuicSocketAddress& client_address, ParsedQuicVersion version,
const ParsedQuicVersionVector& supported_versions,
const QuicClock* clock, QuicRandom* rand,
QuicCompressedCertsCache* compressed_certs_cache,
const QuicClock* _Nonnull clock, QuicRandom* _Nonnull rand,
QuicCompressedCertsCache* _Nonnull compressed_certs_cache,
quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters>
params,
quiche::QuicheReferenceCountedPointer<QuicSignedServerConfig>
Expand Down Expand Up @@ -648,9 +648,9 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
ParsedQuicVersionVector supported_versions() const {
return supported_versions_;
}
const QuicClock* clock() const { return clock_; }
QuicRandom* rand() const { return rand_; } // NOLINT
QuicCompressedCertsCache* compressed_certs_cache() const {
const QuicClock* _Nonnull clock() const { return clock_; }
QuicRandom* _Nonnull rand() const { return rand_; } // NOLINT
QuicCompressedCertsCache* _Nonnull compressed_certs_cache() const {
return compressed_certs_cache_;
}
quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters>
Expand Down Expand Up @@ -685,9 +685,9 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
const QuicSocketAddress client_address_;
const ParsedQuicVersion version_;
const ParsedQuicVersionVector supported_versions_;
const QuicClock* const clock_;
QuicRandom* const rand_;
QuicCompressedCertsCache* const compressed_certs_cache_;
const QuicClock* _Nonnull const clock_;
QuicRandom* _Nonnull const rand_;
QuicCompressedCertsCache* _Nonnull const compressed_certs_cache_;
const quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters>
params_;
const quiche::QuicheReferenceCountedPointer<QuicSignedServerConfig>
Expand Down Expand Up @@ -813,7 +813,7 @@ class QUICHE_EXPORT QuicCryptoServerConfig {
delete;
BuildServerConfigUpdateMessageProofSourceCallback(
const QuicCryptoServerConfig* config,
QuicCompressedCertsCache* compressed_certs_cache,
QuicCompressedCertsCache* _Nonnull compressed_certs_cache,
const QuicCryptoNegotiatedParameters& params,
CryptoHandshakeMessage message,
std::unique_ptr<BuildServerConfigUpdateMessageResultCallback> cb);
Expand Down
10 changes: 5 additions & 5 deletions quiche/quic/core/http/http_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QUICHE_EXPORT HttpDecoder {
virtual ~Visitor() {}

// Called if an error is detected.
virtual void OnError(HttpDecoder* decoder) = 0;
virtual void OnError(HttpDecoder* _Nonnull decoder) = 0;

// All the following methods return true to continue decoding,
// and false to pause it.
Expand Down Expand Up @@ -145,13 +145,13 @@ class QUICHE_EXPORT HttpDecoder {
// Paused processing can be resumed by calling ProcessInput() again with the
// unprocessed portion of data. Must not be called after an error has
// occurred.
QuicByteCount ProcessInput(const char* data, QuicByteCount len);
QuicByteCount ProcessInput(const char* _Nonnull data, QuicByteCount len);

// Decode settings frame from |data|.
// Upon successful decoding, |frame| will be populated, and returns true.
// This method is not used for regular processing of incoming data.
static bool DecodeSettings(const char* data, QuicByteCount len,
SettingsFrame* frame);
static bool DecodeSettings(const char* _Nonnull data, QuicByteCount len,
SettingsFrame* _Nonnull frame);

// Returns an error code other than QUIC_NO_ERROR if and only if
// Visitor::OnError() has been called.
Expand Down Expand Up @@ -268,7 +268,7 @@ class QUICHE_EXPORT HttpDecoder {
QuicByteCount MaxFrameLength(uint64_t frame_type);

// Visitor to invoke when messages are parsed.
Visitor* const visitor_; // Unowned.
Visitor* _Nonnull const visitor_; // Unowned.
// Whether WEBTRANSPORT_STREAM should be parsed.
bool allow_web_transport_stream_;
// Current state of the parsing.
Expand Down
12 changes: 6 additions & 6 deletions quiche/quic/core/quic_connection_alarms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class QUICHE_EXPORT QuicConnectionAlarmsDelegate {
virtual void OnNetworkBlackholeDetectorAlarm() = 0;
virtual void OnPingAlarm() = 0;

virtual QuicConnectionContext* context() = 0;
virtual const QuicClock* clock() const = 0;
virtual QuicConnectionContext* _Nonnull context() = 0;
virtual const QuicClock* _Nonnull clock() const = 0;
};

namespace test {
Expand Down Expand Up @@ -126,7 +126,7 @@ class QUICHE_EXPORT QuicAlarmMultiplexer {
void DeferUnderlyingAlarmScheduling();
void ResumeUnderlyingAlarmScheduling();

QuicConnectionAlarmsDelegate* delegate() { return connection_; }
QuicConnectionAlarmsDelegate* _Nonnull delegate() { return connection_; }

// Outputs a formatted list of active alarms.
std::string DebugString();
Expand Down Expand Up @@ -165,7 +165,7 @@ class QUICHE_EXPORT QuicAlarmMultiplexer {
QuicArenaScopedPtr<QuicAlarm> later_alarm_;

// Underlying connection and individual connection components. Not owned.
QuicConnectionAlarmsDelegate* connection_;
QuicConnectionAlarmsDelegate* _Nonnull connection_;

// Latched value of --quic_multiplexer_alarm_granularity_us.
QuicTimeDelta underlying_alarm_granularity_;
Expand All @@ -181,7 +181,7 @@ class QUICHE_EXPORT QuicAlarmMultiplexer {
// a QuicAlarm-compatible API.
class QUICHE_EXPORT QuicAlarmProxy {
public:
QuicAlarmProxy(QuicAlarmMultiplexer* multiplexer, QuicAlarmSlot slot)
QuicAlarmProxy(QuicAlarmMultiplexer* _Nonnull multiplexer, QuicAlarmSlot slot)
: multiplexer_(multiplexer), slot_(slot) {}

bool IsSet() const { return multiplexer_->IsSet(slot_); }
Expand All @@ -201,7 +201,7 @@ class QUICHE_EXPORT QuicAlarmProxy {
private:
friend class ::quic::test::QuicConnectionAlarmsPeer;

QuicAlarmMultiplexer* multiplexer_;
QuicAlarmMultiplexer* _Nonnull multiplexer_;
QuicAlarmSlot slot_;
};

Expand Down
12 changes: 6 additions & 6 deletions quiche/quic/core/quic_time_wait_list_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ class QuicTimeWaitListManagerPeer;
struct QUICHE_EXPORT TimeWaitConnectionInfo {
TimeWaitConnectionInfo(
bool ietf_quic,
std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets,
std::vector<std::unique_ptr<QuicEncryptedPacket>>* _Nonnull termination_packets,
std::vector<QuicConnectionId> active_connection_ids);
TimeWaitConnectionInfo(
bool ietf_quic,
std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets,
std::vector<std::unique_ptr<QuicEncryptedPacket>>* _Nonnull termination_packets,
std::vector<QuicConnectionId> active_connection_ids,
QuicTime::Delta srtt);

Expand Down Expand Up @@ -179,7 +179,7 @@ class QUICHE_EXPORT QuicTimeWaitListManager
const QuicEncryptedPacket& packet);

// Return a non-owning pointer to the packet writer.
QuicPacketWriter* writer() { return writer_; }
QuicPacketWriter* _Nonnull writer() { return writer_; }

protected:
virtual std::unique_ptr<QuicEncryptedPacket> BuildPublicReset(
Expand Down Expand Up @@ -339,13 +339,13 @@ class QUICHE_EXPORT QuicTimeWaitListManager
std::unique_ptr<QuicAlarm> connection_id_clean_up_alarm_;

// Clock to efficiently measure approximate time.
const QuicClock* clock_;
const QuicClock* _Nonnull clock_;

// Interface that writes given buffer to the socket.
QuicPacketWriter* writer_;
QuicPacketWriter* _Nonnull writer_;

// Interface that manages blocked writers.
Visitor* visitor_;
Visitor* _Nonnull visitor_;
};

} // namespace quic
Expand Down
4 changes: 2 additions & 2 deletions quiche/quic/test_tools/packet_dropping_test_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ WriteResult PacketDroppingTestWriter::WritePacket(
++num_calls_to_write_;
ReleaseOldPackets();

absl::WriterMutexLock lock(config_mutex_);
absl::WriterMutexLock lock(&config_mutex_);
if (passthrough_for_next_n_packets_ > 0) {
--passthrough_for_next_n_packets_;
return QuicPacketWriterWrapper::WritePacket(buffer, buf_len, self_address,
Expand Down Expand Up @@ -201,7 +201,7 @@ QuicTime PacketDroppingTestWriter::ReleaseNextPacket() {
if (delayed_packets_.empty()) {
return QuicTime::Zero();
}
absl::ReaderMutexLock lock(config_mutex_);
absl::ReaderMutexLock lock(&config_mutex_);
auto iter = delayed_packets_.begin();
// Determine if we should re-order.
if (delayed_packets_.size() > 1 && fake_packet_reorder_percentage_ > 0 &&
Expand Down
8 changes: 4 additions & 4 deletions quiche/quic/test_tools/quic_crypto_server_config_peer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ namespace test {

quiche::QuicheReferenceCountedPointer<QuicCryptoServerConfig::Config>
QuicCryptoServerConfigPeer::GetPrimaryConfig() {
absl::ReaderMutexLock locked(server_config_->configs_lock_);
absl::ReaderMutexLock locked(&server_config_->configs_lock_);
return quiche::QuicheReferenceCountedPointer<QuicCryptoServerConfig::Config>(
server_config_->primary_config_);
}

quiche::QuicheReferenceCountedPointer<QuicCryptoServerConfig::Config>
QuicCryptoServerConfigPeer::GetConfig(std::string config_id) {
absl::ReaderMutexLock locked(server_config_->configs_lock_);
absl::ReaderMutexLock locked(&server_config_->configs_lock_);
if (config_id == "<primary>") {
return quiche::QuicheReferenceCountedPointer<
QuicCryptoServerConfig::Config>(server_config_->primary_config_);
Expand Down Expand Up @@ -83,7 +83,7 @@ QuicCryptoServerConfigPeer::ValidateSingleSourceAddressToken(

void QuicCryptoServerConfigPeer::CheckConfigs(
std::vector<std::pair<std::string, bool>> expected_ids_and_status) {
absl::ReaderMutexLock locked(server_config_->configs_lock_);
absl::ReaderMutexLock locked(&server_config_->configs_lock_);

ASSERT_EQ(expected_ids_and_status.size(), server_config_->configs_.size())
<< ConfigsDebug();
Expand Down Expand Up @@ -132,7 +132,7 @@ std::string QuicCryptoServerConfigPeer::ConfigsDebug() {
}

void QuicCryptoServerConfigPeer::SelectNewPrimaryConfig(int seconds) {
absl::WriterMutexLock locked(server_config_->configs_lock_);
absl::WriterMutexLock locked(&server_config_->configs_lock_);
server_config_->SelectNewPrimaryConfig(
QuicWallTime::FromUNIXSeconds(seconds));
}
Expand Down