Skip to content

Compilation error fixes for QUIC unit tests #7944

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

Merged
bneradt merged 1 commit into from
Jun 16, 2021
Merged

Compilation error fixes for QUIC unit tests #7944

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
14 changes: 0 additions & 14 deletions iocore/net/quic/Mock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,6 @@ class MockQUICConnectionInfoProvider : public QUICConnectionInfoProvider
return NET_VCONNECTION_OUT;
}

int
select_next_protocol(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in,
unsigned inlen) const override
{
return SSL_TLSEXT_ERR_OK;
}

bool
is_closed() const override
{
Expand Down Expand Up @@ -512,13 +505,6 @@ class MockQUICConnection : public QUICConnection
return negotiated_application_name_sv;
}

int
select_next_protocol(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in,
unsigned inlen) const override
{
return SSL_TLSEXT_ERR_OK;
}

int _transmit_count = 0;
int _retransmit_count = 0;
Ptr<ProxyMutex> _mutex;
Expand Down
3 changes: 2 additions & 1 deletion iocore/net/quic/test/test_QUICPacket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ TEST_CASE("Sending Packet", "[quic]")
CHECK(packet.is_crypto_packet());

packet.store(buf, &len);
CHECK(len == packet.size() - 16);
// See above packet.size() CHECK: packet.size must be greater than 16.
CHECK(len == static_cast<size_t>(packet.size() - 16));
CHECK(memcmp(buf, expected, len - 16) == 0);
}

Expand Down
11 changes: 5 additions & 6 deletions proxy/http3/test/test_QPACK.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,16 @@ output_decoded_headers(FILE *fd, HTTPHdr **headers, uint64_t n)
}
fprintf(fd, "# stream %" PRIu64 "\n", i + 1);
MIMEFieldIter field_iter;
for (MIMEField *field = header_set->iter_get_first(&field_iter); field != nullptr;
field = header_set->iter_get_next(&field_iter)) {
int name_len;
int value_len;
for (auto const &field : *header_set) {
int name_len = 0;
int value_len = 0;
Arena arena;
const char *name = field->name_get(&name_len);
const char *name = field.name_get(&name_len);
char *lowered_name = arena.str_store(name, name_len);
for (int i = 0; i < name_len; i++) {
lowered_name[i] = ParseRules::ink_tolower(lowered_name[i]);
}
const char *value = field->value_get(&value_len);
const char *value = field.value_get(&value_len);
fprintf(fd, "%.*s\t%.*s\n", name_len, lowered_name, value_len, value);
}
fprintf(fd, "\n");
Expand Down