diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/defs.h | 3 | ||||
| -rw-r--r-- | src/core/options.c | 24 | ||||
| -rw-r--r-- | src/core/stream.c | 18 | ||||
| -rw-r--r-- | src/nng.c | 18 | ||||
| -rw-r--r-- | src/supplemental/tls/tls_common.c | 20 |
5 files changed, 0 insertions, 83 deletions
diff --git a/src/core/defs.h b/src/core/defs.h index 46a32ef5..979c0300 100644 --- a/src/core/defs.h +++ b/src/core/defs.h @@ -189,14 +189,11 @@ typedef enum { NNI_TYPE_NONE, // DO NOT USE NNI_TYPE_BOOL, NNI_TYPE_INT32, - NNI_TYPE_UINT32, - NNI_TYPE_INT64, NNI_TYPE_UINT64, NNI_TYPE_SIZE, NNI_TYPE_DURATION, NNI_TYPE_STRING, NNI_TYPE_SOCKADDR, - NNI_TYPE_POINTER, } nni_type; typedef nni_type nni_opt_type; diff --git a/src/core/options.c b/src/core/options.c index fabd55fa..1540a807 100644 --- a/src/core/options.c +++ b/src/core/options.c @@ -89,19 +89,6 @@ nni_copyin_size( } int -nni_copyin_ptr(void **pp, const void *v, size_t sz, nni_type t) -{ - NNI_ARG_UNUSED(sz); - - if (t != NNI_TYPE_POINTER) { - return (NNG_EBADTYPE); - } - - *pp = *(void **) v; - return (0); -} - -int nni_copyin_str(char *s, const void *v, size_t maxsz, nni_type t) { size_t z; @@ -174,17 +161,6 @@ nni_copyout_ms(nng_duration d, void *dst, size_t *szp, nni_type t) } int -nni_copyout_ptr(void *p, void *dst, size_t *szp, nni_type t) -{ - NNI_ARG_UNUSED(szp); - if (t != NNI_TYPE_POINTER) { - return (NNG_EBADTYPE); - } - *(void **) dst = p; - return (0); -} - -int nni_copyout_size(size_t s, void *dst, size_t *szp, nni_type t) { NNI_ARG_UNUSED(szp); diff --git a/src/core/stream.c b/src/core/stream.c index cc7ac496..ad026586 100644 --- a/src/core/stream.c +++ b/src/core/stream.c @@ -347,12 +347,6 @@ nng_stream_get_string(nng_stream *s, const char *n, char **v) } int -nng_stream_get_ptr(nng_stream *s, const char *n, void **v) -{ - return (nni_stream_get(s, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_stream_get_ms(nng_stream *s, const char *n, nng_duration *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_DURATION)); @@ -395,12 +389,6 @@ nng_stream_dialer_get_string(nng_stream_dialer *d, const char *n, char **v) } int -nng_stream_dialer_get_ptr(nng_stream_dialer *d, const char *n, void **v) -{ - return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_stream_dialer_get_ms(nng_stream_dialer *d, const char *n, nng_duration *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_DURATION)); @@ -451,12 +439,6 @@ nng_stream_listener_get_string(nng_stream_listener *l, const char *n, char **v) } int -nng_stream_listener_get_ptr(nng_stream_listener *l, const char *n, void **v) -{ - return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_stream_listener_get_ms( nng_stream_listener *l, const char *n, nng_duration *v) { @@ -821,12 +821,6 @@ nng_dialer_get_string(nng_dialer id, const char *n, char **v) } int -nng_dialer_get_ptr(nng_dialer id, const char *n, void **v) -{ - return (dialer_get(id, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_dialer_get_ms(nng_dialer id, const char *n, nng_duration *v) { return (dialer_get(id, n, v, NULL, NNI_TYPE_DURATION)); @@ -968,12 +962,6 @@ nng_listener_get_string(nng_listener id, const char *n, char **v) } int -nng_listener_get_ptr(nng_listener id, const char *n, void **v) -{ - return (listener_get(id, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_listener_get_ms(nng_listener id, const char *n, nng_duration *v) { return (listener_get(id, n, v, NULL, NNI_TYPE_DURATION)); @@ -1445,12 +1433,6 @@ nng_pipe_get_string(nng_pipe id, const char *n, char **v) } int -nng_pipe_get_ptr(nng_pipe id, const char *n, void **v) -{ - return (pipe_get(id, n, v, NULL, NNI_TYPE_POINTER)); -} - -int nng_pipe_get_ms(nng_pipe id, const char *n, nng_duration *v) { return (pipe_get(id, n, v, NULL, NNI_TYPE_DURATION)); diff --git a/src/supplemental/tls/tls_common.c b/src/supplemental/tls/tls_common.c index c3c4d3c3..c04d03a5 100644 --- a/src/supplemental/tls/tls_common.c +++ b/src/supplemental/tls/tls_common.c @@ -554,22 +554,6 @@ tls_get_peer_cn(void *arg, void *buf, size_t *szp, nni_type t) return (0); } -static int -tls_get_peer_alt_names(void *arg, void *buf, size_t *szp, nni_type t) -{ - NNI_ARG_UNUSED(szp); - - if (t != NNI_TYPE_POINTER) { - return (NNG_EBADTYPE); - } - - tls_conn *conn = arg; - nni_mtx_lock(&conn->lock); - *(char ***) buf = conn->ops.peer_alt_names((void *) (conn + 1)); - nni_mtx_unlock(&conn->lock); - return (0); -} - static const nni_option tls_options[] = { { .o_name = NNG_OPT_TLS_VERIFIED, @@ -580,10 +564,6 @@ static const nni_option tls_options[] = { .o_get = tls_get_peer_cn, }, { - .o_name = NNG_OPT_TLS_PEER_ALT_NAMES, - .o_get = tls_get_peer_alt_names, - }, - { .o_name = NULL, }, }; |