aboutsummaryrefslogtreecommitdiff
path: root/src/protocol/pair1
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-04-04 11:07:56 -0700
committerGarrett D'Amore <garrett@damore.org>2018-04-04 11:07:56 -0700
commit505a9bce029e51540739c853a6c9eef0ecfb2e90 (patch)
treed907679b6ab99bcb5da919db3d005d4976590c21 /src/protocol/pair1
parent0aa1de1316b46bb4af23fdf26759bca08008eaf5 (diff)
downloadnng-505a9bce029e51540739c853a6c9eef0ecfb2e90.tar.gz
nng-505a9bce029e51540739c853a6c9eef0ecfb2e90.tar.bz2
nng-505a9bce029e51540739c853a6c9eef0ecfb2e90.zip
fixes #329 type checking not done for setopt
Diffstat (limited to 'src/protocol/pair1')
-rw-r--r--src/protocol/pair1/pair.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/protocol/pair1/pair.c b/src/protocol/pair1/pair.c
index ee67cf7b..becbbfa7 100644
--- a/src/protocol/pair1/pair.c
+++ b/src/protocol/pair1/pair.c
@@ -397,12 +397,12 @@ pair1_sock_close(void *arg)
}
static int
-pair1_sock_setopt_raw(void *arg, const void *buf, size_t sz)
+pair1_sock_setopt_raw(void *arg, const void *buf, size_t sz, int typ)
{
pair1_sock *s = arg;
int rv;
nni_mtx_lock(&s->mtx);
- rv = s->started ? NNG_ESTATE : nni_setopt_bool(&s->raw, buf, sz);
+ rv = s->started ? NNG_ESTATE : nni_copyin_bool(&s->raw, buf, sz, typ);
nni_mtx_unlock(&s->mtx);
return (rv);
}
@@ -415,12 +415,12 @@ pair1_sock_getopt_raw(void *arg, void *buf, size_t *szp, int typ)
}
static int
-pair1_sock_setopt_maxttl(void *arg, const void *buf, size_t sz)
+pair1_sock_setopt_maxttl(void *arg, const void *buf, size_t sz, int typ)
{
pair1_sock *s = arg;
int rv;
nni_mtx_lock(&s->mtx); // Have to be locked against recv cb.
- rv = nni_setopt_int(&s->ttl, buf, sz, 1, 255);
+ rv = nni_copyin_int(&s->ttl, buf, sz, 1, 255, typ);
nni_mtx_unlock(&s->mtx);
return (rv);
}
@@ -433,12 +433,12 @@ pair1_sock_getopt_maxttl(void *arg, void *buf, size_t *szp, int typ)
}
static int
-pair1_sock_setopt_poly(void *arg, const void *buf, size_t sz)
+pair1_sock_setopt_poly(void *arg, const void *buf, size_t sz, int typ)
{
pair1_sock *s = arg;
int rv;
nni_mtx_lock(&s->mtx);
- rv = s->started ? NNG_ESTATE : nni_setopt_bool(&s->poly, buf, sz);
+ rv = s->started ? NNG_ESTATE : nni_copyin_bool(&s->poly, buf, sz, typ);
nni_mtx_unlock(&s->mtx);
return (rv);
}