diff options
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 1e9fe11f..e19485a5 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -47,6 +47,10 @@ nni_reaper(void *arg) nni_mtx_lock(&sock->s_mx); if ((pipe = nni_list_first(&sock->s_reaps)) != NULL) { nni_list_remove(&sock->s_reaps, pipe); + if (pipe->p_id != 0) { + nni_idhash_remove(sock->s_pipes_by_id, + pipe->p_id); + } if (((ep = pipe->p_ep) != NULL) && ((ep->ep_pipe == pipe))) { @@ -232,6 +236,15 @@ nni_sock_open(nni_sock **sockp, uint16_t pnum) goto fail; } + if ((rv = nni_idhash_create(&sock->s_pipes_by_id)) != 0) { + goto fail; + } + // Pipe IDs are always positive values with the upper bit clear. + // Start the IDs at a random place to minimize chances of PIPE ID + // reuse improperly. + nni_idhash_set_limits(sock->s_pipes_by_id, 1, 0x7FFFFFFF, + nni_random() & 0x7FFFFFFF); + rv = nni_ev_init(&sock->s_recv_ev, NNG_EV_CAN_RECV, sock); if (rv != 0) { goto fail; @@ -290,6 +303,7 @@ fail: nni_ev_fini(&sock->s_recv_ev); nni_msgq_fini(sock->s_urq); nni_msgq_fini(sock->s_uwq); + nni_idhash_destroy(sock->s_pipes_by_id); nni_cv_fini(&sock->s_notify_cv); nni_cv_fini(&sock->s_cv); nni_mtx_fini(&sock->s_notify_mx); @@ -428,6 +442,7 @@ nni_sock_close(nni_sock *sock) nni_msgq_fini(sock->s_uwq); nni_ev_fini(&sock->s_send_ev); nni_ev_fini(&sock->s_recv_ev); + nni_idhash_destroy(sock->s_pipes_by_id); nni_cv_fini(&sock->s_notify_cv); nni_cv_fini(&sock->s_cv); nni_mtx_fini(&sock->s_notify_mx); |