diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-07-15 18:32:32 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-07-15 18:32:32 -0700 |
| commit | bb974dcfa8a22cdf528b6035ab5226f6691f0abf (patch) | |
| tree | 3dcd2a4f3e6c32a2724ade2eadbe07ca91c11203 /src/core | |
| parent | a7b16f1d07b680ae8024438e1555d3c43426e4b8 (diff) | |
| download | nng-bb974dcfa8a22cdf528b6035ab5226f6691f0abf.tar.gz nng-bb974dcfa8a22cdf528b6035ab5226f6691f0abf.tar.bz2 nng-bb974dcfa8a22cdf528b6035ab5226f6691f0abf.zip | |
Fix incorrect attempt to proceed inproc.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/endpt.c | 6 | ||||
| -rw-r--r-- | src/core/pipe.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/endpt.c b/src/core/endpt.c index f221be18..50542d17 100644 --- a/src/core/endpt.c +++ b/src/core/endpt.c @@ -211,8 +211,9 @@ nni_ep_connect_done(void *arg) void * tpipe; nni_pipe * pipe; const nni_tran_pipe *ops; + int rv; - int rv; + ops = ep->ep_tran->tran_pipe; nni_mtx_lock(&ep->ep_mtx); if ((rv = nni_aio_result(aio)) == 0) { @@ -257,7 +258,7 @@ done: static void nni_ep_connect_start(nni_ep *ep) { - nni_aio *aio = &ep->ep_acc_aio; + nni_aio *aio = &ep->ep_con_aio; // Call with the Endpoint lock held. if (ep->ep_closed) { @@ -437,7 +438,6 @@ nni_ep_accept_done(void *arg) } done: - switch (rv) { case 0: pipe->p_tran_ops = *ops; diff --git a/src/core/pipe.c b/src/core/pipe.c index 3d0f96ab..664ababa 100644 --- a/src/core/pipe.c +++ b/src/core/pipe.c @@ -186,7 +186,6 @@ nni_pipe_create(nni_pipe **pp, nni_sock *sock, nni_tran *tran) nni_pipe_destroy(p); return (rv); } - p->p_tran_data = NULL; p->p_proto_data = NULL; p->p_proto_dtor = NULL; |