diff options
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 1e7d978e..316f3603 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -9,6 +9,7 @@ // #include "core/nng_impl.h" +#include "list.h" #include "sockimpl.h" #include <stdio.h> @@ -691,7 +692,6 @@ nni_sock_shutdown(nni_sock *sock) while ((l = nni_list_first(&sock->s_listeners)) != NULL) { nni_listener_hold(l); - nni_list_node_remove(&l->l_node); nni_mtx_unlock(&sock->s_mx); nni_listener_close(l); nni_mtx_lock(&sock->s_mx); @@ -890,10 +890,17 @@ int nni_sock_add_listener(nni_sock *s, nni_listener *l) { nni_sockopt *sopt; + int rv; + + // grab a hold on the listener for the socket + if ((rv = nni_listener_hold(l)) != 0) { + return (rv); + } nni_mtx_lock(&s->s_mx); if (s->s_closing) { nni_mtx_unlock(&s->s_mx); + nni_listener_rele(l); return (NNG_ECLOSED); } @@ -917,6 +924,19 @@ nni_sock_add_listener(nni_sock *s, nni_listener *l) return (0); } +void +nni_sock_remove_listener(nni_listener *l) +{ + nni_sock *s = l->l_sock; + nni_mtx_lock(&s->s_mx); + NNI_ASSERT(nni_list_node_active(&l->l_node)); + nni_list_node_remove(&l->l_node); + nni_mtx_unlock(&s->s_mx); + + // also drop the hold from the socket + nni_listener_rele(l); +} + int nni_sock_add_dialer(nni_sock *s, nni_dialer *d) { |