From 9ca901c1b70b17d851426483d9f54611cfa8e395 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 19 Mar 2018 16:02:37 -0700 Subject: fixes #296 Typed options should validate option type fixes #302 nng_dialer/listener/pipe_getopt_sockaddr desired This adds plumbing to pass and check the type of options all the way through. NNG_ZT_OPT_ORBIT is type UINT64, but you can use the untyped form to pass two of them if needed. No typed access for retrieving strings yet. I think this should allocate a pointer and copy that out, but that's for later. --- src/transport/tls/tls.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'src/transport/tls') diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c index 59066f5f..9299ba2d 100644 --- a/src/transport/tls/tls.c +++ b/src/transport/tls/tls.c @@ -896,11 +896,25 @@ tls_getopt_verified(void *arg, void *v, size_t *szp) } static nni_tran_pipe_option nni_tls_pipe_options[] = { - { NNG_OPT_LOCADDR, nni_tls_pipe_getopt_locaddr }, - { NNG_OPT_REMADDR, nni_tls_pipe_getopt_remaddr }, - { NNG_OPT_TLS_VERIFIED, tls_getopt_verified }, + { + .po_name = NNG_OPT_LOCADDR, + .po_type = NNI_TYPE_SOCKADDR, + .po_getopt = nni_tls_pipe_getopt_locaddr, + }, + { + .po_name = NNG_OPT_REMADDR, + .po_type = NNI_TYPE_SOCKADDR, + .po_getopt = nni_tls_pipe_getopt_remaddr, + }, + { + .po_name = NNG_OPT_TLS_VERIFIED, + .po_type = NNI_TYPE_BOOL, + .po_getopt = tls_getopt_verified, + }, // terminate list - { NULL, NULL } + { + .po_name = NULL, + }, }; static nni_tran_pipe nni_tls_pipe_ops = { @@ -916,46 +930,56 @@ static nni_tran_pipe nni_tls_pipe_ops = { static nni_tran_ep_option nni_tls_ep_options[] = { { .eo_name = NNG_OPT_RECVMAXSZ, + .eo_type = NNI_TYPE_SIZE, .eo_getopt = nni_tls_ep_getopt_recvmaxsz, .eo_setopt = nni_tls_ep_setopt_recvmaxsz, }, { .eo_name = NNG_OPT_LINGER, + .eo_type = NNI_TYPE_DURATION, .eo_getopt = nni_tls_ep_getopt_linger, .eo_setopt = nni_tls_ep_setopt_linger, }, { .eo_name = NNG_OPT_URL, + .eo_type = NNI_TYPE_STRING, .eo_getopt = nni_tls_ep_getopt_url, .eo_setopt = NULL, }, { .eo_name = NNG_OPT_TLS_CONFIG, + .eo_type = NNI_TYPE_POINTER, .eo_getopt = tls_getopt_config, .eo_setopt = tls_setopt_config, }, { .eo_name = NNG_OPT_TLS_CERT_KEY_FILE, + .eo_type = NNI_TYPE_STRING, .eo_getopt = NULL, .eo_setopt = tls_setopt_cert_key_file, }, { .eo_name = NNG_OPT_TLS_CA_FILE, + .eo_type = NNI_TYPE_STRING, .eo_getopt = NULL, .eo_setopt = tls_setopt_ca_file, }, { .eo_name = NNG_OPT_TLS_AUTH_MODE, + .eo_type = NNI_TYPE_INT32, // enum really .eo_getopt = NULL, .eo_setopt = tls_setopt_auth_mode, }, { .eo_name = NNG_OPT_TLS_SERVER_NAME, + .eo_type = NNI_TYPE_STRING, .eo_getopt = NULL, .eo_setopt = tls_setopt_server_name, }, // terminate list - { NULL, NULL, NULL }, + { + .eo_name = NULL, + }, }; static nni_tran_ep nni_tls_ep_ops = { -- cgit v1.2.3-70-g09d2