diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-01-24 19:26:31 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-01-24 19:42:43 -0800 |
| commit | e88f07b434dbcfdb57435a14e1beadcdae3cef0d (patch) | |
| tree | 79433ae3c4ed6d2501e4d63ad9ada5a621df3bd9 /src/transport/ipc/ipc.c | |
| parent | 907a1eb392ca4b29c62b9cc3d2df1ad337695abf (diff) | |
| download | nng-e88f07b434dbcfdb57435a14e1beadcdae3cef0d.tar.gz nng-e88f07b434dbcfdb57435a14e1beadcdae3cef0d.tar.bz2 nng-e88f07b434dbcfdb57435a14e1beadcdae3cef0d.zip | |
Add endpoint tuning of maxrcv size. Fix cmsg API.
The CMSG handling was completely borked. This is fixed now, and
we stash the SP header size (ugh) in the CMSG contents to match what
nanomsg does. We now pass the cmsg validation test.
We also fixed handling of certain endpoint-related options, so that
endpoints can get options from the socket at initialization time.
This required a minor change to the transport API for endpoints.
Finally, we fixed a critical fault in the REP handling of RAW sockets,
which caused them to always return NNG_ESTATE in all cases. It should
now honor the actual socket option.
Diffstat (limited to 'src/transport/ipc/ipc.c')
| -rw-r--r-- | src/transport/ipc/ipc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c index 3aef5363..4673a6dc 100644 --- a/src/transport/ipc/ipc.c +++ b/src/transport/ipc/ipc.c @@ -26,7 +26,7 @@ struct nni_ipc_pipe { nni_plat_ipcsock fd; uint16_t peer; uint16_t proto; - uint32_t rcvmax; + size_t rcvmax; }; struct nni_ipc_ep { @@ -34,7 +34,7 @@ struct nni_ipc_ep { nni_plat_ipcsock fd; int closed; uint16_t proto; - uint32_t rcvmax; + size_t rcvmax; }; static int @@ -123,7 +123,7 @@ nni_ipc_pipe_recv(void *arg, nni_msg **msgp) } NNI_GET64(buf, len); if (len > pipe->rcvmax) { - return (NNG_EPROTO); + return (NNG_EMSGSIZE); } if ((rv = nng_msg_alloc(&msg, (size_t) len)) != 0) { @@ -176,7 +176,7 @@ nni_ipc_pipe_getopt(void *arg, int option, void *buf, size_t *szp) static int -nni_ipc_ep_init(void **epp, const char *url, uint16_t proto) +nni_ipc_ep_init(void **epp, const char *url, nni_sock *sock) { nni_ipc_ep *ep; int rv; @@ -188,8 +188,8 @@ nni_ipc_ep_init(void **epp, const char *url, uint16_t proto) return (NNG_ENOMEM); } ep->closed = 0; - ep->proto = proto; - ep->rcvmax = 1024 * 1024; // XXX: fix this + ep->proto = nni_sock_proto(sock); + ep->rcvmax = nni_sock_rcvmaxsz(sock); if ((rv = nni_plat_ipc_init(&ep->fd)) != 0) { NNI_FREE_STRUCT(ep); return (rv); |
