Add improved getopt functions, pass integers by value.

3 files changed, 47 insertions, 16 deletions

diff --git a/src/core/options.c b/src/core/options.c
index 4027564c..76025710 100644
--- a/src/core/options.c
+++ b/src/core/options.c
@@ -123,45 +123,70 @@ nni_setopt_size(size_t *sp, const void *v, size_t sz, size_t minv, size_t maxv)
 }
 
 int
-nni_getopt_usec(nni_duration *ptr, void *val, size_t *sizep)
+nni_getopt_usec(nni_duration u, void *val, size_t *sizep)
 {
-	size_t sz = sizeof(*ptr);
+	size_t sz = sizeof(u);
 
 	if (sz > *sizep) {
 		sz = *sizep;
 	}
-	*sizep = sizeof(*ptr);
-	memcpy(val, ptr, sz);
+	*sizep = sizeof(u);
+	memcpy(val, &u, sz);
 	return (0);
 }
 
 int
-nni_getopt_int(int *ptr, void *val, size_t *sizep)
+nni_getopt_int(int i, void *val, size_t *sizep)
 {
-	size_t sz = sizeof(*ptr);
+	size_t sz = sizeof(i);
 
 	if (sz > *sizep) {
 		sz = *sizep;
 	}
-	*sizep = sizeof(*ptr);
-	memcpy(val, ptr, sz);
+	*sizep = sizeof(i);
+	memcpy(val, &i, sz);
 	return (0);
 }
 
 int
-nni_getopt_size(size_t *ptr, void *val, size_t *sizep)
+nni_getopt_u64(const uint64_t u, void *val, size_t *sizep)
 {
-	size_t sz = sizeof(*ptr);
+	size_t sz = sizeof(u);
 
 	if (sz > *sizep) {
 		sz = *sizep;
 	}
-	*sizep = sizeof(*ptr);
+	*sizep = sizeof(u);
+	memcpy(val, &u, sz);
+	return (0);
+}
+
+int
+nni_getopt_str(const char *ptr, void *val, size_t *sizep)
+{
+	size_t len = strlen(ptr) + 1;
+	size_t sz;
+
+	sz     = (len > *sizep) ? *sizep : len;
+	*sizep = len;
 	memcpy(val, ptr, sz);
 	return (0);
 }
 
 int
+nni_getopt_size(size_t u, void *val, size_t *sizep)
+{
+	size_t sz = sizeof(u);
+
+	if (sz > *sizep) {
+		sz = *sizep;
+	}
+	*sizep = sizeof(u);
+	memcpy(val, &u, sz);
+	return (0);
+}
+
+int
 nni_setopt_buf(nni_msgq *mq, const void *val, size_t sz)
 {
 	int len;
diff --git a/src/core/options.h b/src/core/options.h
index 03a6e37e..ed091703 100644
--- a/src/core/options.h
+++ b/src/core/options.h
@@ -26,7 +26,7 @@ extern int nni_getopt_buf(nni_msgq *, void *, size_t *);
 extern int nni_setopt_usec(nni_duration *, const void *, size_t);
 
 // nni_getopt_duration gets the duration.
-extern int nni_getopt_usec(nni_duration *, void *, size_t *);
+extern int nni_getopt_usec(nni_duration, void *, size_t *);
 
 // nni_setopt_int sets an integer, which must be between the minimum and
 // maximum values (inclusive).
@@ -36,7 +36,13 @@ extern int nni_setopt_int(int *, const void *, size_t, int, int);
 #define NNI_MININT ((int) -2147483648)
 
 // nni_getopt_int gets an integer.
-extern int nni_getopt_int(int *, void *, size_t *);
+extern int nni_getopt_int(int, void *, size_t *);
+
+// nni_getopt_u64 gets an unsigned 64 bit number.
+extern int nni_getopt_u64(uint64_t, void *, size_t *);
+
+// nni_getopt_str gets a C style string.
+extern int nni_getopt_str(const char *, void *, size_t *);
 
 // nni_setopt_size sets a size_t option.
 extern int nni_setopt_size(size_t *, const void *, size_t, size_t, size_t);
@@ -47,7 +53,7 @@ extern int nni_setopt_size(size_t *, const void *, size_t, size_t, size_t);
 #define NNI_MAXSZ ((size_t) 0xffffffff)
 
 // nni_getopt_size obtains a size_t option.
-extern int nni_getopt_size(size_t *, void *, size_t *);
+extern int nni_getopt_size(size_t, void *, size_t *);
 
 // nni_getopt_fd obtains a notification file descriptor.
 extern int nni_getopt_fd(nni_sock *, nni_notifyfd *, int, void *, size_t *);
diff --git a/src/core/socket.c b/src/core/socket.c
index 01fd9a0c..03ae5a9d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -960,9 +960,9 @@ nni_sock_getopt(nni_sock *s, int opt, void *val, size_t *szp)
 	} else if (opt == nng_optid_recvfd) {
 		rv = nni_getopt_fd(s, &s->s_recv_fd, NNG_EV_CAN_RCV, val, szp);
 	} else if (opt == nng_optid_reconnmint) {
-		rv = nni_getopt_usec(&s->s_reconn, val, szp);
+		rv = nni_getopt_usec(s->s_reconn, val, szp);
 	} else if (opt == nng_optid_reconnmaxt) {
-		rv = nni_getopt_usec(&s->s_reconnmax, val, szp);
+		rv = nni_getopt_usec(s->s_reconnmax, val, szp);
 	} else {
 		NNI_LIST_FOREACH (&s->s_options, sopt) {
 			if (sopt->opt == opt) {