Skip to content

[FXIED] LibEvent: natsConnection_Close() not closing the TCP connection #882

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
kozlovic merged 1 commit into from
Jul 12, 2025
Merged

[FXIED] LibEvent: natsConnection_Close() not closing the TCP connection #882

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
45 changes: 29 additions & 16 deletions src/adapters/libevent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ typedef struct
struct event *read;
struct event *write;
struct event *keepActive;
natsSock socketToClose;

} natsLibeventEvents;

Expand Down Expand Up @@ -159,14 +160,14 @@ natsLibevent_Attach(void **userData, void *loop, natsConnection *nc, natsSock so
}

static void
_closeCb(evutil_socket_t fd, short event, void *arg)
_closeCb(evutil_socket_t ignoredSocket, short ignoredEvent, void *arg)
{
natsSock socket = (natsSock) fd;
natsLibeventEvents *nle = (natsLibeventEvents*) arg;

// We have stopped polling for the "READ" event and are now in the
// event loop thread and invoke this so that the NATS C client
// library can proceed with the close of the socket/connection.
natsConnection_ProcessCloseEvent(&socket);
natsConnection_ProcessCloseEvent(&(nle->socketToClose));
}

/** \brief Start or stop polling on READ events.
Expand All @@ -193,7 +194,8 @@ natsLibevent_Read(void *userData, bool add)
{
// This will schedule a one-time event that guarantees that the
// callback `_closeCb` will be invoked from the event loop thread.
res = event_base_once(nle->loop, socket, EV_TIMEOUT, _closeCb, (void*) nle, NULL);
nle->socketToClose = (natsSock) socket;
res = event_base_once(nle->loop, -1, EV_TIMEOUT, _closeCb, (void*) nle, NULL);
}
}

Expand Down Expand Up @@ -222,6 +224,25 @@ natsLibevent_Write(void *userData, bool add)
return (res == 0 ? NATS_OK : NATS_ERR);
}

// This callback is invoked from the event loop thread and will free the
// `natsLibeventEvents` object.
static void
_freeCb(evutil_socket_t ignoredSocket, short ignoredEvent, void *arg)
{
natsLibeventEvents *nle = (natsLibeventEvents*) arg;

if (nle->read != NULL)
event_free(nle->read);
if (nle->write != NULL)
event_free(nle->write);
if (nle->keepActive != NULL)
{
event_active(nle->keepActive, 0, 0);
event_free(nle->keepActive);
}
free(nle);
}

/** \brief The connection is closed, it can be safely detached.
*
* When a connection is closed (not disconnected, pending a reconnect), this
Expand All @@ -235,19 +256,11 @@ natsLibevent_Detach(void *userData)
{
natsLibeventEvents *nle = (natsLibeventEvents*) userData;

if (nle->read != NULL)
event_free(nle->read);
if (nle->write != NULL)
event_free(nle->write);
if (nle->keepActive != NULL)
{
event_active(nle->keepActive, 0, 0);
event_free(nle->keepActive);
}
// This will schedule a one-time event that guarantees that the
// callback `_freeCb` will be invoked from the event loop thread.
int res = event_base_once(nle->loop, -1, EV_TIMEOUT, _freeCb, (void*) nle, NULL);

free(nle);

return NATS_OK;
return (res == 0 ? NATS_OK : NATS_ERR);
}

/** @} */ // end of libeventFunctions
Expand Down