From d2ecdece0d67257b5632c7e023541694f56e1838 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 19 Feb 2021 21:39:02 +0100 Subject: [PATCH] Remove QuicChannelOption that is not used anymore (#196) Motivation: Peer verification is now configured as part of the QuicSslContextBuilder. Remove the unused QuicChannelOption. Modifications: - Remove unused QuicChannelOption Result: Code cleanup --- .../incubator/codec/quic/DefaultQuicChannelConfig.java | 8 -------- .../io/netty/incubator/codec/quic/QuicChannelOption.java | 7 ------- 2 files changed, 15 deletions(-) diff --git a/src/main/java/io/netty/incubator/codec/quic/DefaultQuicChannelConfig.java b/src/main/java/io/netty/incubator/codec/quic/DefaultQuicChannelConfig.java index 1134e9579..0e68412cb 100644 --- a/src/main/java/io/netty/incubator/codec/quic/DefaultQuicChannelConfig.java +++ b/src/main/java/io/netty/incubator/codec/quic/DefaultQuicChannelConfig.java @@ -15,11 +15,8 @@ */ package io.netty.incubator.codec.quic; -import java.util.Map; - import io.netty.buffer.ByteBufAllocator; import io.netty.channel.Channel; -import io.netty.channel.ChannelOption; import io.netty.channel.DefaultChannelConfig; import io.netty.channel.MessageSizeEstimator; import io.netty.channel.RecvByteBufAllocator; @@ -34,11 +31,6 @@ final class DefaultQuicChannelConfig extends DefaultChannelConfig implements Qui super(channel); } - @Override - public Map, Object> getOptions() { - return getOptions(super.getOptions(), QuicChannelOption.PEER_CERT_SERVER_NAME); - } - @Override public QuicChannelConfig setConnectTimeoutMillis(int connectTimeoutMillis) { super.setConnectTimeoutMillis(connectTimeoutMillis); diff --git a/src/main/java/io/netty/incubator/codec/quic/QuicChannelOption.java b/src/main/java/io/netty/incubator/codec/quic/QuicChannelOption.java index cfb81478e..2ecc4ec28 100644 --- a/src/main/java/io/netty/incubator/codec/quic/QuicChannelOption.java +++ b/src/main/java/io/netty/incubator/codec/quic/QuicChannelOption.java @@ -22,13 +22,6 @@ */ public final class QuicChannelOption extends ChannelOption { - /** - * Optional parameter to verify peer's certificate. - * See server_name. - */ - public static final ChannelOption PEER_CERT_SERVER_NAME = - valueOf(QuicChannelOption.class, "PEER_CERT_SERVER_NAME"); - /** * If set to {@code true} the {@link QuicStreamChannel} will read {@link QuicStreamFrame}s and fire it through * the pipeline, if {@code false} it will read {@link io.netty.buffer.ByteBuf} and translate the FIN flag to