aboutsummaryrefslogtreecommitdiff
path: root/src/core/socket.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2016-12-24 15:54:44 -0800
committerGarrett D'Amore <garrett@damore.org>2016-12-24 22:51:01 -0800
commit3b73756a5e5d075adfd03f5c49014094428d818f (patch)
tree7109b8952eeb03fd47c293c5d915b6a9f7d6433d /src/core/socket.c
parent3bed9dca3a3ae5b226e3bf6aee3352d7665dbcc2 (diff)
downloadnng-3b73756a5e5d075adfd03f5c49014094428d818f.tar.gz
nng-3b73756a5e5d075adfd03f5c49014094428d818f.tar.bz2
nng-3b73756a5e5d075adfd03f5c49014094428d818f.zip
Change in handling of extended info for messages.
Instead of supplying a pipe, and expecting that the info there would be included we use nng_msg_getopt(). This will be enabled by the app asking for extended information by setting an option, we don't copy the data for every app (most won't care). This means we don't have to worry about reference counting the pipe for the life of associated messages.
Diffstat (limited to 'src/core/socket.c')
-rw-r--r--src/core/socket.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index adf2e082..9db61838 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -557,6 +557,7 @@ nni_setopt_duration(nni_duration *ptr, const void *val, size_t size)
return (0);
}
+
static int
nni_getopt_duration(nni_duration *ptr, void *val, size_t *sizep)
{
@@ -570,6 +571,7 @@ nni_getopt_duration(nni_duration *ptr, void *val, size_t *sizep)
return (0);
}
+
int
nni_socket_setopt(nni_socket *sock, int opt, const void *val, size_t size)
{
@@ -606,6 +608,7 @@ nni_socket_setopt(nni_socket *sock, int opt, const void *val, size_t size)
return (rv);
}
+
int
nni_socket_getopt(nni_socket *sock, int opt, void *val, size_t *sizep)
{
@@ -641,5 +644,3 @@ nni_socket_getopt(nni_socket *sock, int opt, void *val, size_t *sizep)
nni_mutex_exit(&sock->s_mx);
return (rv);
}
-
-