diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-01-18 14:35:36 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-01-18 19:50:47 -0800 |
| commit | 0242199ddc95e8a683304897a3e1bc26c7e74c0f (patch) | |
| tree | 6b60ee6b9d1d1988c28b42d4af33005a4b8a3ae1 /src/protocol/survey0/survey.c | |
| parent | 10133ca9b5439e67b287703739e23e7d82fb76c4 (diff) | |
| download | nng-0242199ddc95e8a683304897a3e1bc26c7e74c0f.tar.gz nng-0242199ddc95e8a683304897a3e1bc26c7e74c0f.tar.bz2 nng-0242199ddc95e8a683304897a3e1bc26c7e74c0f.zip | |
fixes #1142 raw mode use of message headers is inconsistent
This correctly moves the entire protocol header for XREQ and XRESPONDENT
protocols to the message header (not the body). This is where it should
always have been. There is some small chance that applications which were
coded to parse the header from the body will break. We don't think there
are any such applications in use.
Diffstat (limited to 'src/protocol/survey0/survey.c')
| -rw-r--r-- | src/protocol/survey0/survey.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c index 35a14de7..9746ff45 100644 --- a/src/protocol/survey0/survey.c +++ b/src/protocol/survey0/survey.c @@ -19,14 +19,6 @@ // multiple use of queues for simplicity. Typically this is used in cases // where a few dozen extra microseconds does not matter. -#ifndef NNI_PROTO_SURVEYOR_V0 -#define NNI_PROTO_SURVEYOR_V0 NNI_PROTO(6, 2) -#endif - -#ifndef NNI_PROTO_RESPONDENT_V0 -#define NNI_PROTO_RESPONDENT_V0 NNI_PROTO(6, 3) -#endif - typedef struct surv0_pipe surv0_pipe; typedef struct surv0_sock surv0_sock; typedef struct surv0_ctx surv0_ctx; @@ -321,7 +313,7 @@ surv0_pipe_start(void *arg) surv0_pipe *p = arg; surv0_sock *s = p->sock; - if (nni_pipe_peer(p->npipe) != NNI_PROTO_RESPONDENT_V0) { + if (nni_pipe_peer(p->npipe) != NNG_SURVEYOR0_PEER) { return (NNG_EPROTO); } @@ -582,8 +574,8 @@ static nni_proto_sock_ops surv0_sock_ops = { static nni_proto surv0_proto = { .proto_version = NNI_PROTOCOL_VERSION, - .proto_self = { NNI_PROTO_SURVEYOR_V0, "surveyor" }, - .proto_peer = { NNI_PROTO_RESPONDENT_V0, "respondent" }, + .proto_self = { NNG_SURVEYOR0_SELF, NNG_SURVEYOR0_SELF_NAME }, + .proto_peer = { NNG_SURVEYOR0_PEER, NNG_SURVEYOR0_PEER_NAME }, .proto_flags = NNI_PROTO_FLAG_SNDRCV | NNI_PROTO_FLAG_NOMSGQ, .proto_sock_ops = &surv0_sock_ops, .proto_pipe_ops = &surv0_pipe_ops, |