diff options
| author | Garrett D'Amore <garrett@damore.org> | 2019-01-21 22:40:10 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2019-02-16 19:22:27 -0800 |
| commit | 5cf750697624d4fd63cfe26921209d7c30e1a2d2 (patch) | |
| tree | bf11695e5f1ec5e400c87da0cc6ff23935a2eeff /src/platform/posix/posix_ipc.h | |
| parent | ca655b9db689ee0e655248b1a9f166b8db6cc984 (diff) | |
| download | nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.tar.gz nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.tar.bz2 nng-5cf750697624d4fd63cfe26921209d7c30e1a2d2.zip | |
fixes #872 create unified nng_stream API
This is a major change, and includes changes to use a polymorphic
stream API for all transports. There have been related bugs fixed
along the way. Additionally the man pages have changed.
The old non-polymorphic APIs are removed now. This is a breaking
change, but the old APIs were never part of any released public API.
Diffstat (limited to 'src/platform/posix/posix_ipc.h')
| -rw-r--r-- | src/platform/posix/posix_ipc.h | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/platform/posix/posix_ipc.h b/src/platform/posix/posix_ipc.h index bbe11f0d..f570b172 100644 --- a/src/platform/posix/posix_ipc.h +++ b/src/platform/posix/posix_ipc.h @@ -1,7 +1,7 @@ // // Copyright 2019 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> -// Copyright 2018 Devolutions <info@devolutions.net> +// Copyright 2019 Devolutions <info@devolutions.net> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -10,6 +10,7 @@ // #include "core/nng_impl.h" +#include "core/stream.h" #ifdef NNG_PLATFORM_POSIX #include "platform/posix/posix_aio.h" @@ -17,6 +18,7 @@ #include <sys/types.h> // For mode_t struct nni_ipc_conn { + nng_stream stream; nni_posix_pfd * pfd; nni_list readq; nni_list writeq; @@ -24,27 +26,17 @@ struct nni_ipc_conn { nni_mtx mtx; nni_aio * dial_aio; nni_ipc_dialer *dialer; - nni_reap_item reap; }; struct nni_ipc_dialer { - nni_list connq; // pending connections - bool closed; - nni_mtx mtx; + nng_stream_dialer sd; + nni_list connq; // pending connections + bool closed; + nni_mtx mtx; + nng_sockaddr sa; }; -struct nni_ipc_listener { - nni_posix_pfd *pfd; - nng_sockaddr sa; - nni_list acceptq; - bool started; - bool closed; - char * path; - mode_t perms; - nni_mtx mtx; -}; - -extern int nni_posix_ipc_conn_init(nni_ipc_conn **, nni_posix_pfd *); -extern void nni_posix_ipc_conn_start(nni_ipc_conn *); +extern int nni_posix_ipc_init(nni_ipc_conn **, nni_posix_pfd *); +extern void nni_posix_ipc_start(nni_ipc_conn *); #endif // NNG_PLATFORM_POSIX |