From e0b47b12d3d1462d07c5038e4f34f5282eeec675 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 23 Apr 2018 10:38:20 -0700 Subject: fixes #368 context options could be empty --- src/core/socket.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/core') diff --git a/src/core/socket.c b/src/core/socket.c index 5c28dbbb..8a14beb5 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1273,15 +1273,14 @@ nni_ctx_getopt(nni_ctx *ctx, const char *opt, void *v, size_t *szp, int typ) { nni_sock * sock = ctx->c_sock; nni_proto_ctx_option *co; - int rv; + int rv = NNG_ENOTSUP; nni_mtx_lock(&sock->s_mx); if (strcmp(opt, NNG_OPT_RECVTIMEO) == 0) { rv = nni_copyout_ms(ctx->c_rcvtimeo, v, szp, typ); } else if (strcmp(opt, NNG_OPT_SENDTIMEO) == 0) { rv = nni_copyout_ms(ctx->c_sndtimeo, v, szp, typ); - } else { - rv = NNG_ENOTSUP; + } else if (ctx->c_ops.ctx_options != NULL) { for (co = ctx->c_ops.ctx_options; co->co_name != NULL; co++) { if (strcmp(opt, co->co_name) != 0) { continue; @@ -1294,7 +1293,6 @@ nni_ctx_getopt(nni_ctx *ctx, const char *opt, void *v, size_t *szp, int typ) break; } } - nni_mtx_unlock(&sock->s_mx); return (rv); } @@ -1305,15 +1303,14 @@ nni_ctx_setopt( { nni_sock * sock = ctx->c_sock; nni_proto_ctx_option *co; - int rv; + int rv = NNG_ENOTSUP; nni_mtx_lock(&sock->s_mx); if (strcmp(opt, NNG_OPT_RECVTIMEO) == 0) { rv = nni_copyin_ms(&ctx->c_rcvtimeo, v, sz, typ); } else if (strcmp(opt, NNG_OPT_SENDTIMEO) == 0) { rv = nni_copyin_ms(&ctx->c_sndtimeo, v, sz, typ); - } else { - rv = NNG_ENOTSUP; + } else if (ctx->c_ops.ctx_options != NULL) { for (co = ctx->c_ops.ctx_options; co->co_name != NULL; co++) { if (strcmp(opt, co->co_name) != 0) { continue; -- cgit v1.2.3-70-g09d2