From d64f12553eb6ceb67ed6f6a5b2ceb6c061d375ba Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 8 Aug 2017 21:19:09 -0700 Subject: fixes #44 open protocol by "name" (symbol) instead number fixes #38 Make protocols "pluggable", or at least optional This is a breaking change, as we've done away with the central registered list of protocols, and instead demand the user call nng_xxx_open() where xxx is a protocol name. (We did keep a table around in the compat framework though.) There is a nice way for protocols to plug in via an nni_proto_open(), where they can use a generic constructor that they use to build a protocol specific constructor (passing their ops vector in.) --- src/protocol/pubsub/pub.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/protocol/pubsub/pub.c') diff --git a/src/protocol/pubsub/pub.c b/src/protocol/pubsub/pub.c index e32f179a..161a5d79 100644 --- a/src/protocol/pubsub/pub.c +++ b/src/protocol/pubsub/pub.c @@ -97,6 +97,14 @@ nni_pub_sock_open(void *arg) nni_msgq_aio_get(pub->uwq, &pub->aio_getq); } +static void +nni_pub_sock_close(void *arg) +{ + nni_pub_sock *pub = arg; + + nni_aio_cancel(&pub->aio_getq, NNG_ECLOSED); +} + static void nni_pub_pipe_fini(void *arg) { @@ -319,15 +327,22 @@ nni_proto_sock_ops nni_pub_sock_ops = { .sock_init = nni_pub_sock_init, .sock_fini = nni_pub_sock_fini, .sock_open = nni_pub_sock_open, + .sock_close = nni_pub_sock_close, .sock_setopt = nni_pub_sock_setopt, .sock_getopt = nni_pub_sock_getopt, }; nni_proto nni_pub_proto = { - .proto_self = NNG_PROTO_PUB, - .proto_peer = NNG_PROTO_SUB, - .proto_name = "pub", + .proto_version = NNI_PROTOCOL_VERSION, + .proto_self = { NNG_PROTO_PUB_V0, "pub" }, + .proto_peer = { NNG_PROTO_SUB_V0, "sub" }, .proto_flags = NNI_PROTO_FLAG_SND, .proto_sock_ops = &nni_pub_sock_ops, .proto_pipe_ops = &nni_pub_pipe_ops, }; + +int +nng_pub0_open(nng_socket *sidp) +{ + return (nni_proto_open(sidp, &nni_pub_proto)); +} -- cgit v1.2.3-70-g09d2