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

Jump to bottom

clear up hosting io_ctx if ziti_accept fails #992

Merged
merged 5 commits into from
Sep 29, 2024
Merged

clear up hosting io_ctx if ziti_accept fails #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41f41b8
clear up hosting io_ctx if ziti_accept fails
ekoby Sep 27, 2024
edfbd22
make sure handle is valid
ekoby Sep 27, 2024
8a669bd
mem leak
ekoby Sep 27, 2024
d2fe1fc
do not ziti_accept with a failed udp handle
ekoby Sep 27, 2024
80d2884
update [email protected]
ekoby Sep 29, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)


set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
set(ZITI_SDK_VERSION "1.0.9" CACHE STRING "ziti-sdk-c version or branch to use")
set(ZITI_SDK_VERSION "1.0.12" CACHE STRING "ziti-sdk-c version or branch to use")

# if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)
Expand Down
26 changes: 21 additions & 5 deletions lib/ziti-tunnel-cbs/ziti_hosting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,34 @@ void *local_addr(uv_handle_t *h, struct sockaddr *name, int *len) {
/** called by ziti sdk when a client connection is established (or fails) */
static void on_hosted_client_connect_complete(ziti_connection clt, int err) {
struct hosted_io_ctx_s *io_ctx = ziti_conn_data(clt);

if (io_ctx == NULL) {
ZITI_LOG(WARN, "missing io_ctx");
ziti_close(clt, ziti_conn_close_cb);
return;
}

if (err == ZITI_OK) {
int rc;
uv_handle_t *server = (uv_handle_t *) &io_ctx->server.tcp;
uv_os_fd_t fd;
if ((rc = uv_fileno(server, &fd)) != 0) {
ZITI_LOG(ERROR, "failed to bridge client[%s] with hosted_service[%s] fd[%d]: %s",
io_ctx->client_identity, io_ctx->service->service_name,
fd, uv_strerror(rc));
hosted_server_close(io_ctx);
return;
}

struct sockaddr_storage name_storage;
struct sockaddr *name = (struct sockaddr *) &name_storage;
int len = sizeof(name_storage);
local_addr(server, name, &len);
uv_getnameinfo_t req = {0};
uv_getnameinfo(io_ctx->service->loop, &req, NULL, name, NI_NUMERICHOST|NI_NUMERICSERV);
uv_os_fd_t fd;
uv_fileno(server, &fd);
ZITI_LOG(DEBUG, "hosted_service[%s] client[%s] local_addr[%s:%s] fd[%d] server[%s] connected %d", io_ctx->service->service_name,
io_ctx->client_identity, req.host, req.service, fd, io_ctx->resolved_dst, len);
int rc = ziti_conn_bridge(clt, server, on_bridge_close);
rc = ziti_conn_bridge(clt, server, on_bridge_close);
if (rc != 0) {
ZITI_LOG(ERROR, "failed to bridge client[%s] with hosted_service[%s] laddr[%s:%s] fd[%d]: %s",
io_ctx->client_identity, io_ctx->service->service_name,
Expand All @@ -196,6 +211,7 @@ static void on_hosted_client_connect_complete(ziti_connection clt, int err) {
} else {
ZITI_LOG(ERROR, "hosted_service[%s] client[%s] failed to connect: %s", io_ctx->service->service_name,
io_ctx->client_identity, ziti_errorstr(err));
hosted_server_close(io_ctx);
}
}

Expand Down Expand Up @@ -702,6 +718,7 @@ static void on_hosted_client_connect_resolved(uv_getaddrinfo_t* ai_req, int stat
ZITI_LOG(ERROR, "hosted_service[%s], client[%s]: uv_tcp_connect failed: %s",
io->service->service_name, io->client_identity, uv_strerror(uv_err));
hosted_server_close(io);
free(c);
}
}
break;
Expand All @@ -711,8 +728,7 @@ static void on_hosted_client_connect_resolved(uv_getaddrinfo_t* ai_req, int stat
ZITI_LOG(ERROR, "hosted_service[%s], client[%s]: uv_udp_connect failed: %s",
io->service->service_name, io->client_identity, uv_strerror(uv_err));
hosted_server_close(io);
}
if (ziti_accept(io->client, on_hosted_client_connect_complete, NULL) != ZITI_OK) {
} else if (ziti_accept(io->client, on_hosted_client_connect_complete, NULL) != ZITI_OK) {
ZITI_LOG(ERROR, "ziti_accept failed");
hosted_server_close(io);
}
Expand Down
Loading