Skip to content

Drop support for old quiche #9561

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
maskit merged 2 commits into from
Mar 31, 2023
Merged

Drop support for old quiche #9561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b040a85
Drop support for old quiche
maskit Mar 29, 2023
b563830
Update quiche.m4
maskit Mar 30, 2023
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
1 change: 0 additions & 1 deletion build/quiche.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ if test "$has_quiche" != "0"; then
if test "$quiche_have_headers" != "0"; then
AC_SUBST([QUICHE_LIB], [-lquiche])
AC_SUBST([QUICHE_CFLAGS], [-I${quiche_include}])
AC_CHECK_FUNCS([quiche_config_set_active_connection_id_limit])
else
has_quiche=0
CPPFLAGS=$saved_cppflags
Expand Down
2 changes: 0 additions & 2 deletions iocore/net/QUICNetVConnection_quiche.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,8 @@ QUICNetVConnection::handle_received_packet(UDPPacket *packet)
quiche_recv_info recv_info = {
&packet->from.sa,
static_cast<socklen_t>(packet->from.isIp4() ? sizeof(packet->from.sin) : sizeof(packet->from.sin6)),
#ifdef HAVE_QUICHE_CONFIG_SET_ACTIVE_CONNECTION_ID_LIMIT
&packet->to.sa,
static_cast<socklen_t>(packet->to.isIp4() ? sizeof(packet->to.sin) : sizeof(packet->to.sin6)),
#endif
};

ssize_t done = quiche_conn_recv(this->_quiche_con, buf, buf_len, &recv_info);
Expand Down
11 changes: 4 additions & 7 deletions iocore/net/QUICPacketHandler_quiche.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,10 @@ QUICPacketHandlerIn::_recv_packet(int event, UDPPacket *udp_packet)
}

QUICConnectionId new_cid;
quiche_conn *quiche_con =
quiche_accept(new_cid, new_cid.length(), retry_token.original_dcid(), retry_token.original_dcid().length(),
#ifdef HAVE_QUICHE_CONFIG_SET_ACTIVE_CONNECTION_ID_LIMIT
&udp_packet->to.sa, udp_packet->to.isIp4() ? sizeof(udp_packet->to.sin) : sizeof(udp_packet->to.sin6),
#endif
&udp_packet->from.sa, udp_packet->from.isIp4() ? sizeof(udp_packet->from.sin) : sizeof(udp_packet->from.sin6),
&this->_quiche_config);
quiche_conn *quiche_con = quiche_accept(
new_cid, new_cid.length(), retry_token.original_dcid(), retry_token.original_dcid().length(), &udp_packet->to.sa,
udp_packet->to.isIp4() ? sizeof(udp_packet->to.sin) : sizeof(udp_packet->to.sin6), &udp_packet->from.sa,
udp_packet->from.isIp4() ? sizeof(udp_packet->from.sin) : sizeof(udp_packet->from.sin6), &this->_quiche_config);

if (params->get_qlog_file_base_name() != nullptr) {
char qlog_filepath[PATH_MAX];
Expand Down