diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-01-17 10:04:23 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-01-17 10:14:39 -0800 |
| commit | 99778897f483d6882d5104123e27e95eaac26837 (patch) | |
| tree | a1051fa299ad182a050e3287cd96aea0dad30749 /src/transport/inproc | |
| parent | 02e6153236ae744fb614fcd14184924ec85c2993 (diff) | |
| download | nng-99778897f483d6882d5104123e27e95eaac26837.tar.gz nng-99778897f483d6882d5104123e27e95eaac26837.tar.bz2 nng-99778897f483d6882d5104123e27e95eaac26837.zip | |
fixes #209 NNG_OPT_TLS_VERIFIED is busted
fixes #210 Want NNG_OPT_TLS_* options for TLS transport
fixes #212 Eliminate a_endpt member of aio
Diffstat (limited to 'src/transport/inproc')
| -rw-r--r-- | src/transport/inproc/inproc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c index ae64263c..5b52e80a 100644 --- a/src/transport/inproc/inproc.c +++ b/src/transport/inproc/inproc.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -222,7 +222,7 @@ nni_inproc_ep_fini(void *arg) static void nni_inproc_conn_finish(nni_aio *aio, int rv) { - nni_inproc_ep *ep = aio->a_endpt; + nni_inproc_ep *ep = aio->a_prov_extra[0]; void * pipe; nni_aio_list_remove(aio); @@ -361,6 +361,7 @@ nni_inproc_ep_connect(void *arg, nni_aio *aio) return; } + aio->a_prov_extra[0] = ep; if ((rv = nni_inproc_pipe_init((void *) &aio->a_pipe, ep)) != 0) { nni_aio_finish_error(aio, rv); nni_mtx_unlock(&nni_inproc.mx); @@ -418,6 +419,8 @@ nni_inproc_ep_accept(void *arg, nni_aio *aio) return; } + aio->a_prov_extra[0] = ep; + // We are already on the master list of servers, thanks to bind. if ((rv = nni_inproc_pipe_init((void *) &aio->a_pipe, ep)) != 0) { |