From 174e0191ff2cfeeaf434d9119603b675de6807f6 Mon Sep 17 00:00:00 2001 From: Cody Piersall Date: Sun, 16 Dec 2018 10:56:46 -0600 Subject: Allow recv_maxsize to be set after calling listen() on listener. (#747) fixes #724 set recvmaxsize after listen for tcp. --- src/transport/ipc/ipc.c | 4 ++++ src/transport/tcp/tcp.c | 4 ++++ tests/CMakeLists.txt | 1 + tests/set_recvmaxsize.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 tests/set_recvmaxsize.c diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c index 030d6bfe..d6280a69 100644 --- a/src/transport/ipc/ipc.c +++ b/src/transport/ipc/ipc.c @@ -872,8 +872,12 @@ ipctran_ep_set_recvmaxsz(void *arg, const void *v, size_t sz, nni_opt_type t) size_t val; int rv; if ((rv = nni_copyin_size(&val, v, sz, 0, NNI_MAXSZ, t)) == 0) { + ipctran_pipe *p; nni_mtx_lock(&ep->mtx); ep->rcvmax = val; + NNI_LIST_FOREACH (&ep->pipes, p) { + p->rcvmax = val; + } nni_mtx_unlock(&ep->mtx); } return (rv); diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c index fed8872c..be8f6bc3 100644 --- a/src/transport/tcp/tcp.c +++ b/src/transport/tcp/tcp.c @@ -997,8 +997,12 @@ tcptran_ep_set_recvmaxsz(void *arg, const void *v, size_t sz, nni_opt_type t) size_t val; int rv; if ((rv = nni_copyin_size(&val, v, sz, 0, NNI_MAXSZ, t)) == 0) { + tcptran_pipe *p; nni_mtx_lock(&ep->mtx); ep->rcvmax = val; + NNI_LIST_FOREACH (&ep->pipes, p) { + p->rcvmax = val; + } nni_mtx_unlock(&ep->mtx); } return (rv); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fdf0d98b..2755f081 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -162,6 +162,7 @@ add_nng_test(pollfd 5) add_nng_test(reconnect 5) add_nng_test1(resolv 10 NNG_STATIC_LIB) add_nng_test(scalability 20 ON) +add_nng_test(set_recvmaxsize 2) add_nng_test2(sha1 5 NNG_STATIC_LIB NNG_SUPP_SHA1) add_nng_test(sock 5) add_nng_test1(stats 5 NNG_ENABLE_STATS) diff --git a/tests/set_recvmaxsize.c b/tests/set_recvmaxsize.c new file mode 100644 index 00000000..381f77fa --- /dev/null +++ b/tests/set_recvmaxsize.c @@ -0,0 +1,50 @@ +// Copyright 2018 Cody Piersall +// +// This software is supplied under the terms of the MIT License, a +// copy of which should be located in the distribution where this +// file was obtained (LICENSE.txt). A copy of the license may also be +// found online at https://opensource.org/licenses/MIT. +// + +#include "convey.h" + +#include +#include + +#define SNDBUFSIZE 150 +#define RCVBUFSIZE 200 + +const char *addrs[] = { + "inproc:///tmp/inproctmp_setrecvmaxsz", + "ipc:///tmp/ipctemp_setrecvmaxsz", + "tcp://127.0.0.1:43895", + "ws://127.0.0.1:43897", +}; + +TestMain("recvmaxsize", { + // we don't actually care what the content of the message is. + char msg[SNDBUFSIZE]; + char rcvbuf[RCVBUFSIZE]; + size_t rcvsize = RCVBUFSIZE; + nng_socket s0; + nng_socket s1; + nng_listener l; + int numproto = sizeof addrs / sizeof *addrs; + Convey("recvmaxsize can be set after listening", { + for (int i = 0; i < numproto; i++) { + const char *addr = addrs[i]; + So(nng_pair1_open(&s0) == 0); + So(nng_setopt_ms(s0, NNG_OPT_RECVTIMEO, 100) == 0); + So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 200) == 0); + So(nng_listen(s0, addr, &l, 0) == 0); + So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 100) == 0); + + So(nng_pair1_open(&s1) == 0); + So(nng_dial(s1, addr, NULL, 0) == 0); + So(nng_send(s1, msg, 150, 0) == 0); + So(nng_recv(s0, rcvbuf, &rcvsize, 0) == NNG_ETIMEDOUT); + So(nng_close(s0) == 0); + So(nng_close(s1) == 0); + } + }); +}) -- cgit v1.2.3-70-g09d2