From 52d37858451ad23f077294fc78b1a3f56255c32f Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 6 Oct 2017 12:26:42 -0700 Subject: Add NNG_OPT_DOMAIN and NNG_OPT_SOCKNAME support for legacy compat. The NNG_OPT_SOCKNAME option is settable, to a limit of 64 bytes. The NNG_OPT_DOMAIN is read-only, but changes to match the setting of the NNG_OPT_RAW field. New applications should not use the NNG_OPT_DOMAIN option -- it is provided solely for use with the legacy NN_DOMAIN option in the compatibility layer. --- src/nng_compat.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/nng_compat.c') diff --git a/src/nng_compat.c b/src/nng_compat.c index 994c1332..dedbda0d 100644 --- a/src/nng_compat.c +++ b/src/nng_compat.c @@ -583,11 +583,13 @@ static struct { { NN_SOL_SOCKET, NN_MAXTTL }, { NN_SOL_SOCKET, NN_RCVTIMEO }, { NN_SOL_SOCKET, NN_SNDTIMEO }, + { NN_SOL_SOCKET, NN_DOMAIN }, + { NN_SOL_SOCKET, NN_SOCKET_NAME }, { 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 + // XXX: IPV4ONLY, SNDPRIO, RCVPRIO // clang-format on }; @@ -642,6 +644,12 @@ init_opts(void) case NN_SNDTIMEO: SETOPT(NNG_OPT_SENDTIMEO, 1); break; + case NN_SOCKET_NAME: + SETOPT(NNG_OPT_SOCKNAME, 0); + break; + case NN_DOMAIN: + SETOPT(NNG_OPT_DOMAIN, 0); + break; } break; case NN_REQ: @@ -693,7 +701,8 @@ nn_getsockopt(int s, int nnlevel, int nnopt, void *valp, size_t *szp) } if (name == NULL) { - return (ENOPROTOOPT); + errno = ENOPROTOOPT; + return (-1); } if (mscvt) { -- cgit v1.2.3-70-g09d2