aboutsummaryrefslogtreecommitdiff
path: root/src/protocol/pair1
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-03-19 16:02:37 -0700
committerGarrett D'Amore <garrett@damore.org>2018-03-20 09:53:58 -0700
commit9ca901c1b70b17d851426483d9f54611cfa8e395 (patch)
treea26b11e16f505ccdc77b5ac6681e0f9de705ff20 /src/protocol/pair1
parent9b886a9999247d87c9f6d389c3e65a4bd39be010 (diff)
downloadnng-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/pair1')
-rw-r--r--src/protocol/pair1/pair.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/protocol/pair1/pair.c b/src/protocol/pair1/pair.c
index b4519221..564118ae 100644
--- a/src/protocol/pair1/pair.c
+++ b/src/protocol/pair1/pair.c
@@ -476,21 +476,26 @@ static nni_proto_pipe_ops pair1_pipe_ops = {
static nni_proto_sock_option pair1_sock_options[] = {
{
.pso_name = NNG_OPT_RAW,
+ .pso_type = NNI_TYPE_BOOL,
.pso_getopt = pair1_sock_getopt_raw,
.pso_setopt = pair1_sock_setopt_raw,
},
{
.pso_name = NNG_OPT_MAXTTL,
+ .pso_type = NNI_TYPE_INT32,
.pso_getopt = pair1_sock_getopt_maxttl,
.pso_setopt = pair1_sock_setopt_maxttl,
},
{
.pso_name = NNG_OPT_PAIR1_POLY,
+ .pso_type = NNI_TYPE_BOOL,
.pso_getopt = pair1_sock_getopt_poly,
.pso_setopt = pair1_sock_setopt_poly,
},
// terminate list
- { NULL, NULL, NULL },
+ {
+ .pso_name = NULL,
+ },
};
static nni_proto_sock_ops pair1_sock_ops = {