diff options
Diffstat (limited to 'src/protocol')
| -rw-r--r-- | src/protocol/bus0/bus.c | 2 | ||||
| -rw-r--r-- | src/protocol/pair0/pair.c | 2 | ||||
| -rw-r--r-- | src/protocol/pair1/pair.c | 4 | ||||
| -rw-r--r-- | src/protocol/pipeline0/pull.c | 2 | ||||
| -rw-r--r-- | src/protocol/pipeline0/push.c | 2 | ||||
| -rw-r--r-- | src/protocol/pubsub0/pub.c | 2 | ||||
| -rw-r--r-- | src/protocol/pubsub0/sub.c | 4 | ||||
| -rw-r--r-- | src/protocol/reqrep0/rep.c | 5 | ||||
| -rw-r--r-- | src/protocol/reqrep0/req.c | 9 | ||||
| -rw-r--r-- | src/protocol/reqrep0/xrep.c | 3 | ||||
| -rw-r--r-- | src/protocol/reqrep0/xreq.c | 3 | ||||
| -rw-r--r-- | src/protocol/survey0/respond.c | 5 | ||||
| -rw-r--r-- | src/protocol/survey0/survey.c | 9 | ||||
| -rw-r--r-- | src/protocol/survey0/xrespond.c | 3 | ||||
| -rw-r--r-- | src/protocol/survey0/xsurvey.c | 3 |
15 files changed, 17 insertions, 41 deletions
diff --git a/src/protocol/bus0/bus.c b/src/protocol/bus0/bus.c index ed2a244f..aba0a04c 100644 --- a/src/protocol/bus0/bus.c +++ b/src/protocol/bus0/bus.c @@ -439,7 +439,7 @@ static nni_proto_pipe_ops bus0_pipe_ops = { .pipe_stop = bus0_pipe_stop, }; -static nni_proto_option bus0_sock_options[] = { +static nni_option bus0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pair0/pair.c b/src/protocol/pair0/pair.c index fef2acaf..4e708a61 100644 --- a/src/protocol/pair0/pair.c +++ b/src/protocol/pair0/pair.c @@ -269,7 +269,7 @@ static nni_proto_pipe_ops pair0_pipe_ops = { .pipe_stop = pair0_pipe_stop, }; -static nni_proto_option pair0_sock_options[] = { +static nni_option pair0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pair1/pair.c b/src/protocol/pair1/pair.c index a474f0d9..451122ea 100644 --- a/src/protocol/pair1/pair.c +++ b/src/protocol/pair1/pair.c @@ -521,16 +521,14 @@ static nni_proto_pipe_ops pair1_pipe_ops = { .pipe_stop = pair1_pipe_stop, }; -static nni_proto_option pair1_sock_options[] = { +static nni_option pair1_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = pair1_sock_get_maxttl, .o_set = pair1_sock_set_maxttl, }, { .o_name = NNG_OPT_PAIR1_POLY, - .o_type = NNI_TYPE_BOOL, .o_get = pair1_sock_get_poly, .o_set = pair1_sock_set_poly, }, diff --git a/src/protocol/pipeline0/pull.c b/src/protocol/pipeline0/pull.c index b0f089b1..cc98c895 100644 --- a/src/protocol/pipeline0/pull.c +++ b/src/protocol/pipeline0/pull.c @@ -216,7 +216,7 @@ static nni_proto_pipe_ops pull0_pipe_ops = { .pipe_stop = pull0_pipe_stop, }; -static nni_proto_option pull0_sock_options[] = { +static nni_option pull0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pipeline0/push.c b/src/protocol/pipeline0/push.c index c31bec4e..1c0657a8 100644 --- a/src/protocol/pipeline0/push.c +++ b/src/protocol/pipeline0/push.c @@ -228,7 +228,7 @@ static nni_proto_pipe_ops push0_pipe_ops = { .pipe_stop = push0_pipe_stop, }; -static nni_proto_option push0_sock_options[] = { +static nni_option push0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pubsub0/pub.c b/src/protocol/pubsub0/pub.c index e1c182e8..2567a5b6 100644 --- a/src/protocol/pubsub0/pub.c +++ b/src/protocol/pubsub0/pub.c @@ -304,7 +304,7 @@ static nni_proto_pipe_ops pub0_pipe_ops = { .pipe_stop = pub0_pipe_stop, }; -static nni_proto_option pub0_sock_options[] = { +static nni_option pub0_sock_options[] = { // terminate list { .o_name = NULL, diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index 7bb4485a..5240fc83 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -352,15 +352,13 @@ static nni_proto_pipe_ops sub0_pipe_ops = { .pipe_stop = sub0_pipe_stop, }; -static nni_proto_option sub0_sock_options[] = { +static nni_option sub0_sock_options[] = { { .o_name = NNG_OPT_SUB_SUBSCRIBE, - .o_type = NNI_TYPE_OPAQUE, .o_set = sub0_subscribe, }, { .o_name = NNG_OPT_SUB_UNSUBSCRIBE, - .o_type = NNI_TYPE_OPAQUE, .o_set = sub0_unsubscribe, }, // terminate list diff --git a/src/protocol/reqrep0/rep.c b/src/protocol/reqrep0/rep.c index 875918f5..5f856f8e 100644 --- a/src/protocol/reqrep0/rep.c +++ b/src/protocol/reqrep0/rep.c @@ -679,21 +679,18 @@ static nni_proto_ctx_ops rep0_ctx_ops = { .ctx_recv = rep0_ctx_recv, }; -static nni_proto_option rep0_sock_options[] = { +static nni_option rep0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = rep0_sock_get_maxttl, .o_set = rep0_sock_set_maxttl, }, { .o_name = NNG_OPT_RECVFD, - .o_type = NNI_TYPE_INT32, .o_get = rep0_sock_get_recvfd, }, { .o_name = NNG_OPT_SENDFD, - .o_type = NNI_TYPE_INT32, .o_get = rep0_sock_get_sendfd, }, // terminate list diff --git a/src/protocol/reqrep0/req.c b/src/protocol/reqrep0/req.c index 139427a2..69ef27f2 100644 --- a/src/protocol/reqrep0/req.c +++ b/src/protocol/reqrep0/req.c @@ -851,10 +851,9 @@ static nni_proto_pipe_ops req0_pipe_ops = { .pipe_stop = req0_pipe_stop, }; -static nni_proto_option req0_ctx_options[] = { +static nni_option req0_ctx_options[] = { { .o_name = NNG_OPT_REQ_RESENDTIME, - .o_type = NNI_TYPE_DURATION, .o_get = req0_ctx_get_resendtime, .o_set = req0_ctx_set_resendtime, }, @@ -871,27 +870,23 @@ static nni_proto_ctx_ops req0_ctx_ops = { .ctx_options = req0_ctx_options, }; -static nni_proto_option req0_sock_options[] = { +static nni_option req0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_maxttl, .o_set = req0_sock_set_maxttl, }, { .o_name = NNG_OPT_REQ_RESENDTIME, - .o_type = NNI_TYPE_DURATION, .o_get = req0_sock_get_resendtime, .o_set = req0_sock_set_resendtime, }, { .o_name = NNG_OPT_RECVFD, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_recvfd, }, { .o_name = NNG_OPT_SENDFD, - .o_type = NNI_TYPE_INT32, .o_get = req0_sock_get_sendfd, }, // terminate list diff --git a/src/protocol/reqrep0/xrep.c b/src/protocol/reqrep0/xrep.c index d89722d6..09c11cda 100644 --- a/src/protocol/reqrep0/xrep.c +++ b/src/protocol/reqrep0/xrep.c @@ -408,10 +408,9 @@ static nni_proto_pipe_ops xrep0_pipe_ops = { .pipe_stop = xrep0_pipe_stop, }; -static nni_proto_option xrep0_sock_options[] = { +static nni_option xrep0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = xrep0_sock_get_maxttl, .o_set = xrep0_sock_set_maxttl, }, diff --git a/src/protocol/reqrep0/xreq.c b/src/protocol/reqrep0/xreq.c index 271c59a6..119b2449 100644 --- a/src/protocol/reqrep0/xreq.c +++ b/src/protocol/reqrep0/xreq.c @@ -289,10 +289,9 @@ static nni_proto_pipe_ops xreq0_pipe_ops = { .pipe_stop = xreq0_pipe_stop, }; -static nni_proto_option xreq0_sock_options[] = { +static nni_option xreq0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = xreq0_sock_get_maxttl, .o_set = xreq0_sock_set_maxttl, }, diff --git a/src/protocol/survey0/respond.c b/src/protocol/survey0/respond.c index 593b9bae..caecf719 100644 --- a/src/protocol/survey0/respond.c +++ b/src/protocol/survey0/respond.c @@ -656,22 +656,19 @@ static nni_proto_ctx_ops resp0_ctx_ops = { .ctx_recv = resp0_ctx_recv, }; -static nni_proto_option resp0_sock_options[] = { +static nni_option resp0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = resp0_sock_get_maxttl, .o_set = resp0_sock_set_maxttl, }, { .o_name = NNG_OPT_RECVFD, - .o_type = NNI_TYPE_INT32, .o_get = resp0_sock_get_recvfd, .o_set = NULL, }, { .o_name = NNG_OPT_SENDFD, - .o_type = NNI_TYPE_INT32, .o_get = resp0_sock_get_sendfd, .o_set = NULL, }, diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c index a2eb7379..3ecc1457 100644 --- a/src/protocol/survey0/survey.c +++ b/src/protocol/survey0/survey.c @@ -551,10 +551,9 @@ static nni_proto_pipe_ops surv0_pipe_ops = { .pipe_stop = surv0_pipe_stop, }; -static nni_proto_option surv0_ctx_options[] = { +static nni_option surv0_ctx_options[] = { { .o_name = NNG_OPT_SURVEYOR_SURVEYTIME, - .o_type = NNI_TYPE_DURATION, .o_get = surv0_ctx_get_surveytime, .o_set = surv0_ctx_set_surveytime, }, @@ -570,27 +569,23 @@ static nni_proto_ctx_ops surv0_ctx_ops = { .ctx_options = surv0_ctx_options, }; -static nni_proto_option surv0_sock_options[] = { +static nni_option surv0_sock_options[] = { { .o_name = NNG_OPT_SURVEYOR_SURVEYTIME, - .o_type = NNI_TYPE_DURATION, .o_get = surv0_sock_get_surveytime, .o_set = surv0_sock_set_surveytime, }, { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = surv0_sock_get_maxttl, .o_set = surv0_sock_set_maxttl, }, { .o_name = NNG_OPT_RECVFD, - .o_type = NNI_TYPE_INT32, .o_get = surv0_sock_get_recvfd, }, { .o_name = NNG_OPT_SENDFD, - .o_type = NNI_TYPE_INT32, .o_get = surv0_sock_get_sendfd, }, // terminate list diff --git a/src/protocol/survey0/xrespond.c b/src/protocol/survey0/xrespond.c index 9c9a1a16..865a94f3 100644 --- a/src/protocol/survey0/xrespond.c +++ b/src/protocol/survey0/xrespond.c @@ -385,10 +385,9 @@ static nni_proto_pipe_ops xresp0_pipe_ops = { .pipe_stop = xresp0_pipe_stop, }; -static nni_proto_option xresp0_sock_options[] = { +static nni_option xresp0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = xresp0_sock_get_maxttl, .o_set = xresp0_sock_set_maxttl, }, diff --git a/src/protocol/survey0/xsurvey.c b/src/protocol/survey0/xsurvey.c index 83a7c589..9cf5af1f 100644 --- a/src/protocol/survey0/xsurvey.c +++ b/src/protocol/survey0/xsurvey.c @@ -356,10 +356,9 @@ static nni_proto_pipe_ops xsurv0_pipe_ops = { .pipe_stop = xsurv0_pipe_stop, }; -static nni_proto_option xsurv0_sock_options[] = { +static nni_option xsurv0_sock_options[] = { { .o_name = NNG_OPT_MAXTTL, - .o_type = NNI_TYPE_INT32, .o_get = xsurv0_sock_get_maxttl, .o_set = xsurv0_sock_set_maxttl, }, |
