Skip to content

Commit

Permalink
Revert "Fix for ipv6 link local with scope (#9326)"
Browse files Browse the repository at this point in the history
This reverts commit c1abc7f. It
produced compilation issues inside Google. I strongly suspect it isn't
this commit or gRPC's fault, but it prevents further testing until it is
resolved.
  • Loading branch information
ejona86 committed Jul 15, 2022
1 parent 5991239 commit 826a7c9
Showing 1 changed file with 1 addition and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
import com.google.common.net.InetAddresses;
import io.grpc.internal.GrpcUtil;
import io.grpc.okhttp.internal.OptionalMethod;
import io.grpc.okhttp.internal.Platform;
Expand Down Expand Up @@ -249,9 +247,7 @@ protected void configureTlsExtensions(
} else {
SET_USE_SESSION_TICKETS.invokeOptionalWithoutCheckedException(sslSocket, true);
}
if (SET_SERVER_NAMES != null
&& SNI_HOST_NAME != null
&& !InetAddresses.isInetAddress(HostAndPort.fromString(hostname).getHost())) {
if (SET_SERVER_NAMES != null && SNI_HOST_NAME != null) {
SET_SERVER_NAMES
.invoke(sslParams, Collections.singletonList(SNI_HOST_NAME.newInstance(hostname)));
} else {
Expand Down

0 comments on commit 826a7c9

Please sign in to comment.