diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-19 16:02:37 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-20 09:53:58 -0700 |
| commit | 9ca901c1b70b17d851426483d9f54611cfa8e395 (patch) | |
| tree | a26b11e16f505ccdc77b5ac6681e0f9de705ff20 /src/protocol/reqrep0 | |
| parent | 9b886a9999247d87c9f6d389c3e65a4bd39be010 (diff) | |
| download | nng-9ca901c1b70b17d851426483d9f54611cfa8e395.tar.gz nng-9ca901c1b70b17d851426483d9f54611cfa8e395.tar.bz2 nng-9ca901c1b70b17d851426483d9f54611cfa8e395.zip | |
fixes #296 Typed options should validate option type
fixes #302 nng_dialer/listener/pipe_getopt_sockaddr desired
This adds plumbing to pass and check the type of options
all the way through.
NNG_ZT_OPT_ORBIT is type UINT64, but you can use the untyped form to
pass two of them if needed.
No typed access for retrieving strings yet. I think this should allocate
a pointer and copy that out, but that's for later.
Diffstat (limited to 'src/protocol/reqrep0')
| -rw-r--r-- | src/protocol/reqrep0/rep.c | 6 | ||||
| -rw-r--r-- | src/protocol/reqrep0/req.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/protocol/reqrep0/rep.c b/src/protocol/reqrep0/rep.c index 9906de4b..429d55e7 100644 --- a/src/protocol/reqrep0/rep.c +++ b/src/protocol/reqrep0/rep.c @@ -476,16 +476,20 @@ static nni_proto_pipe_ops rep0_pipe_ops = { static nni_proto_sock_option rep0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = rep0_sock_getopt_raw, .pso_setopt = rep0_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = rep0_sock_getopt_maxttl, .pso_setopt = rep0_sock_setopt_maxttl, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops rep0_sock_ops = { diff --git a/src/protocol/reqrep0/req.c b/src/protocol/reqrep0/req.c index d87a5d1f..63ae07a0 100644 --- a/src/protocol/reqrep0/req.c +++ b/src/protocol/reqrep0/req.c @@ -629,21 +629,26 @@ static nni_proto_pipe_ops req0_pipe_ops = { static nni_proto_sock_option req0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = req0_sock_getopt_raw, .pso_setopt = req0_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = req0_sock_getopt_maxttl, .pso_setopt = req0_sock_setopt_maxttl, }, { .pso_name = NNG_OPT_REQ_RESENDTIME, + .pso_type = NNI_TYPE_DURATION, .pso_getopt = req0_sock_getopt_resendtime, .pso_setopt = req0_sock_setopt_resendtime, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops req0_sock_ops = { |