diff options
Diffstat (limited to 'src/protocol')
| -rw-r--r-- | src/protocol/bus0/bus.c | 5 | ||||
| -rw-r--r-- | src/protocol/pair0/pair.c | 5 | ||||
| -rw-r--r-- | src/protocol/pair1/pair.c | 7 | ||||
| -rw-r--r-- | src/protocol/pipeline0/pull.c | 5 | ||||
| -rw-r--r-- | src/protocol/pipeline0/push.c | 5 | ||||
| -rw-r--r-- | src/protocol/pubsub0/pub.c | 5 | ||||
| -rw-r--r-- | src/protocol/pubsub0/sub.c | 7 | ||||
| -rw-r--r-- | src/protocol/reqrep0/rep.c | 6 | ||||
| -rw-r--r-- | src/protocol/reqrep0/req.c | 7 | ||||
| -rw-r--r-- | src/protocol/survey0/respond.c | 6 | ||||
| -rw-r--r-- | src/protocol/survey0/survey.c | 7 |
11 files changed, 54 insertions, 11 deletions
diff --git a/src/protocol/bus0/bus.c b/src/protocol/bus0/bus.c index d2b51cd4..31b40fd5 100644 --- a/src/protocol/bus0/bus.c +++ b/src/protocol/bus0/bus.c @@ -373,11 +373,14 @@ static nni_proto_pipe_ops bus0_pipe_ops = { static nni_proto_sock_option bus0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = bus0_sock_getopt_raw, .pso_setopt = bus0_sock_setopt_raw, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops bus0_sock_ops = { diff --git a/src/protocol/pair0/pair.c b/src/protocol/pair0/pair.c index 9e9dfe10..476eadd6 100644 --- a/src/protocol/pair0/pair.c +++ b/src/protocol/pair0/pair.c @@ -271,11 +271,14 @@ static nni_proto_pipe_ops pair0_pipe_ops = { static nni_proto_sock_option pair0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = pair0_sock_getopt_raw, .pso_setopt = pair0_sock_setopt_raw, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + } }; static nni_proto_sock_ops pair0_sock_ops = { diff --git a/src/protocol/pair1/pair.c b/src/protocol/pair1/pair.c index b4519221..564118ae 100644 --- a/src/protocol/pair1/pair.c +++ b/src/protocol/pair1/pair.c @@ -476,21 +476,26 @@ static nni_proto_pipe_ops pair1_pipe_ops = { static nni_proto_sock_option pair1_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = pair1_sock_getopt_raw, .pso_setopt = pair1_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = pair1_sock_getopt_maxttl, .pso_setopt = pair1_sock_setopt_maxttl, }, { .pso_name = NNG_OPT_PAIR1_POLY, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = pair1_sock_getopt_poly, .pso_setopt = pair1_sock_setopt_poly, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops pair1_sock_ops = { diff --git a/src/protocol/pipeline0/pull.c b/src/protocol/pipeline0/pull.c index 5e0a9d00..fec07c39 100644 --- a/src/protocol/pipeline0/pull.c +++ b/src/protocol/pipeline0/pull.c @@ -219,11 +219,14 @@ static nni_proto_pipe_ops pull0_pipe_ops = { static nni_proto_sock_option pull0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = pull0_sock_getopt_raw, .pso_setopt = pull0_sock_setopt_raw, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops pull0_sock_ops = { diff --git a/src/protocol/pipeline0/push.c b/src/protocol/pipeline0/push.c index a0dfa397..b6f6a824 100644 --- a/src/protocol/pipeline0/push.c +++ b/src/protocol/pipeline0/push.c @@ -236,11 +236,14 @@ static nni_proto_pipe_ops push0_pipe_ops = { static nni_proto_sock_option push0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = push0_sock_getopt_raw, .pso_setopt = push0_sock_setopt_raw, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops push0_sock_ops = { diff --git a/src/protocol/pubsub0/pub.c b/src/protocol/pubsub0/pub.c index ff110d56..36c27e7f 100644 --- a/src/protocol/pubsub0/pub.c +++ b/src/protocol/pubsub0/pub.c @@ -312,11 +312,14 @@ static nni_proto_pipe_ops pub0_pipe_ops = { static nni_proto_sock_option pub0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = pub0_sock_getopt_raw, .pso_setopt = pub0_sock_setopt_raw, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops pub0_sock_ops = { diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index d9d0d5f3..cb7b0509 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -361,21 +361,26 @@ static nni_proto_pipe_ops sub0_pipe_ops = { static nni_proto_sock_option sub0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = sub0_sock_getopt_raw, .pso_setopt = sub0_sock_setopt_raw, }, { .pso_name = NNG_OPT_SUB_SUBSCRIBE, + .pso_type = NNI_TYPE_OPAQUE, .pso_getopt = NULL, .pso_setopt = sub0_subscribe, }, { .pso_name = NNG_OPT_SUB_UNSUBSCRIBE, + .pso_type = NNI_TYPE_OPAQUE, .pso_getopt = NULL, .pso_setopt = sub0_unsubscribe, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops sub0_sock_ops = { diff --git a/src/protocol/reqrep0/rep.c b/src/protocol/reqrep0/rep.c index 9906de4b..429d55e7 100644 --- a/src/protocol/reqrep0/rep.c +++ b/src/protocol/reqrep0/rep.c @@ -476,16 +476,20 @@ static nni_proto_pipe_ops rep0_pipe_ops = { static nni_proto_sock_option rep0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = rep0_sock_getopt_raw, .pso_setopt = rep0_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = rep0_sock_getopt_maxttl, .pso_setopt = rep0_sock_setopt_maxttl, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops rep0_sock_ops = { diff --git a/src/protocol/reqrep0/req.c b/src/protocol/reqrep0/req.c index d87a5d1f..63ae07a0 100644 --- a/src/protocol/reqrep0/req.c +++ b/src/protocol/reqrep0/req.c @@ -629,21 +629,26 @@ static nni_proto_pipe_ops req0_pipe_ops = { static nni_proto_sock_option req0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = req0_sock_getopt_raw, .pso_setopt = req0_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = req0_sock_getopt_maxttl, .pso_setopt = req0_sock_setopt_maxttl, }, { .pso_name = NNG_OPT_REQ_RESENDTIME, + .pso_type = NNI_TYPE_DURATION, .pso_getopt = req0_sock_getopt_resendtime, .pso_setopt = req0_sock_setopt_resendtime, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops req0_sock_ops = { diff --git a/src/protocol/survey0/respond.c b/src/protocol/survey0/respond.c index c73f5720..42db2cb0 100644 --- a/src/protocol/survey0/respond.c +++ b/src/protocol/survey0/respond.c @@ -470,16 +470,20 @@ static nni_proto_pipe_ops resp0_pipe_ops = { static nni_proto_sock_option resp0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = resp0_sock_getopt_raw, .pso_setopt = resp0_sock_setopt_raw, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = resp0_sock_getopt_maxttl, .pso_setopt = resp0_sock_setopt_maxttl, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops resp0_sock_ops = { diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c index 864287ed..40ace91b 100644 --- a/src/protocol/survey0/survey.c +++ b/src/protocol/survey0/survey.c @@ -465,21 +465,26 @@ static nni_proto_pipe_ops surv0_pipe_ops = { static nni_proto_sock_option surv0_sock_options[] = { { .pso_name = NNG_OPT_RAW, + .pso_type = NNI_TYPE_BOOL, .pso_getopt = surv0_sock_getopt_raw, .pso_setopt = surv0_sock_setopt_raw, }, { .pso_name = NNG_OPT_SURVEYOR_SURVEYTIME, + .pso_type = NNI_TYPE_DURATION, .pso_getopt = surv0_sock_getopt_surveytime, .pso_setopt = surv0_sock_setopt_surveytime, }, { .pso_name = NNG_OPT_MAXTTL, + .pso_type = NNI_TYPE_INT32, .pso_getopt = surv0_sock_getopt_maxttl, .pso_setopt = surv0_sock_setopt_maxttl, }, // terminate list - { NULL, NULL, NULL }, + { + .pso_name = NULL, + }, }; static nni_proto_sock_ops surv0_sock_ops = { |
