Skip to content

sbftcpconnection fixes #23

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

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

sbftcpconnection fixes #23

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
2 changes: 1 addition & 1 deletion src/handlers/tcpmesh/sbfTcpMeshHandler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ sbfTcpMeshHandlerCreate (sbfTport tport, sbfKeyValue properties)
if (tmh->mListener == NULL)
{
sbfLog_err (tmh->mLog,
"failed to create listener for port %u: %s",
"failed to create listener for port %lu: %s",
port, strerror (errno));
goto fail;
}
Expand Down
69 changes: 34 additions & 35 deletions src/network/sbfTcpConnection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ sbfTcpConnectionReadyQueueCb (sbfQueueItem item, void* closure)
ntohs (tc->mPeer.sin.sin_port));
#endif

if (tc->mReadyCb != NULL && !tc->mDestroyed)
if (tc->mReadyCb != NULL)
tc->mReadyCb (tc, tc->mClosure);

bufferevent_decref (tc->mEvent);

if (sbfRefCount_decrement (&tc->mRefCount))
free (tc);
}
Expand All @@ -55,9 +57,11 @@ sbfTcpConnectionErrorQueueCb (sbfQueueItem item, void* closure)
ntohs (tc->mPeer.sin.sin_port));
#endif

if (tc->mErrorCb != NULL && !tc->mDestroyed)
if (tc->mErrorCb != NULL)
tc->mErrorCb (tc, tc->mClosure);

bufferevent_decref (tc->mEvent);

if (sbfRefCount_decrement (&tc->mRefCount))
free (tc);
}
Expand All @@ -67,45 +71,46 @@ sbfTcpConnectionReadQueueCb (sbfQueueItem item, void* closure)
{
sbfTcpConnection tc = closure;
struct evbuffer* evb = bufferevent_get_input (tc->mEvent);
size_t size;
size_t size = evbuffer_get_length (evb);
size_t used;

if (!tc->mDestroyed)
if (size != 0)
{
size = evbuffer_get_length (evb);
if (size != 0)
{
used = tc->mReadCb (tc,
evbuffer_pullup (evb, -1),
size,
tc->mClosure);
if (!tc->mDestroyed)
evbuffer_drain (evb, used);
}

if (!tc->mDestroyed)
{
tc->mQueued = 0;
bufferevent_enable (tc->mEvent, EV_READ);
}
used = tc->mReadCb (tc,
evbuffer_pullup (evb, -1),
size,
tc->mClosure);
evbuffer_drain (evb, used);
}

bufferevent_enable (tc->mEvent, EV_READ);

bufferevent_decref (tc->mEvent);

if (sbfRefCount_decrement (&tc->mRefCount))
free (tc);
}

static void
sbfTcpConnectionEventReadCb (struct bufferevent* bev, void* closure)
sbfTcpConnectionDestroyQueueCb (sbfQueueItem item, void* closure)
{
sbfTcpConnection tc = closure;

if (tc->mQueued)
return;
bufferevent_decref (tc->mEvent);

if (sbfRefCount_decrement (&tc->mRefCount))
free (tc);
}

static void
sbfTcpConnectionEventReadCb (struct bufferevent* bev, void* closure)
{
sbfTcpConnection tc = closure;

tc->mQueued = 1;
bufferevent_disable (tc->mEvent, EV_READ);

sbfRefCount_increment (&tc->mRefCount);
bufferevent_incref (tc->mEvent);
sbfQueue_enqueue (tc->mQueue, sbfTcpConnectionReadQueueCb, tc);
}

Expand All @@ -120,17 +125,15 @@ sbfTcpConnectionEventEventCb (struct bufferevent* bev,
{
bufferevent_enable (tc->mEvent, EV_READ|EV_WRITE);
sbfRefCount_increment (&tc->mRefCount);
bufferevent_incref (tc->mEvent);
sbfQueue_enqueue (tc->mQueue, sbfTcpConnectionReadyQueueCb, tc);
return;
}

if (events & (BEV_EVENT_ERROR|BEV_EVENT_TIMEOUT|BEV_EVENT_EOF))
{
if (tc->mEvent != NULL)
bufferevent_free (tc->mEvent);
tc->mEvent = NULL;

sbfRefCount_increment (&tc->mRefCount);
bufferevent_incref (tc->mEvent);
sbfQueue_enqueue (tc->mQueue, sbfTcpConnectionErrorQueueCb, tc);
return;
}
Expand All @@ -153,10 +156,8 @@ sbfTcpConnectionSet (sbfTcpConnection tc,
tc->mReadCb = readCb;
tc->mClosure = closure;

tc->mDestroyed = 0;
sbfRefCount_init (&tc->mRefCount, 1);

tc->mQueued = 0;
tc->mEvent = bufferevent_socket_new (sbfMw_getThreadEventBase (thread),
tc->mSocket,
BEV_OPT_THREADSAFE);
Expand Down Expand Up @@ -292,13 +293,11 @@ sbfTcpConnection_destroy (sbfTcpConnection tc)
{
sbfLog_debug (tc->mLog, "destroying TCP connection %p", tc);

tc->mDestroyed = 1;
EVUTIL_CLOSESOCKET (tc->mSocket);
if (tc->mEvent != NULL)
bufferevent_free (tc->mEvent);

if (sbfRefCount_decrement (&tc->mRefCount))
free (tc);
bufferevent_setcb (tc->mEvent, NULL, NULL, NULL, tc);

sbfQueue_enqueue (tc->mQueue, sbfTcpConnectionDestroyQueueCb, tc);
}

sbfError
Expand Down
2 changes: 0 additions & 2 deletions src/network/sbfTcpConnectionPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ struct sbfTcpConnectionImpl

sbfSocket mSocket;
struct bufferevent* mEvent;
int mQueued;

int mIsUnix;
sbfTcpConnectionAddress mPeer;
Expand All @@ -28,7 +27,6 @@ struct sbfTcpConnectionImpl
sbfMwThread mThread;
sbfQueue mQueue;

int mDestroyed;
sbfRefCount mRefCount;

struct sbfTcpListenerImpl* mListener;
Expand Down