From 45f455064b5704f3d5ed8ecf9f197a18fe72ee59 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 4 Apr 2018 12:37:34 -0700 Subject: fixes #331 replace NNG_OPT_RAW option with constructor This makes the raw mode something that is immutable, determined at socket construction. This is an enabling change for the separate context support coming soon. As a result, this is an API breaking change for users of the raw mode option (NNG_OPT_RAW). There aren't many of them out there. Cooked mode is entirely unaffected. There are changes to tests and documentation included. --- src/protocol/pair0/pair.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'src/protocol/pair0/pair.c') diff --git a/src/protocol/pair0/pair.c b/src/protocol/pair0/pair.c index ccece972..e275e52c 100644 --- a/src/protocol/pair0/pair.c +++ b/src/protocol/pair0/pair.c @@ -36,7 +36,6 @@ struct pair0_sock { pair0_pipe *ppipe; nni_msgq * uwq; nni_msgq * urq; - bool raw; nni_mtx mtx; }; @@ -63,7 +62,6 @@ pair0_sock_init(void **sp, nni_sock *nsock) } nni_mtx_init(&s->mtx); s->ppipe = NULL; - s->raw = false; s->uwq = nni_sock_sendq(nsock); s->urq = nni_sock_recvq(nsock); *sp = s; @@ -231,20 +229,6 @@ pair0_sock_close(void *arg) NNI_ARG_UNUSED(arg); } -static int -pair0_sock_setopt_raw(void *arg, const void *buf, size_t sz, int typ) -{ - pair0_sock *s = arg; - return (nni_copyin_bool(&s->raw, buf, sz, typ)); -} - -static int -pair0_sock_getopt_raw(void *arg, void *buf, size_t *szp, int typ) -{ - pair0_sock *s = arg; - return (nni_copyout_bool(s->raw, buf, szp, typ)); -} - static void pair0_sock_send(void *arg, nni_aio *aio) { @@ -269,12 +253,6 @@ static nni_proto_pipe_ops pair0_pipe_ops = { }; static nni_proto_sock_option pair0_sock_options[] = { - { - .pso_name = NNG_OPT_RAW, - .pso_type = NNI_TYPE_BOOL, - .pso_getopt = pair0_sock_getopt_raw, - .pso_setopt = pair0_sock_setopt_raw, - }, // terminate list { .pso_name = NULL, @@ -301,8 +279,23 @@ static nni_proto pair0_proto = { .proto_pipe_ops = &pair0_pipe_ops, }; +static nni_proto pair0_proto_raw = { + .proto_version = NNI_PROTOCOL_VERSION, + .proto_self = { NNI_PROTO_PAIR_V0, "pair" }, + .proto_peer = { NNI_PROTO_PAIR_V0, "pair" }, + .proto_flags = NNI_PROTO_FLAG_SNDRCV | NNI_PROTO_FLAG_RAW, + .proto_sock_ops = &pair0_sock_ops, + .proto_pipe_ops = &pair0_pipe_ops, +}; + int nng_pair0_open(nng_socket *sidp) { return (nni_proto_open(sidp, &pair0_proto)); } + +int +nng_pair0_open_raw(nng_socket *sidp) +{ + return (nni_proto_open(sidp, &pair0_proto_raw)); +} -- cgit v1.2.3-70-g09d2