aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-03-18 12:46:31 -0700
committerGarrett D'Amore <garrett@damore.org>2018-03-18 12:46:31 -0700
commit8b979454d891b84da727a329906c4293fadc5f3c (patch)
treecb491c476080de11c7fc5b5868579f4ef86f4df4 /src/transport
parent3a2af394a7d94ac5f924aaea6cbad825a9b05d75 (diff)
downloadnng-8b979454d891b84da727a329906c4293fadc5f3c.tar.gz
nng-8b979454d891b84da727a329906c4293fadc5f3c.tar.bz2
nng-8b979454d891b84da727a329906c4293fadc5f3c.zip
fixes #295 boolean options should use C99 bool type
fixes #275 nng_pipe_getopt_ptr() missing? fixes #285 nng_setopt_ptr MIS fixes #297 nng_listener/dialer_close does not validate mode This change adds some missing APIs, and changes others. In particular, certain options are now of type bool, with size of just one. This is a *breaking* change for code that uses those options -- NNG_OPT_RAW, NNG_OPT_PAIR1_POLY, NNG_OPT_TLS_VERIFIED.
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/tcp/tcp.c1
-rw-r--r--src/transport/tls/tls.c3
-rw-r--r--src/transport/ws/websocket.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index 1b4e6dc2..a74f1097 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -49,7 +49,6 @@ struct nni_tcp_ep {
uint16_t proto;
size_t rcvmax;
nni_duration linger;
- int ipv4only;
nni_aio * aio;
nni_aio * user_aio;
nni_url * url;
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index 534b955d..59066f5f 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -55,7 +55,6 @@ struct nni_tls_ep {
uint16_t proto;
size_t rcvmax;
nni_duration linger;
- int ipv4only;
int authmode;
nni_aio * aio;
nni_aio * user_aio;
@@ -893,7 +892,7 @@ tls_getopt_verified(void *arg, void *v, size_t *szp)
{
nni_tls_pipe *p = arg;
- return (nni_getopt_int(nni_tls_verified(p->tls) ? 1 : 0, v, szp));
+ return (nni_getopt_bool(nni_tls_verified(p->tls), v, szp));
}
static nni_tran_pipe_option nni_tls_pipe_options[] = {
diff --git a/src/transport/ws/websocket.c b/src/transport/ws/websocket.c
index a8cdcbb0..f0172385 100644
--- a/src/transport/ws/websocket.c
+++ b/src/transport/ws/websocket.c
@@ -532,7 +532,7 @@ static int
ws_pipe_getopt_tls_verified(void *arg, void *v, size_t *szp)
{
ws_pipe *p = arg;
- return (nni_getopt_int(nni_ws_tls_verified(p->ws) ? 1 : 0, v, szp));
+ return (nni_getopt_bool(nni_ws_tls_verified(p->ws), v, szp));
}
static nni_tran_pipe_option ws_pipe_options[] = {