Skip to content
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

Automated fix for refs/heads/tcp_handshaker #21

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

Automated fix for refs/heads/tcp_handshaker #21

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: 7 additions & 7 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ grpc_cc_library(
grpc_cc_library(
name = "handshaker",
language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS + [
public_hdrs = GRPC_PUBLIC_HDRS + [
"src/core/lib/transport/handshaker.h",
],
deps = [
Expand Down Expand Up @@ -1512,19 +1512,19 @@ grpc_cc_library(
srcs = [
"src/core/lib/transport/http_connect_handshaker.cc",
],
external_deps = [
"absl/strings",
],
language = "c++",
public_hdrs = [
"src/core/lib/transport/http_connect_handshaker.h",
],
external_deps = [
"absl/strings",
],
deps = [
"channel_args",
"config",
"gpr_base",
"handshaker",
"handshaker_registry",
"channel_args",
"config",
"httpcli",
"slice",
"uri_parser",
Expand Down Expand Up @@ -2567,8 +2567,8 @@ grpc_cc_library(
"grpc_service_config_impl",
"grpc_trace",
"handshaker_registry",
"httpcli",
"http_connect_handshaker",
"httpcli",
"json",
"json_util",
"orphanable",
Expand Down
1 change: 0 additions & 1 deletion src/core/lib/security/security_connector/fake/fake_security_connector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "src/core/lib/security/security_connector/security_connector.h"
#include "src/core/lib/transport/handshaker.h"


/* Creates a fake connector that emulates real channel security. */
grpc_core::RefCountedPtr<grpc_channel_security_connector>
grpc_fake_channel_security_connector_create(
Expand Down
1 change: 0 additions & 1 deletion src/core/lib/security/transport/security_handshaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channelz.h"

#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/security/context/security_context.h"
Expand Down
2 changes: 1 addition & 1 deletion src/core/lib/transport/http_connect_handshaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
#include "src/core/lib/http/format_request.h"
#include "src/core/lib/http/parser.h"
#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_registry.h"
#include "src/core/lib/uri/uri_parser.h"

namespace grpc_core {

Expand Down
4 changes: 2 additions & 2 deletions src/core/lib/transport/tcp_connect_handshaker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/iomgr/tcp_client.h"
#include "src/core/lib/iomgr/polling_entity.h"
#include "src/core/lib/iomgr/tcp_client.h"
#include "src/core/lib/transport/handshaker.h"
#include "src/core/lib/transport/handshaker_registry.h"

Expand Down Expand Up @@ -102,7 +102,7 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
args_ = args;
char* address = grpc_channel_args_find_string(
args->args, GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS);
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(address);
absl::StatusOr<URI> uri = URI::Parse(address);
if (!uri.ok() || !grpc_parse_uri(*uri, &addr_)) {
MutexLock lock(&mu_);
FinishLocked(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
Expand Down
2 changes: 1 addition & 1 deletion src/core/lib/transport/tcp_connect_handshaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS \
"grpc.internal.tcp_handshaker_resolved_address"

// Whether the TCP connect handshaker should bind the endpoint to the pollset.
// Whether the TCP connect handshaker should bind the endpoint to the pollset.
#define GRPC_ARG_TCP_HANDSHAKER_BIND_ENDPOINT_TO_POLLSET \
"grpc.internal.tcp_handshaker_bind_endpoint_to_pollset"

Expand Down