aboutsummaryrefslogtreecommitdiff
path: root/src/core/transport.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-06-12 20:05:34 -0700
committerGarrett D'Amore <garrett@damore.org>2018-06-13 18:01:52 -0700
commitda2aac4a6eb10af88e3938068e24c58aea1832b1 (patch)
treefb0676be5426ed1510945b7e7fe3d09eb45333a7 /src/core/transport.c
parent61ffae5e3649897776c26799ccaaa35d578ba816 (diff)
downloadnng-da2aac4a6eb10af88e3938068e24c58aea1832b1.tar.gz
nng-da2aac4a6eb10af88e3938068e24c58aea1832b1.tar.bz2
nng-da2aac4a6eb10af88e3938068e24c58aea1832b1.zip
fixes #540 nni_ep_opttype serves no purpose
fixes #538 setopt should have an explicit chkopt routine fixes #537 Internal TCP API needs better name separation fixes #524 Option types should be "typed" This is a rework of the option management code, to make it both clearer and to prepare for further work to break up endpoints. This reduces a certain amount of dead or redundant code, and actually saves cycles when setting options, as some loops were not terminated that should have been.
Diffstat (limited to 'src/core/transport.c')
-rw-r--r--src/core/transport.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/transport.c b/src/core/transport.c
index 0cd84461..4733b6bd 100644
--- a/src/core/transport.c
+++ b/src/core/transport.c
@@ -118,23 +118,23 @@ nni_tran_chkopt(const char *name, const void *v, size_t sz, int typ)
nni_mtx_lock(&nni_tran_lk);
NNI_LIST_FOREACH (&nni_tran_list, t) {
- const nni_tran_ep_ops * ep;
- const nni_tran_ep_option *eo;
+ const nni_tran_ep_ops *ep;
+ const nni_tran_option *o;
// Generally we look for endpoint options.
ep = t->t_tran.tran_ep;
- for (eo = ep->ep_options; eo && eo->eo_name != NULL; eo++) {
- if (strcmp(name, eo->eo_name) != 0) {
+ for (o = ep->ep_options; o && o->o_name != NULL; o++) {
+ if (strcmp(name, o->o_name) != 0) {
continue;
}
- if (eo->eo_setopt == NULL) {
+ if (o->o_set == NULL) {
nni_mtx_unlock(&nni_tran_lk);
return (NNG_EREADONLY);
}
- if ((rv = eo->eo_setopt(NULL, v, sz, typ)) != 0) {
- nni_mtx_unlock(&nni_tran_lk);
- return (rv);
- }
+
+ rv = (o->o_chk != NULL) ? o->o_chk(v, sz, typ) : 0;
+ nni_mtx_unlock(&nni_tran_lk);
+ return (rv);
}
}
nni_mtx_unlock(&nni_tran_lk);