Eliminate legacy option settings, provide easier option IDs.

This eliminates all the old #define's or enum values, making all
option IDs now totally dynamic, and providing well-known string
values for well-behaved applications.

We have added tests of some of these options, including lookups, and
so forth.  We have also fixed a few problems; including at least
one crasher bug when the timeouts on reconnect were zero.

Protocol specific options are now handled in the protocol.  We will
be moving the initialization for a few of those well known entities
to the protocol startup code, following the PAIRv1 pattern, later.

Applications must therefore not depend on the value of the integer IDs,
at least until the application has opened a socket of the appropriate
type.

22 files changed, 410 insertions, 521 deletions

diff --git a/src/core/aio.c b/src/core/aio.c
index 5b8c7970..ee5724a6 100644
--- a/src/core/aio.c
+++ b/src/core/aio.c
@@ -171,7 +171,8 @@ nni_aio_finish_impl(
 {
 	nni_mtx_lock(&nni_aio_lk);
 
-	NNI_ASSERT(aio->a_pend == 0); // provider only calls us *once*
+	// provider only calls us *once*, but expiration may be in flight
+	NNI_ASSERT(aio->a_expiring || aio->a_pend == 0);
 
 	nni_list_node_remove(&aio->a_expire_node);
 	aio->a_pend        = 1;
diff --git a/src/core/device.c b/src/core/device.c
index bdfcf0a6..e7140664 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -90,10 +91,10 @@ nni_device(nni_sock *sock1, nni_sock *sock2)
 
 	// No timeouts.
 	sz = sizeof(never);
-	if ((nni_sock_setopt(sock1, NNG_OPT_RCVTIMEO, &never, sz) != 0) ||
-	    (nni_sock_setopt(sock2, NNG_OPT_RCVTIMEO, &never, sz) != 0) ||
-	    (nni_sock_setopt(sock1, NNG_OPT_SNDTIMEO, &never, sz) != 0) ||
-	    (nni_sock_setopt(sock2, NNG_OPT_SNDTIMEO, &never, sz) != 0)) {
+	if ((nni_sock_setopt(sock1, nng_optid_recvtimeo, &never, sz) != 0) ||
+	    (nni_sock_setopt(sock2, nng_optid_recvtimeo, &never, sz) != 0) ||
+	    (nni_sock_setopt(sock1, nng_optid_sendtimeo, &never, sz) != 0) ||
+	    (nni_sock_setopt(sock2, nng_optid_sendtimeo, &never, sz) != 0)) {
 		// This should never happen.
 		rv = NNG_EINVAL;
 		goto out;
diff --git a/src/core/endpt.c b/src/core/endpt.c
index 5b56b784..10608575 100644
--- a/src/core/endpt.c
+++ b/src/core/endpt.c
@@ -320,7 +320,8 @@ nni_ep_tmo_start(nni_ep *ep)
 	// have a statistically perfect distribution with the modulo of
 	// the random number, but this really doesn't matter.
 
-	ep->ep_tmo_aio.a_expire = nni_clock() + (nni_random() % backoff);
+	ep->ep_tmo_aio.a_expire =
+	    nni_clock() + (backoff ? nni_random() % backoff : 0);
 	nni_aio_start(&ep->ep_tmo_aio, nni_ep_tmo_cancel, ep);
 }
 
diff --git a/src/core/options.c b/src/core/options.c
index bdbcaaba..7a5de33d 100644
--- a/src/core/options.c
+++ b/src/core/options.c
@@ -340,6 +340,20 @@ nni_option_register(const char *name, int *idp)
 	return (0);
 }
 
+void
+nni_option_sys_fini(void)
+{
+	if (nni_option_nextid != 0) {
+		nni_option *opt;
+		while ((opt = nni_list_first(&nni_options)) != NULL) {
+			nni_list_remove(&nni_options, opt);
+			nni_free(opt->o_name, strlen(opt->o_name) + 1);
+			NNI_FREE_STRUCT(opt);
+		}
+	}
+	nni_option_nextid = 0;
+}
+
 int
 nni_option_sys_init(void)
 {
@@ -348,52 +362,32 @@ nni_option_sys_init(void)
 	nni_option_nextid = 0x10000;
 	int rv;
 
+#define OPT_REGISTER(o) nni_option_register(nng_opt_##o, &nng_optid_##o)
 	// Register our well-known options.
-	if (((rv = nni_option_set_id("raw", NNG_OPT_RAW)) != 0) ||
-	    ((rv = nni_option_set_id("linger", NNG_OPT_LINGER)) != 0) ||
-	    ((rv = nni_option_set_id("recv-buf", NNG_OPT_RCVBUF)) != 0) ||
-	    ((rv = nni_option_set_id("send-buf", NNG_OPT_SNDBUF)) != 0) ||
-	    ((rv = nni_option_set_id("recv-timeout", NNG_OPT_RCVTIMEO)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("send-timeout", NNG_OPT_SNDTIMEO)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("reconnect-time", NNG_OPT_RECONN_TIME)) !=
-	        0) ||
-	    ((rv = nni_option_set_id(
-	          "reconnect-max-time", NNG_OPT_RECONN_MAXTIME)) != 0) ||
-	    ((rv = nni_option_set_id("recv-max-size", NNG_OPT_RCVMAXSZ)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("max-ttl", NNG_OPT_MAXTTL)) != 0) ||
-	    ((rv = nni_option_set_id("protocol", NNG_OPT_PROTOCOL)) != 0) ||
-	    ((rv = nni_option_set_id("subscribe", NNG_OPT_SUBSCRIBE)) != 0) ||
-	    ((rv = nni_option_set_id("unsubscribe", NNG_OPT_UNSUBSCRIBE)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("survey-time", NNG_OPT_SURVEYTIME)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("resend-time", NNG_OPT_RESENDTIME)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("transport", NNG_OPT_TRANSPORT)) != 0) ||
-	    ((rv = nni_option_set_id("local-addr", NNG_OPT_LOCALADDR)) != 0) ||
-	    ((rv = nni_option_set_id("remote-addr", NNG_OPT_REMOTEADDR)) !=
-	        0) ||
-	    ((rv = nni_option_set_id("recv-fd", NNG_OPT_RCVFD)) != 0) ||
-	    ((rv = nni_option_set_id("send-fd", NNG_OPT_SNDFD)) != 0)) {
+	if (((rv = OPT_REGISTER(raw)) != 0) ||
+	    ((rv = OPT_REGISTER(linger)) != 0) ||
+	    ((rv = OPT_REGISTER(recvbuf)) != 0) ||
+	    ((rv = OPT_REGISTER(sendbuf)) != 0) ||
+	    ((rv = OPT_REGISTER(recvtimeo)) != 0) ||
+	    ((rv = OPT_REGISTER(sendtimeo)) != 0) ||
+	    ((rv = OPT_REGISTER(reconnmint)) != 0) ||
+	    ((rv = OPT_REGISTER(reconnmaxt)) != 0) ||
+	    ((rv = OPT_REGISTER(recvmaxsz)) != 0) ||
+	    ((rv = OPT_REGISTER(maxttl)) != 0) ||
+	    ((rv = OPT_REGISTER(protocol)) != 0) ||
+	    ((rv = OPT_REGISTER(transport)) != 0) ||
+	    ((rv = OPT_REGISTER(locaddr)) != 0) ||
+	    ((rv = OPT_REGISTER(remaddr)) != 0) ||
+	    ((rv = OPT_REGISTER(recvfd)) != 0) ||
+	    ((rv = OPT_REGISTER(sendfd)) != 0) ||
+	    ((rv = OPT_REGISTER(req_resendtime)) != 0) ||
+	    ((rv = OPT_REGISTER(sub_subscribe)) != 0) ||
+	    ((rv = OPT_REGISTER(sub_unsubscribe)) != 0) ||
+	    ((rv = OPT_REGISTER(surveyor_surveytime)) != 0)) {
 		nni_option_sys_fini();
 		return (rv);
 	}
+#undef OPT_REGISTER
+
 	return (0);
 }
-
-void
-nni_option_sys_fini(void)
-{
-	if (nni_option_nextid != 0) {
-		nni_option *opt;
-		while ((opt = nni_list_first(&nni_options)) != NULL) {
-			nni_list_remove(&nni_options, opt);
-			nni_free(opt->o_name, strlen(opt->o_name) + 1);
-			NNI_FREE_STRUCT(opt);
-		}
-	}
-	nni_option_nextid = 0;
-}
\ No newline at end of file
diff --git a/src/core/socket.c b/src/core/socket.c
index 765a6d0c..be1c2d96 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -362,17 +362,17 @@ nni_sock_create(nni_sock **sp, const nni_proto *proto)
 	if (((rv = nni_msgq_init(&s->s_uwq, 0)) != 0) ||
 	    ((rv = nni_msgq_init(&s->s_urq, 0)) != 0) ||
 	    ((rv = s->s_sock_ops.sock_init(&s->s_data, s)) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_LINGER, &s->s_linger,
+	    ((rv = nni_sock_setopt(s, nng_optid_linger, &s->s_linger,
 	          sizeof(nni_duration))) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_SNDTIMEO, &s->s_sndtimeo,
+	    ((rv = nni_sock_setopt(s, nng_optid_sendtimeo, &s->s_sndtimeo,
 	          sizeof(nni_duration))) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_RCVTIMEO, &s->s_rcvtimeo,
+	    ((rv = nni_sock_setopt(s, nng_optid_recvtimeo, &s->s_rcvtimeo,
 	          sizeof(nni_duration))) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_RECONN_TIME, &s->s_reconn,
+	    ((rv = nni_sock_setopt(s, nng_optid_reconnmint, &s->s_reconn,
 	          sizeof(nni_duration))) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_RECONN_MAXTIME, &s->s_reconnmax,
+	    ((rv = nni_sock_setopt(s, nng_optid_reconnmaxt, &s->s_reconnmax,
 	          sizeof(nni_duration))) != 0) ||
-	    ((rv = nni_sock_setopt(s, NNG_OPT_RCVMAXSZ, &s->s_rcvmaxsz,
+	    ((rv = nni_sock_setopt(s, nng_optid_recvmaxsz, &s->s_rcvmaxsz,
 	          sizeof(size_t))) != 0)) {
 		nni_sock_destroy(s);
 		return (rv);
@@ -807,26 +807,18 @@ nni_sock_setopt(nni_sock *s, int opt, const void *val, size_t size)
 
 	// Some options do not go down to transports.  Handle them
 	// directly.
-	switch (opt) {
-	case NNG_OPT_RECONN_TIME:
+	if (opt == nng_optid_reconnmint) {
 		rv = nni_setopt_usec(&s->s_reconn, val, size);
-		break;
-	case NNG_OPT_RECONN_MAXTIME:
+	} else if (opt == nng_optid_reconnmaxt) {
 		rv = nni_setopt_usec(&s->s_reconnmax, val, size);
-		break;
-	case NNG_OPT_SNDBUF:
+	} else if (opt == nng_optid_sendbuf) {
 		rv = nni_setopt_buf(s->s_uwq, val, size);
-		break;
-	case NNG_OPT_RCVBUF:
+	} else if (opt == nng_optid_recvbuf) {
 		rv = nni_setopt_buf(s->s_urq, val, size);
-		break;
-	case NNG_OPT_SNDFD:
-	case NNG_OPT_RCVFD:
-	case NNG_OPT_LOCALADDR:
-	case NNG_OPT_REMOTEADDR:
+	} else if ((opt == nng_optid_sendfd) || (opt == nng_optid_recvfd) ||
+	    (opt == nng_optid_locaddr) || (opt == nng_optid_remaddr)) {
 		// these options can be read, but cannot be set
 		rv = NNG_EINVAL;
-		break;
 	}
 
 	nni_mtx_unlock(&s->s_mx);
@@ -845,21 +837,14 @@ nni_sock_setopt(nni_sock *s, int opt, const void *val, size_t size)
 	// check was found, or even if a transport rejected one of the
 	// settings.
 	if ((rv == NNG_ENOTSUP) || (rv == 0)) {
-		switch (opt) {
-		case NNG_OPT_LINGER:
-			rv = nni_chkopt_usec(val, size);
-			break;
-		case NNG_OPT_SNDTIMEO:
+		if ((opt == nng_optid_linger) ||
+		    (opt == nng_optid_sendtimeo) ||
+		    (opt == nng_optid_recvtimeo)) {
 			rv = nni_chkopt_usec(val, size);
-			break;
-		case NNG_OPT_RCVTIMEO:
-			rv = nni_chkopt_usec(val, size);
-			break;
-		case NNG_OPT_RCVMAXSZ:
+		} else if (opt == nng_optid_recvmaxsz) {
 			// just a sanity test on the size; it also ensures that
 			// a size can be set even with no transport configured.
 			rv = nni_chkopt_size(val, size, 0, NNI_MAXSZ);
-			break;
 		}
 	}
 
@@ -913,16 +898,13 @@ nni_sock_setopt(nni_sock *s, int opt, const void *val, size_t size)
 	// For some options, which also have an impact on the socket
 	// behavior, we save a local value.  Note that the transport
 	// will already have had a chance to veto this.
-	switch (opt) {
-	case NNG_OPT_LINGER:
+
+	if (opt == nng_optid_linger) {
 		rv = nni_setopt_usec(&s->s_linger, val, size);
-		break;
-	case NNG_OPT_SNDTIMEO:
+	} else if (opt == nng_optid_sendtimeo) {
 		rv = nni_setopt_usec(&s->s_sndtimeo, val, size);
-		break;
-	case NNG_OPT_RCVTIMEO:
+	} else if (opt == nng_optid_recvtimeo) {
 		rv = nni_setopt_usec(&s->s_rcvtimeo, val, size);
-		break;
 	}
 
 	if (rv == 0) {
@@ -965,26 +947,19 @@ nni_sock_getopt(nni_sock *s, int opt, void *val, size_t *szp)
 
 	// Options that are handled by socket core, and never
 	// passed down.
-	switch (opt) {
-	case NNG_OPT_RECONN_TIME:
-		rv = nni_getopt_usec(&s->s_reconn, val, szp);
-		break;
-	case NNG_OPT_RECONN_MAXTIME:
-		rv = nni_getopt_usec(&s->s_reconnmax, val, szp);
-		break;
-	case NNG_OPT_SNDBUF:
+	if (opt == nng_optid_sendbuf) {
 		rv = nni_getopt_buf(s->s_uwq, val, szp);
-		break;
-	case NNG_OPT_RCVBUF:
+	} else if (opt == nng_optid_recvbuf) {
 		rv = nni_getopt_buf(s->s_urq, val, szp);
-		break;
-	case NNG_OPT_SNDFD:
+	} else if (opt == nng_optid_sendfd) {
 		rv = nni_getopt_fd(s, &s->s_send_fd, NNG_EV_CAN_SND, val, szp);
-		break;
-	case NNG_OPT_RCVFD:
+	} else if (opt == nng_optid_recvfd) {
 		rv = nni_getopt_fd(s, &s->s_recv_fd, NNG_EV_CAN_RCV, val, szp);
-		break;
-	default:
+	} else if (opt == nng_optid_reconnmint) {
+		rv = nni_getopt_usec(&s->s_reconn, val, szp);
+	} else if (opt == nng_optid_reconnmaxt) {
+		rv = nni_getopt_usec(&s->s_reconnmax, val, szp);
+	} else {
 		NNI_LIST_FOREACH (&s->s_options, sopt) {
 			if (sopt->opt == opt) {
 				size_t sz = sopt->sz;
@@ -997,7 +972,6 @@ nni_sock_getopt(nni_sock *s, int opt, void *val, size_t *szp)
 				break;
 			}
 		}
-		break;
 	}
 	nni_mtx_unlock(&s->s_mx);
 	return (rv);
diff --git a/src/nng.c b/src/nng.c
index 191c83fb..ca686686 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -881,12 +881,14 @@ nng_msg_getopt(nng_msg *msg, int opt, void *ptr, size_t *szp)
 int
 nng_option_lookup(const char *name)
 {
+	(void) nni_init();
 	return (nni_option_lookup(name));
 }
 
 const char *
 nng_option_name(int id)
 {
+	(void) nni_init();
 	return (nni_option_name(id));
 }
 
@@ -990,3 +992,49 @@ nng_thread_destroy(void *arg)
 
 	NNI_FREE_STRUCT(thr);
 }
+
+// Constant option definitions.  These are for well-known options,
+// so that the vast majority of consumers don't have to look these up.
+
+const char *nng_opt_raw        = "raw";
+const char *nng_opt_linger     = "linger";
+const char *nng_opt_recvbuf    = "recv-buffer";
+const char *nng_opt_sendbuf    = "send-buffer";
+const char *nng_opt_recvtimeo  = "recv-timeout";
+const char *nng_opt_sendtimeo  = "send-timeout";
+const char *nng_opt_recvmaxsz  = "recv-size-max";
+const char *nng_opt_reconnmint = "reconnect-time-min";
+const char *nng_opt_reconnmaxt = "reconnect-time-min";
+const char *nng_opt_maxttl     = "ttl-max";
+const char *nng_opt_protocol   = "protocol";
+const char *nng_opt_transport  = "transport";
+const char *nng_opt_recvfd     = "recv-fd";
+const char *nng_opt_sendfd     = "send-fd";
+const char *nng_opt_locaddr    = "local-address";
+const char *nng_opt_remaddr    = "remote-address";
+// Well known protocol options.
+const char *nng_opt_req_resendtime      = "req:resend-time";
+const char *nng_opt_sub_subscribe       = "sub:subscribe";
+const char *nng_opt_sub_unsubscribe     = "sub:unsubscribe";
+const char *nng_opt_surveyor_surveytime = "surveyor:survey-time";
+
+int nng_optid_raw;
+int nng_optid_linger;
+int nng_optid_recvbuf;
+int nng_optid_sendbuf;
+int nng_optid_recvtimeo;
+int nng_optid_sendtimeo;
+int nng_optid_recvmaxsz;
+int nng_optid_reconnmint;
+int nng_optid_reconnmaxt;
+int nng_optid_maxttl;
+int nng_optid_protocol;
+int nng_optid_transport;
+int nng_optid_recvfd;
+int nng_optid_sendfd;
+int nng_optid_locaddr;
+int nng_optid_remaddr;
+int nng_optid_req_resendtime;
+int nng_optid_sub_subscribe;
+int nng_optid_sub_unsubscribe;
+int nng_optid_surveyor_surveytime;
diff --git a/src/nng.h b/src/nng.h
index e7d7fe2f..77a585cd 100644
--- a/src/nng.h
+++ b/src/nng.h
@@ -403,29 +403,50 @@ NNG_DECL int nng_respondent0_open(nng_socket *);
 #define NNG_OPT_SOCKET(c) (c)
 #define NNG_OPT_TRANSPORT_OPT(t, c) (0x10000 | ((t) << 16) | (c))
 
-enum nng_opt_enum {
-	NNG_OPT_RAW            = NNG_OPT_SOCKET(0),
-	NNG_OPT_LINGER         = NNG_OPT_SOCKET(1),
-	NNG_OPT_RCVBUF         = NNG_OPT_SOCKET(2),
-	NNG_OPT_SNDBUF         = NNG_OPT_SOCKET(3),
-	NNG_OPT_RCVTIMEO       = NNG_OPT_SOCKET(4),
-	NNG_OPT_SNDTIMEO       = NNG_OPT_SOCKET(5),
-	NNG_OPT_RECONN_TIME    = NNG_OPT_SOCKET(6),
-	NNG_OPT_RECONN_MAXTIME = NNG_OPT_SOCKET(7),
-	NNG_OPT_RCVMAXSZ       = NNG_OPT_SOCKET(8),
-	NNG_OPT_MAXTTL         = NNG_OPT_SOCKET(9),
-	NNG_OPT_PROTOCOL       = NNG_OPT_SOCKET(10),
-	NNG_OPT_SUBSCRIBE      = NNG_OPT_SOCKET(11),
-	NNG_OPT_UNSUBSCRIBE    = NNG_OPT_SOCKET(12),
-	NNG_OPT_SURVEYTIME     = NNG_OPT_SOCKET(13),
-	NNG_OPT_RESENDTIME     = NNG_OPT_SOCKET(14),
-	NNG_OPT_TRANSPORT      = NNG_OPT_SOCKET(15),
-	NNG_OPT_LOCALADDR      = NNG_OPT_SOCKET(16),
-	NNG_OPT_REMOTEADDR     = NNG_OPT_SOCKET(17),
-	NNG_OPT_RCVFD          = NNG_OPT_SOCKET(18),
-	NNG_OPT_SNDFD          = NNG_OPT_SOCKET(19),
-};
-
+extern const char *nng_opt_raw;
+extern const char *nng_opt_linger;
+extern const char *nng_opt_recvbuf;
+extern const char *nng_opt_sendbuf;
+extern const char *nng_opt_recvtimeo;
+extern const char *nng_opt_sendtimeo;
+extern const char *nng_opt_recvmaxsz;
+extern const char *nng_opt_reconnmint;
+extern const char *nng_opt_reconnmaxt;
+extern const char *nng_opt_maxttl;
+extern const char *nng_opt_protocol;
+extern const char *nng_opt_transport;
+extern const char *nng_opt_recvfd;
+extern const char *nng_opt_sendfd;
+extern const char *nng_opt_locaddr;
+extern const char *nng_opt_remaddr;
+extern const char *nng_opt_req_resendtime;
+extern const char *nng_opt_sub_subscribe;
+extern const char *nng_opt_sub_unsubscribe;
+extern const char *nng_opt_surveyor_surveytime;
+
+extern int nng_optid_raw;
+extern int nng_optid_linger;
+extern int nng_optid_recvbuf;
+extern int nng_optid_sendbuf;
+extern int nng_optid_recvtimeo;
+extern int nng_optid_sendtimeo;
+extern int nng_optid_recvmaxsz;
+extern int nng_optid_reconnmint;
+extern int nng_optid_reconnmaxt;
+extern int nng_optid_maxttl;
+extern int nng_optid_protocol;
+extern int nng_optid_transport;
+extern int nng_optid_recvfd;
+extern int nng_optid_sendfd;
+extern int nng_optid_locaddr;
+extern int nng_optid_remaddr;
+
+// These protocol specific options may not be valid until a socket of
+// the given protocol is opened!
+extern int nng_optid_req_resendtime;
+extern int nng_optid_sub_subscribe;
+extern int nng_optid_sub_unsubscribe;
+extern int nng_optid_surveyor_surveytime;
 // XXX: TBD: priorities, socket names, ipv4only
 
 // Statistics.  These are for informational purposes only, and subject
diff --git a/src/nng_compat.c b/src/nng_compat.c
index bb0c9faa..a6a558f5 100644
--- a/src/nng_compat.c
+++ b/src/nng_compat.c
@@ -133,9 +133,7 @@ nn_socket(int domain, int protocol)
 		return (-1);
 	}
 	if (domain == AF_SP_RAW) {
-		int raw = 1;
-		rv      = nng_setopt(sock, NNG_OPT_RAW, &raw, sizeof(raw));
-		if (rv != 0) {
+		if ((rv = nng_setopt_int(sock, nng_optid_raw, 1)) != 0) {
 			nn_seterror(rv);
 			nng_close(sock);
 			return (-1);
@@ -566,106 +564,136 @@ nn_sendmsg(int s, const struct nn_msghdr *mh, int flags)
 	return ((int) sz);
 }
 
+// options which we convert -- most of the array is initialized at run time.
+static struct {
+	int nnlevel;
+	int nnopt;
+	int opt;
+	int mscvt;
+} options[] = {
+	// clang-format off
+	{ NN_SOL_SOCKET, NN_LINGER }, // review
+	{ NN_SOL_SOCKET, NN_SNDBUF },
+	{ NN_SOL_SOCKET, NN_RCVBUF } ,
+	{ NN_SOL_SOCKET, NN_RECONNECT_IVL },
+	{ NN_SOL_SOCKET, NN_RECONNECT_IVL_MAX },
+	{ NN_SOL_SOCKET, NN_SNDFD },
+	{ NN_SOL_SOCKET, NN_RCVFD },
+	{ NN_SOL_SOCKET, NN_RCVMAXSIZE },
+	{ NN_SOL_SOCKET, NN_MAXTTL },
+	{ NN_SOL_SOCKET, NN_RCVTIMEO },
+	{ NN_SOL_SOCKET, NN_SNDTIMEO },
+	{ NN_REQ, NN_REQ_RESEND_IVL },
+	{ NN_SUB, NN_SUB_SUBSCRIBE },
+	{ NN_SUB, NN_SUB_UNSUBSCRIBE },
+	{ NN_SURVEYOR, NN_SURVEYOR_DEADLINE },
+	// XXX: DOMAIN, IPV4ONLY, SOCKETNAME, SNDPRIO, RCVPRIO
+	// clang-format on
+};
+
+static void
+init_opts(void)
+{
+	static int optsinited = 0;
+	if (optsinited) {
+		return;
+	}
+	for (int i = 0; i < sizeof(options) / sizeof(options[0]); i++) {
+		if (options[i].opt > 0) {
+			continue;
+		}
+#define SETOPT(n, ms)         \
+	options[i].opt   = n; \
+	options[i].mscvt = ms
+
+		switch (options[i].nnlevel) {
+		case NN_SOL_SOCKET:
+			switch (options[i].nnopt) {
+			case NN_LINGER:
+				SETOPT(nng_optid_linger, 1);
+				break;
+			case NN_SNDBUF:
+				SETOPT(nng_optid_sendbuf, 0);
+				break;
+			case NN_RCVBUF:
+				SETOPT(nng_optid_recvbuf, 0);
+				break;
+			case NN_RECONNECT_IVL:
+				SETOPT(nng_optid_reconnmint, 1);
+				break;
+			case NN_RECONNECT_IVL_MAX:
+				SETOPT(nng_optid_reconnmaxt, 1);
+				break;
+			case NN_SNDFD:
+				SETOPT(nng_optid_sendfd, 0);
+				break;
+			case NN_RCVFD:
+				SETOPT(nng_optid_recvfd, 0);
+				break;
+			case NN_RCVMAXSIZE:
+				SETOPT(nng_optid_recvmaxsz, 0);
+				break;
+			case NN_MAXTTL:
+				SETOPT(nng_optid_maxttl, 0);
+				break;
+			case NN_RCVTIMEO:
+				SETOPT(nng_optid_recvtimeo, 1);
+				break;
+			case NN_SNDTIMEO:
+				SETOPT(nng_optid_sendtimeo, 1);
+				break;
+			}
+			break;
+		case NN_REQ:
+			switch (options[i].nnopt) {
+			case NN_REQ_RESEND_IVL:
+				SETOPT(nng_optid_req_resendtime, 1);
+				break;
+			}
+			break;
+		case NN_SUB:
+			switch (options[i].nnopt) {
+			case NN_SUB_SUBSCRIBE:
+				SETOPT(nng_optid_sub_subscribe, 0);
+				break;
+			case NN_SUB_UNSUBSCRIBE:
+				SETOPT(nng_optid_sub_unsubscribe, 0);
+				break;
+			}
+		case NN_SURVEYOR:
+			switch (options[i].nnopt) {
+			case NN_SURVEYOR_DEADLINE:
+				SETOPT(nng_optid_surveyor_surveytime, 1);
+				break;
+			}
+			break;
+		}
+	}
+	optsinited = 1;
+}
+
 int
 nn_getsockopt(int s, int nnlevel, int nnopt, void *valp, size_t *szp)
 {
-	int      opt   = 0;
+	int      opt   = -1;
 	int      mscvt = 0;
 	uint64_t usec;
 	int *    msecp;
 	int      rv;
 
-	switch (nnlevel) {
-	case NN_SOL_SOCKET:
-		switch (nnopt) {
-		case NN_LINGER:
-			opt = NNG_OPT_LINGER;
-			break;
-		case NN_SNDBUF:
-			opt = NNG_OPT_SNDBUF;
-			break;
-		case NN_RCVBUF:
-			opt = NNG_OPT_RCVBUF;
-			break;
-		case NN_RECONNECT_IVL:
-			opt   = NNG_OPT_RECONN_TIME;
-			mscvt = 1;
-			break;
-		case NN_RECONNECT_IVL_MAX:
-			opt   = NNG_OPT_RECONN_MAXTIME;
-			mscvt = 1;
-			break;
-		case NN_SNDFD:
-			opt = NNG_OPT_SNDFD;
-			break;
-		case NN_RCVFD:
-			opt = NNG_OPT_RCVFD;
-			break;
-		case NN_RCVMAXSIZE:
-			opt = NNG_OPT_RCVMAXSZ;
-			break;
-		case NN_MAXTTL:
-			opt = NNG_OPT_MAXTTL;
-			break;
-		case NN_RCVTIMEO:
-			opt   = NNG_OPT_RCVTIMEO;
-			mscvt = 1;
-			break;
-		case NN_SNDTIMEO:
-			opt   = NNG_OPT_SNDTIMEO;
-			mscvt = 1;
-			break;
-		case NN_DOMAIN:
-		case NN_PROTOCOL:
-		case NN_IPV4ONLY:
-		case NN_SOCKET_NAME:
-		case NN_SNDPRIO:
-		case NN_RCVPRIO:
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
+	init_opts();
 
+	for (int i = 0; i < sizeof(options) / sizeof(options[0]); i++) {
+		if ((options[i].nnlevel == nnlevel) &&
+		    (options[i].nnopt == nnopt)) {
+			mscvt = options[i].mscvt;
+			opt   = options[i].opt;
 			break;
 		}
-		break;
-	case NN_REQ:
-		switch (nnopt) {
-		case NN_REQ_RESEND_IVL:
-			opt   = NNG_OPT_RESENDTIME;
-			mscvt = 1;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	case NN_SUB:
-		switch (nnopt) {
-		case NN_SUB_SUBSCRIBE:
-			opt = NNG_OPT_SUBSCRIBE;
-			break;
-		case NN_SUB_UNSUBSCRIBE:
-			opt = NNG_OPT_UNSUBSCRIBE;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	case NN_SURVEYOR:
-		switch (nnopt) {
-		case NN_SURVEYOR_DEADLINE:
-			opt   = NNG_OPT_SURVEYTIME;
-			mscvt = 1;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	default:
-		errno = ENOPROTOOPT;
-		return (-1);
+	}
+
+	if (opt < 0) {
+		return (ENOPROTOOPT);
 	}
 
 	if (mscvt) {
@@ -696,102 +724,23 @@ nn_getsockopt(int s, int nnlevel, int nnopt, void *valp, size_t *szp)
 int
 nn_setsockopt(int s, int nnlevel, int nnopt, const void *valp, size_t sz)
 {
-	int      opt   = 0;
+	int      opt   = -1;
 	int      mscvt = 0;
 	uint64_t usec;
 	int      rv;
 
-	switch (nnlevel) {
-	case NN_SOL_SOCKET:
-		switch (nnopt) {
-		case NN_LINGER:
-			opt = NNG_OPT_LINGER;
-			break;
-		case NN_SNDBUF:
-			opt = NNG_OPT_SNDBUF;
-			break;
-		case NN_RCVBUF:
-			opt = NNG_OPT_RCVBUF;
-			break;
-		case NN_RECONNECT_IVL:
-			opt   = NNG_OPT_RECONN_TIME;
-			mscvt = 1;
-			break;
-		case NN_RECONNECT_IVL_MAX:
-			opt   = NNG_OPT_RECONN_MAXTIME;
-			mscvt = 1;
-			break;
-		case NN_SNDFD:
-			opt = NNG_OPT_SNDFD;
-			break;
-		case NN_RCVFD:
-			opt = NNG_OPT_RCVFD;
-			break;
-		case NN_RCVMAXSIZE:
-			opt = NNG_OPT_RCVMAXSZ;
-			break;
-		case NN_MAXTTL:
-			opt = NNG_OPT_MAXTTL;
-			break;
-		case NN_RCVTIMEO:
-			opt   = NNG_OPT_RCVTIMEO;
-			mscvt = 1;
-			break;
-		case NN_SNDTIMEO:
-			opt   = NNG_OPT_SNDTIMEO;
-			mscvt = 1;
-			break;
-		case NN_DOMAIN:
-		case NN_PROTOCOL:
-		case NN_IPV4ONLY:
-		case NN_SOCKET_NAME:
-		case NN_SNDPRIO:
-		case NN_RCVPRIO:
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
+	init_opts();
 
+	for (int i = 0; i < sizeof(options) / sizeof(options[0]); i++) {
+		if ((options[i].nnlevel == nnlevel) &&
+		    (options[i].nnopt == nnopt)) {
+			mscvt = options[i].mscvt;
+			opt   = options[i].opt;
 			break;
 		}
-		break;
-	case NN_REQ:
-		switch (nnopt) {
-		case NN_REQ_RESEND_IVL:
-			opt   = NNG_OPT_RESENDTIME;
-			mscvt = 1;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	case NN_SUB:
-		switch (nnopt) {
-		case NN_SUB_SUBSCRIBE:
-			opt = NNG_OPT_SUBSCRIBE;
-			break;
-		case NN_SUB_UNSUBSCRIBE:
-			opt = NNG_OPT_UNSUBSCRIBE;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	case NN_SURVEYOR:
-		switch (nnopt) {
-		case NN_SURVEYOR_DEADLINE:
-			opt   = NNG_OPT_SURVEYTIME;
-			mscvt = 1;
-			break;
-		default:
-			errno = ENOPROTOOPT;
-			return (-1);
-		}
-		break;
-	default:
-		errno = ENOPROTOOPT;
-		return (-1);
+	}
+	if (opt < 0) {
+		return (ENOPROTOOPT);
 	}
 
 	if (mscvt) {
diff --git a/src/protocol/bus/bus.c b/src/protocol/bus/bus.c
index 88fd93e0..6f6def0a 100644
--- a/src/protocol/bus/bus.c
+++ b/src/protocol/bus/bus.c
@@ -322,14 +322,10 @@ static int
 nni_bus_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_bus_sock *psock = arg;
-	int           rv;
+	int           rv    = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&psock->raw, buf, sz, 0, 1);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -338,14 +334,10 @@ static int
 nni_bus_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_bus_sock *psock = arg;
-	int           rv;
+	int           rv    = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&psock->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/pair/pair_v0.c b/src/protocol/pair/pair_v0.c
index acf9ec25..ef420051 100644
--- a/src/protocol/pair/pair_v0.c
+++ b/src/protocol/pair/pair_v0.c
@@ -231,11 +231,9 @@ pair0_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 	pair0_sock *s = arg;
 	int         rv;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&s->raw, buf, sz, 0, 1);
-		break;
-	default:
+	} else {
 		rv = NNG_ENOTSUP;
 	}
 	return (rv);
@@ -247,11 +245,9 @@ pair0_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 	pair0_sock *s = arg;
 	int         rv;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&s->raw, buf, szp);
-		break;
-	default:
+	} else {
 		rv = NNG_ENOTSUP;
 	}
 	return (rv);
diff --git a/src/protocol/pair/pair_v1.c b/src/protocol/pair/pair_v1.c
index 3b6770ba..a737402f 100644
--- a/src/protocol/pair/pair_v1.c
+++ b/src/protocol/pair/pair_v1.c
@@ -25,9 +25,9 @@ static void pair1_pipe_getq_cb(void *);
 static void pair1_pipe_putq_cb(void *);
 static void pair1_pipe_fini(void *);
 
-static int pair1_opt_poly   = -1;
-static int pair1_opt_maxttl = -1;
-static int pair1_opt_raw    = -1;
+// These are exposed as external names for external consumers.
+int         nng_optid_pair1_poly;
+const char *nng_opt_pair1_poly = "pair1-polyamorous";
 
 // pair1_sock is our per-socket protocol private structure.
 struct pair1_sock {
@@ -400,10 +400,10 @@ pair1_sock_close(void *arg)
 static int
 pair1_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
-	pair1_sock *s = arg;
-	int         rv;
+	pair1_sock *s  = arg;
+	int         rv = NNG_ENOTSUP;
 
-	if (opt == pair1_opt_raw) {
+	if (opt == nng_optid_raw) {
 		nni_mtx_lock(&s->mtx);
 		if (s->started) {
 			rv = NNG_ESTATE;
@@ -411,7 +411,11 @@ pair1_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 			rv = nni_setopt_int(&s->raw, buf, sz, 0, 1);
 		}
 		nni_mtx_unlock(&s->mtx);
-	} else if (opt == pair1_opt_poly) {
+	} else if (opt == nng_optid_maxttl) {
+		nni_mtx_lock(&s->mtx);
+		rv = nni_setopt_int(&s->ttl, buf, sz, 1, 255);
+		nni_mtx_unlock(&s->mtx);
+	} else if (opt == nng_optid_pair1_poly) {
 		nni_mtx_lock(&s->mtx);
 		if (s->started) {
 			rv = NNG_ESTATE;
@@ -419,12 +423,6 @@ pair1_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 			rv = nni_setopt_int(&s->poly, buf, sz, 0, 1);
 		}
 		nni_mtx_unlock(&s->mtx);
-	} else if (opt == pair1_opt_maxttl) {
-		nni_mtx_lock(&s->mtx);
-		rv = nni_setopt_int(&s->ttl, buf, sz, 1, 255);
-		nni_mtx_unlock(&s->mtx);
-	} else {
-		rv = NNG_ENOTSUP;
 	}
 
 	return (rv);
@@ -433,23 +431,21 @@ pair1_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 static int
 pair1_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
-	pair1_sock *s = arg;
-	int         rv;
+	pair1_sock *s  = arg;
+	int         rv = NNG_ENOTSUP;
 
-	if (opt == pair1_opt_raw) {
+	if (opt == nng_optid_raw) {
 		nni_mtx_lock(&s->mtx);
 		rv = nni_getopt_int(&s->raw, buf, szp);
 		nni_mtx_unlock(&s->mtx);
-	} else if (opt == pair1_opt_maxttl) {
+	} else if (opt == nng_optid_maxttl) {
 		nni_mtx_lock(&s->mtx);
 		rv = nni_getopt_int(&s->ttl, buf, szp);
 		nni_mtx_unlock(&s->mtx);
-	} else if (opt == pair1_opt_poly) {
+	} else if (opt == nng_optid_pair1_poly) {
 		nni_mtx_lock(&s->mtx);
 		rv = nni_getopt_int(&s->poly, buf, szp);
 		nni_mtx_unlock(&s->mtx);
-	} else {
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -457,19 +453,15 @@ pair1_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 static void
 pair1_fini(void)
 {
-	pair1_opt_poly   = -1;
-	pair1_opt_raw    = -1;
-	pair1_opt_maxttl = -1;
+	nng_optid_pair1_poly = -1;
 }
 
 static int
 pair1_init(void)
 {
 	int rv;
-	if (((rv = nni_option_register("polyamorous", &pair1_opt_poly)) !=
-	        0) ||
-	    ((rv = nni_option_register("raw", &pair1_opt_raw)) != 0) ||
-	    ((rv = nni_option_register("max-ttl", &pair1_opt_maxttl)) != 0)) {
+	if ((rv = nni_option_register(
+	         nng_opt_pair1_poly, &nng_optid_pair1_poly)) != 0) {
 		pair1_fini();
 		return (rv);
 	}
diff --git a/src/protocol/pipeline/pull.c b/src/protocol/pipeline/pull.c
index 1ebcc4a2..1d738ec2 100644
--- a/src/protocol/pipeline/pull.c
+++ b/src/protocol/pipeline/pull.c
@@ -170,14 +170,10 @@ static int
 nni_pull_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_pull_sock *pull = arg;
-	int            rv;
+	int            rv   = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&pull->raw, buf, sz, 0, 1);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -186,14 +182,10 @@ static int
 nni_pull_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_pull_sock *pull = arg;
-	int            rv;
+	int            rv   = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&pull->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/pipeline/push.c b/src/protocol/pipeline/push.c
index 1bc1659c..10d04091 100644
--- a/src/protocol/pipeline/push.c
+++ b/src/protocol/pipeline/push.c
@@ -192,14 +192,10 @@ static int
 nni_push_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_push_sock *push = arg;
-	int            rv;
+	int            rv   = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&push->raw, buf, sz, 0, 1);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -208,14 +204,10 @@ static int
 nni_push_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_push_sock *push = arg;
-	int            rv;
+	int            rv   = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&push->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/pubsub/pub.c b/src/protocol/pubsub/pub.c
index 940f2139..bbca1ecd 100644
--- a/src/protocol/pubsub/pub.c
+++ b/src/protocol/pubsub/pub.c
@@ -266,14 +266,10 @@ static int
 nni_pub_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_pub_sock *pub = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&pub->raw, buf, sz, 0, 1);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -282,14 +278,10 @@ static int
 nni_pub_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_pub_sock *pub = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&pub->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/pubsub/sub.c b/src/protocol/pubsub/sub.c
index 78b9d157..0563b764 100644
--- a/src/protocol/pubsub/sub.c
+++ b/src/protocol/pubsub/sub.c
@@ -251,20 +251,14 @@ static int
 nni_sub_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_sub_sock *sub = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&sub->raw, buf, sz, 0, 1);
-		break;
-	case NNG_OPT_SUBSCRIBE:
+	} else if (opt == nng_optid_sub_subscribe) {
 		rv = nni_sub_subscribe(sub, buf, sz);
-		break;
-	case NNG_OPT_UNSUBSCRIBE:
+	} else if (opt == nng_optid_sub_unsubscribe) {
 		rv = nni_sub_unsubscribe(sub, buf, sz);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -273,14 +267,10 @@ static int
 nni_sub_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_sub_sock *sub = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RAW:
+	if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&sub->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c
index 09f2b285..cd33d019 100644
--- a/src/protocol/reqrep/rep.c
+++ b/src/protocol/reqrep/rep.c
@@ -348,18 +348,13 @@ static int
 nni_rep_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_rep_sock *rep = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_MAXTTL:
+	if (opt == nng_optid_maxttl) {
 		rv = nni_setopt_int(&rep->ttl, buf, sz, 1, 255);
-		break;
-	case NNG_OPT_RAW:
+	} else if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&rep->raw, buf, sz, 0, 1);
 		nni_sock_senderr(rep->sock, rep->raw ? 0 : NNG_ESTATE);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
@@ -368,17 +363,12 @@ static int
 nni_rep_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_rep_sock *rep = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_MAXTTL:
+	if (opt == nng_optid_maxttl) {
 		rv = nni_getopt_int(&rep->ttl, buf, szp);
-		break;
-	case NNG_OPT_RAW:
+	} else if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&rep->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/reqrep/req.c b/src/protocol/reqrep/req.c
index bab81331..2579417a 100644
--- a/src/protocol/reqrep/req.c
+++ b/src/protocol/reqrep/req.c
@@ -243,24 +243,21 @@ static int
 nni_req_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_req_sock *req = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RESENDTIME:
+	if (opt == nng_optid_req_resendtime) {
 		rv = nni_setopt_usec(&req->retry, buf, sz);
-		break;
-	case NNG_OPT_RAW:
+
+	} else if (opt == nng_optid_raw) {
 		rv = nni_setopt_int(&req->raw, buf, sz, 0, 1);
 		if (rv == 0) {
 			nni_sock_recverr(req->sock, req->raw ? 0 : NNG_ESTATE);
 		}
-		break;
-	case NNG_OPT_MAXTTL:
+
+	} else if (opt == nng_optid_maxttl) {
 		rv = nni_setopt_int(&req->ttl, buf, sz, 1, 255);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
+
 	return (rv);
 }
 
@@ -268,21 +265,18 @@ static int
 nni_req_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_req_sock *req = arg;
-	int           rv;
+	int           rv  = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_RESENDTIME:
+	if (opt == nng_optid_req_resendtime) {
 		rv = nni_getopt_usec(&req->retry, buf, szp);
-		break;
-	case NNG_OPT_RAW:
+
+	} else if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&req->raw, buf, szp);
-		break;
-	case NNG_OPT_MAXTTL:
+
+	} else if (opt == nng_optid_maxttl) {
 		rv = nni_getopt_int(&req->ttl, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
+
 	return (rv);
 }
 
diff --git a/src/protocol/survey/respond.c b/src/protocol/survey/respond.c
index a097f551..e695a987 100644
--- a/src/protocol/survey/respond.c
+++ b/src/protocol/survey/respond.c
@@ -348,14 +348,13 @@ static int
 nni_resp_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_resp_sock *psock = arg;
-	int            rv;
+	int            rv    = NNG_ENOTSUP;
 	int            oldraw;
 
-	switch (opt) {
-	case NNG_OPT_MAXTTL:
+	if (opt == nng_optid_maxttl) {
 		rv = nni_setopt_int(&psock->ttl, buf, sz, 1, 255);
-		break;
-	case NNG_OPT_RAW:
+
+	} else if (opt == nng_optid_raw) {
 		oldraw = psock->raw;
 		rv     = nni_setopt_int(&psock->raw, buf, sz, 0, 1);
 		if (oldraw != psock->raw) {
@@ -365,10 +364,8 @@ nni_resp_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 				nni_sock_senderr(psock->nsock, NNG_ESTATE);
 			}
 		}
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
+
 	return (rv);
 }
 
@@ -376,17 +373,12 @@ static int
 nni_resp_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_resp_sock *psock = arg;
-	int            rv;
+	int            rv    = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_MAXTTL:
+	if (opt == nng_optid_maxttl) {
 		rv = nni_getopt_int(&psock->ttl, buf, szp);
-		break;
-	case NNG_OPT_RAW:
+	} else if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&psock->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c
index 2a32f289..d7341025 100644
--- a/src/protocol/survey/survey.c
+++ b/src/protocol/survey/survey.c
@@ -267,14 +267,13 @@ static int
 nni_surv_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 {
 	nni_surv_sock *psock = arg;
-	int            rv;
+	int            rv    = NNG_ENOTSUP;
 	int            oldraw;
 
-	switch (opt) {
-	case NNG_OPT_SURVEYTIME:
+	if (opt == nng_optid_surveyor_surveytime) {
 		rv = nni_setopt_usec(&psock->survtime, buf, sz);
-		break;
-	case NNG_OPT_RAW:
+
+	} else if (opt == nng_optid_raw) {
 		oldraw = psock->raw;
 		rv     = nni_setopt_int(&psock->raw, buf, sz, 0, 1);
 		if (oldraw != psock->raw) {
@@ -286,10 +285,8 @@ nni_surv_sock_setopt(void *arg, int opt, const void *buf, size_t sz)
 			psock->survid = 0;
 			nni_timer_cancel(&psock->timer);
 		}
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
+
 	return (rv);
 }
 
@@ -297,17 +294,12 @@ static int
 nni_surv_sock_getopt(void *arg, int opt, void *buf, size_t *szp)
 {
 	nni_surv_sock *psock = arg;
-	int            rv;
+	int            rv    = NNG_ENOTSUP;
 
-	switch (opt) {
-	case NNG_OPT_SURVEYTIME:
+	if (opt == nng_optid_surveyor_surveytime) {
 		rv = nni_getopt_usec(&psock->survtime, buf, szp);
-		break;
-	case NNG_OPT_RAW:
+	} else if (opt == nng_optid_raw) {
 		rv = nni_getopt_int(&psock->raw, buf, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
 	}
 	return (rv);
 }
diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c
index 4c79ddfd..23a74998 100644
--- a/src/transport/inproc/inproc.c
+++ b/src/transport/inproc/inproc.c
@@ -182,6 +182,7 @@ nni_inproc_pipe_getopt(void *arg, int option, void *buf, size_t *szp)
 	nni_inproc_pipe *pipe = arg;
 	size_t           len;
 
+#if 0
 	switch (option) {
 	case NNG_OPT_LOCALADDR:
 	case NNG_OPT_REMOTEADDR:
@@ -194,6 +195,7 @@ nni_inproc_pipe_getopt(void *arg, int option, void *buf, size_t *szp)
 		*szp = len;
 		return (0);
 	}
+#endif
 	return (NNG_ENOTSUP);
 }
 
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c
index 4324eedd..e5e19f36 100644
--- a/src/transport/ipc/ipc.c
+++ b/src/transport/ipc/ipc.c
@@ -64,8 +64,7 @@ static void nni_ipc_ep_cb(void *);
 static int
 nni_ipc_tran_chkopt(int o, const void *data, size_t sz)
 {
-	switch (o) {
-	case NNG_OPT_RCVMAXSZ:
+	if (o == nng_optid_recvmaxsz) {
 		return (nni_chkopt_size(data, sz, 0, NNI_MAXSZ));
 	}
 	return (NNG_ENOTSUP);
@@ -648,37 +647,28 @@ nni_ipc_ep_connect(void *arg, nni_aio *aio)
 static int
 nni_ipc_ep_setopt(void *arg, int opt, const void *v, size_t sz)
 {
-	int         rv;
+	int         rv = NNG_ENOTSUP;
 	nni_ipc_ep *ep = arg;
-	nni_mtx_lock(&ep->mtx);
-	switch (opt) {
-	case NNG_OPT_RCVMAXSZ:
+
+	if (opt == nng_optid_recvmaxsz) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_setopt_size(&ep->rcvmax, v, sz, 0, NNI_MAXSZ);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
-		break;
+		nni_mtx_unlock(&ep->mtx);
 	}
-	nni_mtx_unlock(&ep->mtx);
 	return (rv);
 }
 
 static int
 nni_ipc_ep_getopt(void *arg, int opt, void *v, size_t *szp)
 {
-	int         rv;
+	int         rv = NNG_ENOTSUP;
 	nni_ipc_ep *ep = arg;
 
-	nni_mtx_lock(&ep->mtx);
-	switch (opt) {
-	case NNG_OPT_RCVMAXSZ:
+	if (opt == nng_optid_recvmaxsz) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_getopt_size(&ep->rcvmax, v, szp);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
-		break;
+		nni_mtx_unlock(&ep->mtx);
 	}
-	nni_mtx_unlock(&ep->mtx);
 	return (rv);
 }
 
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index f5e5ad87..de1bfa66 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -65,10 +65,10 @@ static void nni_tcp_ep_cb(void *arg);
 static int
 nni_tcp_tran_chkopt(int o, const void *data, size_t sz)
 {
-	switch (o) {
-	case NNG_OPT_RCVMAXSZ:
+	if (o == nng_optid_recvmaxsz) {
 		return (nni_chkopt_size(data, sz, 0, NNI_MAXSZ));
-	case NNG_OPT_LINGER:
+	}
+	if (o == nng_optid_linger) {
 		return (nni_chkopt_usec(data, sz));
 	}
 	return (NNG_ENOTSUP);
@@ -766,45 +766,39 @@ nni_tcp_ep_connect(void *arg, nni_aio *aio)
 static int
 nni_tcp_ep_setopt(void *arg, int opt, const void *v, size_t sz)
 {
-	int         rv;
+	int         rv = NNG_ENOTSUP;
 	nni_tcp_ep *ep = arg;
 
-	nni_mtx_lock(&ep->mtx);
-	switch (opt) {
-	case NNG_OPT_RCVMAXSZ:
+	if (opt == nng_optid_recvmaxsz) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_setopt_size(&ep->rcvmax, v, sz, 0, NNI_MAXSZ);
-		break;
-	case NNG_OPT_LINGER:
+		nni_mtx_unlock(&ep->mtx);
+
+	} else if (opt == nng_optid_linger) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_setopt_usec(&ep->linger, v, sz);
-		break;
-	default:
-		rv = NNG_ENOTSUP;
-		break;
+		nni_mtx_unlock(&ep->mtx);
 	}
-	nni_mtx_unlock(&ep->mtx);
 	return (rv);
 }
 
 static int
 nni_tcp_ep_getopt(void *arg, int opt, void *v, size_t *szp)
 {
-	int         rv;
+	int         rv = NNG_ENOTSUP;
 	nni_tcp_ep *ep = arg;
 
-	nni_mtx_lock(&ep->mtx);
-	switch (opt) {
-	case NNG_OPT_RCVMAXSZ:
+	if (opt == nng_optid_recvmaxsz) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_getopt_size(&ep->rcvmax, v, szp);
-		break;
-	case NNG_OPT_LINGER:
+		nni_mtx_unlock(&ep->mtx);
+
+	} else if (opt == nng_optid_linger) {
+		nni_mtx_lock(&ep->mtx);
 		rv = nni_getopt_usec(&ep->linger, v, szp);
-		break;
-	default:
-		// XXX: add address properties
-		rv = NNG_ENOTSUP;
-		break;
+		nni_mtx_unlock(&ep->mtx);
 	}
-	nni_mtx_unlock(&ep->mtx);
+	// XXX: add address properties
 	return (rv);
 }